diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/mach-bf609/boards/ezkit.c | 27 |
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 60347a83d70e..f6641761218c 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[] = { | |||
892 | .name = "Composite", | 892 | .name = "Composite", |
893 | .type = V4L2_INPUT_TYPE_CAMERA, | 893 | .type = V4L2_INPUT_TYPE_CAMERA, |
894 | .std = V4L2_STD_ALL, | 894 | .std = V4L2_STD_ALL, |
895 | .capabilities = V4L2_IN_CAP_STD, | ||
895 | }, | 896 | }, |
896 | { | 897 | { |
897 | .index = 1, | 898 | .index = 1, |
898 | .name = "S-Video", | 899 | .name = "S-Video", |
899 | .type = V4L2_INPUT_TYPE_CAMERA, | 900 | .type = V4L2_INPUT_TYPE_CAMERA, |
900 | .std = V4L2_STD_ALL, | 901 | .std = V4L2_STD_ALL, |
902 | .capabilities = V4L2_IN_CAP_STD, | ||
901 | }, | 903 | }, |
902 | { | 904 | { |
903 | .index = 2, | 905 | .index = 2, |
904 | .name = "Component", | 906 | .name = "Component", |
905 | .type = V4L2_INPUT_TYPE_CAMERA, | 907 | .type = V4L2_INPUT_TYPE_CAMERA, |
906 | .std = V4L2_STD_ALL, | 908 | .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS, |
907 | }, | 909 | }, |
908 | { | 910 | { |
909 | .index = 3, | 911 | .index = 3, |
910 | .name = "VGA", | 912 | .name = "VGA", |
911 | .type = V4L2_INPUT_TYPE_CAMERA, | 913 | .type = V4L2_INPUT_TYPE_CAMERA, |
912 | .std = V4L2_STD_ALL, | 914 | .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS, |
913 | }, | 915 | }, |
914 | { | 916 | { |
915 | .index = 4, | 917 | .index = 4, |
916 | .name = "HDMI", | 918 | .name = "HDMI", |
917 | .type = V4L2_INPUT_TYPE_CAMERA, | 919 | .type = V4L2_INPUT_TYPE_CAMERA, |
918 | .std = V4L2_STD_ALL, | 920 | .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS, |
919 | }, | 921 | }, |
920 | }; | 922 | }; |
921 | 923 | ||
@@ -923,6 +925,8 @@ static struct bcap_route adv7842_routes[] = { | |||
923 | { | 925 | { |
924 | .input = 3, | 926 | .input = 3, |
925 | .output = 0, | 927 | .output = 0, |
928 | .ppi_control = (PACK_EN | DLEN_8 | EPPI_CTL_FLDSEL | ||
929 | | EPPI_CTL_ACTIVE656), | ||
926 | }, | 930 | }, |
927 | { | 931 | { |
928 | .input = 4, | 932 | .input = 4, |
@@ -938,7 +942,10 @@ static struct bcap_route adv7842_routes[] = { | |||
938 | }, | 942 | }, |
939 | { | 943 | { |
940 | .input = 0, | 944 | .input = 0, |
941 | .output = 0, | 945 | .output = 1, |
946 | .ppi_control = (EPPI_CTL_SPLTWRD | PACK_EN | DLEN_16 | ||
947 | | EPPI_CTL_FS1LO_FS2LO | EPPI_CTL_POLC2 | ||
948 | | EPPI_CTL_SYNC2 | EPPI_CTL_NON656), | ||
942 | }, | 949 | }, |
943 | }; | 950 | }; |
944 | 951 | ||
@@ -950,6 +957,12 @@ static struct adv7842_output_format adv7842_opf[] = { | |||
950 | .blank_data = 1, | 957 | .blank_data = 1, |
951 | .insert_av_codes = 1, | 958 | .insert_av_codes = 1, |
952 | }, | 959 | }, |
960 | { | ||
961 | .op_ch_sel = ADV7842_OP_CH_SEL_RGB, | ||
962 | .op_format_sel = ADV7842_OP_FORMAT_SEL_SDR_ITU656_16, | ||
963 | .op_656_range = 1, | ||
964 | .blank_data = 1, | ||
965 | }, | ||
953 | }; | 966 | }; |
954 | 967 | ||
955 | static struct adv7842_platform_data adv7842_data = { | 968 | static struct adv7842_platform_data adv7842_data = { |
@@ -967,9 +980,9 @@ static struct adv7842_platform_data adv7842_data = { | |||
967 | .i2c_hdmi = 0x35, | 980 | .i2c_hdmi = 0x35, |
968 | .i2c_repeater = 0x36, | 981 | .i2c_repeater = 0x36, |
969 | .i2c_edid = 0x37, | 982 | .i2c_edid = 0x37, |
970 | .i2c_infoframe = 0x38, | 983 | .i2c_infoframe = 0x39, |
971 | .i2c_cec = 0x39, | 984 | .i2c_cec = 0x3a, |
972 | .i2c_avlink = 0x3a, | 985 | .i2c_avlink = 0x3b, |
973 | .i2c_ex = 0x26, | 986 | .i2c_ex = 0x26, |
974 | }; | 987 | }; |
975 | 988 | ||