Commit f888ae7e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] adv7842: Make output format configurable through pad format operations

Replace the dummy video format operations by pad format operations that
configure the output format.

Copied from the adv7604 driver.

Note: while arch/blackfin/mach-bf609/boards/ezkit.c uses adv7842_platform_data
this source has not been updated because it is broken since the very
beginning. It depends on a struct adv7842_output_format that does not
exist.

And besides that gcc has no support for bf609 so nobody can compile it
except by installing a toolchain from ADI.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 71df6731
This diff is collapsed.
...@@ -30,14 +30,38 @@ enum adv7842_ain_sel { ...@@ -30,14 +30,38 @@ enum adv7842_ain_sel {
ADV7842_AIN9_4_5_6_SYNC_2_1 = 4, ADV7842_AIN9_4_5_6_SYNC_2_1 = 4,
}; };
/* Bus rotation and reordering (IO register 0x04, [7:5]) */ /*
enum adv7842_op_ch_sel { * Bus rotation and reordering. This is used to specify component reordering on
ADV7842_OP_CH_SEL_GBR = 0, * the board and describes the components order on the bus when the ADV7842
ADV7842_OP_CH_SEL_GRB = 1, * outputs RGB.
ADV7842_OP_CH_SEL_BGR = 2, */
ADV7842_OP_CH_SEL_RGB = 3, enum adv7842_bus_order {
ADV7842_OP_CH_SEL_BRG = 4, ADV7842_BUS_ORDER_RGB, /* No operation */
ADV7842_OP_CH_SEL_RBG = 5, ADV7842_BUS_ORDER_GRB, /* Swap 1-2 */
ADV7842_BUS_ORDER_RBG, /* Swap 2-3 */
ADV7842_BUS_ORDER_BGR, /* Swap 1-3 */
ADV7842_BUS_ORDER_BRG, /* Rotate right */
ADV7842_BUS_ORDER_GBR, /* Rotate left */
};
/* Input Color Space (IO register 0x02, [7:4]) */
enum adv7842_inp_color_space {
ADV7842_INP_COLOR_SPACE_LIM_RGB = 0,
ADV7842_INP_COLOR_SPACE_FULL_RGB = 1,
ADV7842_INP_COLOR_SPACE_LIM_YCbCr_601 = 2,
ADV7842_INP_COLOR_SPACE_LIM_YCbCr_709 = 3,
ADV7842_INP_COLOR_SPACE_XVYCC_601 = 4,
ADV7842_INP_COLOR_SPACE_XVYCC_709 = 5,
ADV7842_INP_COLOR_SPACE_FULL_YCbCr_601 = 6,
ADV7842_INP_COLOR_SPACE_FULL_YCbCr_709 = 7,
ADV7842_INP_COLOR_SPACE_AUTO = 0xf,
};
/* Select output format (IO register 0x03, [4:2]) */
enum adv7842_op_format_mode_sel {
ADV7842_OP_FORMAT_MODE0 = 0x00,
ADV7842_OP_FORMAT_MODE1 = 0x04,
ADV7842_OP_FORMAT_MODE2 = 0x08,
}; };
/* Mode of operation */ /* Mode of operation */
...@@ -61,44 +85,6 @@ enum adv7842_vid_std_select { ...@@ -61,44 +85,6 @@ enum adv7842_vid_std_select {
ADV7842_HDMI_COMP_VID_STD_HD_1250P = 0x1e, ADV7842_HDMI_COMP_VID_STD_HD_1250P = 0x1e,
}; };
/* Input Color Space (IO register 0x02, [7:4]) */
enum adv7842_inp_color_space {
ADV7842_INP_COLOR_SPACE_LIM_RGB = 0,
ADV7842_INP_COLOR_SPACE_FULL_RGB = 1,
ADV7842_INP_COLOR_SPACE_LIM_YCbCr_601 = 2,
ADV7842_INP_COLOR_SPACE_LIM_YCbCr_709 = 3,
ADV7842_INP_COLOR_SPACE_XVYCC_601 = 4,
ADV7842_INP_COLOR_SPACE_XVYCC_709 = 5,
ADV7842_INP_COLOR_SPACE_FULL_YCbCr_601 = 6,
ADV7842_INP_COLOR_SPACE_FULL_YCbCr_709 = 7,
ADV7842_INP_COLOR_SPACE_AUTO = 0xf,
};
/* Select output format (IO register 0x03, [7:0]) */
enum adv7842_op_format_sel {
ADV7842_OP_FORMAT_SEL_SDR_ITU656_8 = 0x00,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_10 = 0x01,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_12_MODE0 = 0x02,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_12_MODE1 = 0x06,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_12_MODE2 = 0x0a,
ADV7842_OP_FORMAT_SEL_DDR_422_8 = 0x20,
ADV7842_OP_FORMAT_SEL_DDR_422_10 = 0x21,
ADV7842_OP_FORMAT_SEL_DDR_422_12_MODE0 = 0x22,
ADV7842_OP_FORMAT_SEL_DDR_422_12_MODE1 = 0x23,
ADV7842_OP_FORMAT_SEL_DDR_422_12_MODE2 = 0x24,
ADV7842_OP_FORMAT_SEL_SDR_444_24 = 0x40,
ADV7842_OP_FORMAT_SEL_SDR_444_30 = 0x41,
ADV7842_OP_FORMAT_SEL_SDR_444_36_MODE0 = 0x42,
ADV7842_OP_FORMAT_SEL_DDR_444_24 = 0x60,
ADV7842_OP_FORMAT_SEL_DDR_444_30 = 0x61,
ADV7842_OP_FORMAT_SEL_DDR_444_36 = 0x62,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_16 = 0x80,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_20 = 0x81,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_24_MODE0 = 0x82,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_24_MODE1 = 0x86,
ADV7842_OP_FORMAT_SEL_SDR_ITU656_24_MODE2 = 0x8a,
};
enum adv7842_select_input { enum adv7842_select_input {
ADV7842_SELECT_HDMI_PORT_A, ADV7842_SELECT_HDMI_PORT_A,
ADV7842_SELECT_HDMI_PORT_B, ADV7842_SELECT_HDMI_PORT_B,
...@@ -163,7 +149,10 @@ struct adv7842_platform_data { ...@@ -163,7 +149,10 @@ struct adv7842_platform_data {
enum adv7842_ain_sel ain_sel; enum adv7842_ain_sel ain_sel;
/* Bus rotation and reordering */ /* Bus rotation and reordering */
enum adv7842_op_ch_sel op_ch_sel; enum adv7842_bus_order bus_order;
/* Select output format mode */
enum adv7842_op_format_mode_sel op_format_mode_sel;
/* Default mode */ /* Default mode */
enum adv7842_mode mode; enum adv7842_mode mode;
...@@ -174,20 +163,15 @@ struct adv7842_platform_data { ...@@ -174,20 +163,15 @@ struct adv7842_platform_data {
/* Video standard */ /* Video standard */
enum adv7842_vid_std_select vid_std_select; enum adv7842_vid_std_select vid_std_select;
/* Select output format */
enum adv7842_op_format_sel op_format_sel;
/* IO register 0x02 */ /* IO register 0x02 */
unsigned alt_gamma:1; unsigned alt_gamma:1;
unsigned op_656_range:1; unsigned op_656_range:1;
unsigned rgb_out:1;
unsigned alt_data_sat:1; unsigned alt_data_sat:1;
/* IO register 0x05 */ /* IO register 0x05 */
unsigned blank_data:1; unsigned blank_data:1;
unsigned insert_av_codes:1; unsigned insert_av_codes:1;
unsigned replicate_av_codes:1; unsigned replicate_av_codes:1;
unsigned invert_cbcr:1;
/* IO register 0x30 */ /* IO register 0x30 */
unsigned output_bus_lsb_to_msb:1; unsigned output_bus_lsb_to_msb:1;
...@@ -256,5 +240,6 @@ struct adv7842_platform_data { ...@@ -256,5 +240,6 @@ struct adv7842_platform_data {
#define ADV7842_EDID_PORT_A 0 #define ADV7842_EDID_PORT_A 0
#define ADV7842_EDID_PORT_B 1 #define ADV7842_EDID_PORT_B 1
#define ADV7842_EDID_PORT_VGA 2 #define ADV7842_EDID_PORT_VGA 2
#define ADV7842_PAD_SOURCE 3
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment