summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorScott Jiang <scott.jiang.linux@gmail.com>2012-06-14 18:23:08 -0400
committerBob Liu <lliubbo@gmail.com>2012-07-24 13:39:51 +0800
commit688da5e87aeb5094450f941d5a755ce04e25f4a1 (patch)
treea4e861ccf3e98921215dfa5b3580502a4f08a486 /arch/blackfin
parentb5c00ae78fb90481b7abe00dfc114f42236955a9 (diff)
bf609: add HDMI support for adv7842
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-bf609/boards/ezkit.c27
1 files changed, 20 insertions, 7 deletions
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index 60347a83d70..f6641761218 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -892,30 +892,32 @@ static struct v4l2_input adv7842_inputs[] = {
.name = "Composite",
.type = V4L2_INPUT_TYPE_CAMERA,
.std = V4L2_STD_ALL,
+ .capabilities = V4L2_IN_CAP_STD,
},
{
.index = 1,
.name = "S-Video",
.type = V4L2_INPUT_TYPE_CAMERA,
.std = V4L2_STD_ALL,
+ .capabilities = V4L2_IN_CAP_STD,
},
{
.index = 2,
.name = "Component",
.type = V4L2_INPUT_TYPE_CAMERA,
- .std = V4L2_STD_ALL,
+ .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
},
{
.index = 3,
.name = "VGA",
.type = V4L2_INPUT_TYPE_CAMERA,
- .std = V4L2_STD_ALL,
+ .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
},
{
.index = 4,
.name = "HDMI",
.type = V4L2_INPUT_TYPE_CAMERA,
- .std = V4L2_STD_ALL,
+ .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
},
};
@@ -923,6 +925,8 @@ static struct bcap_route adv7842_routes[] = {
{
.input = 3,
.output = 0,
+ .ppi_control = (PACK_EN | DLEN_8 | EPPI_CTL_FLDSEL
+ | EPPI_CTL_ACTIVE656),
},
{
.input = 4,
@@ -938,7 +942,10 @@ static struct bcap_route adv7842_routes[] = {
},
{
.input = 0,
- .output = 0,
+ .output = 1,
+ .ppi_control = (EPPI_CTL_SPLTWRD | PACK_EN | DLEN_16
+ | EPPI_CTL_FS1LO_FS2LO | EPPI_CTL_POLC2
+ | EPPI_CTL_SYNC2 | EPPI_CTL_NON656),
},
};
@@ -950,6 +957,12 @@ static struct adv7842_output_format adv7842_opf[] = {
.blank_data = 1,
.insert_av_codes = 1,
},
+ {
+ .op_ch_sel = ADV7842_OP_CH_SEL_RGB,
+ .op_format_sel = ADV7842_OP_FORMAT_SEL_SDR_ITU656_16,
+ .op_656_range = 1,
+ .blank_data = 1,
+ },
};
static struct adv7842_platform_data adv7842_data = {
@@ -967,9 +980,9 @@ static struct adv7842_platform_data adv7842_data = {
.i2c_hdmi = 0x35,
.i2c_repeater = 0x36,
.i2c_edid = 0x37,
- .i2c_infoframe = 0x38,
- .i2c_cec = 0x39,
- .i2c_avlink = 0x3a,
+ .i2c_infoframe = 0x39,
+ .i2c_cec = 0x3a,
+ .i2c_avlink = 0x3b,
.i2c_ex = 0x26,
};