Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b44b2e06 authored by Pablo Anton's avatar Pablo Anton Committed by Mauro Carvalho Chehab
Browse files

[media] media: i2c: ADV7604: Rename adv7604 prefixes 



It is confusing which parts of the driver are adv7604 specific, adv7611
specific or common for both. This patch renames any adv7604 prefixes (both
for functions and defines) to adv76xx whenever they are common.

Signed-off-by: default avatarPablo Anton <pablo.anton@vodalys-labs.com>
Signed-off-by: default avatarJean-Michel Hautbois <jean-michel.hautbois@vodalys.com>
[hans.verkuil@cisco.com: rebased and renamed ADV76xx_fsc to ADV76XX_FSC]
[hans.verkuil@cisco.com: kept the existing adv7604 driver name]
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c973f76e

drivers/media/i2c/adv7604.c

+449 −449

File changed.

Preview size limit exceeded, changes collapsed.

include/media/adv7604.h

+42 −41
Original line number Diff line number Diff line
@@ -47,16 +47,16 @@ enum adv7604_bus_order { 
};



/* Input Color Space (IO register 0x02, [7:4]) */

enum adv7604_inp_color_space {

	ADV7604_INP_COLOR_SPACE_LIM_RGB = 0,

	ADV7604_INP_COLOR_SPACE_FULL_RGB = 1,

	ADV7604_INP_COLOR_SPACE_LIM_YCbCr_601 = 2,

	ADV7604_INP_COLOR_SPACE_LIM_YCbCr_709 = 3,

	ADV7604_INP_COLOR_SPACE_XVYCC_601 = 4,

	ADV7604_INP_COLOR_SPACE_XVYCC_709 = 5,

	ADV7604_INP_COLOR_SPACE_FULL_YCbCr_601 = 6,

	ADV7604_INP_COLOR_SPACE_FULL_YCbCr_709 = 7,

	ADV7604_INP_COLOR_SPACE_AUTO = 0xf,

enum adv76xx_inp_color_space {

	ADV76XX_INP_COLOR_SPACE_LIM_RGB = 0,

	ADV76XX_INP_COLOR_SPACE_FULL_RGB = 1,

	ADV76XX_INP_COLOR_SPACE_LIM_YCbCr_601 = 2,

	ADV76XX_INP_COLOR_SPACE_LIM_YCbCr_709 = 3,

	ADV76XX_INP_COLOR_SPACE_XVYCC_601 = 4,

	ADV76XX_INP_COLOR_SPACE_XVYCC_709 = 5,

	ADV76XX_INP_COLOR_SPACE_FULL_YCbCr_601 = 6,

	ADV76XX_INP_COLOR_SPACE_FULL_YCbCr_709 = 7,

	ADV76XX_INP_COLOR_SPACE_AUTO = 0xf,

};



/* Select output format (IO register 0x03, [4:2]) */
@@ -66,38 +66,39 @@ enum adv7604_op_format_mode_sel { 
	ADV7604_OP_FORMAT_MODE2 = 0x08,

};



enum adv7604_drive_strength {

	ADV7604_DR_STR_MEDIUM_LOW = 1,

	ADV7604_DR_STR_MEDIUM_HIGH = 2,

	ADV7604_DR_STR_HIGH = 3,

enum adv76xx_drive_strength {

	ADV76XX_DR_STR_MEDIUM_LOW = 1,

	ADV76XX_DR_STR_MEDIUM_HIGH = 2,

	ADV76XX_DR_STR_HIGH = 3,

};



enum adv7604_int1_config {

	ADV7604_INT1_CONFIG_OPEN_DRAIN,

	ADV7604_INT1_CONFIG_ACTIVE_LOW,

	ADV7604_INT1_CONFIG_ACTIVE_HIGH,

	ADV7604_INT1_CONFIG_DISABLED,

/* INT1 Configuration (IO register 0x40, [1:0]) */

enum adv76xx_int1_config {

	ADV76XX_INT1_CONFIG_OPEN_DRAIN,

	ADV76XX_INT1_CONFIG_ACTIVE_LOW,

	ADV76XX_INT1_CONFIG_ACTIVE_HIGH,

	ADV76XX_INT1_CONFIG_DISABLED,

};



enum adv7604_page {

	ADV7604_PAGE_IO,

enum adv76xx_page {

	ADV76XX_PAGE_IO,

	ADV7604_PAGE_AVLINK,

	ADV7604_PAGE_CEC,

	ADV7604_PAGE_INFOFRAME,

	ADV76XX_PAGE_CEC,

	ADV76XX_PAGE_INFOFRAME,

	ADV7604_PAGE_ESDP,

	ADV7604_PAGE_DPP,

	ADV7604_PAGE_AFE,

	ADV7604_PAGE_REP,

	ADV7604_PAGE_EDID,

	ADV7604_PAGE_HDMI,

	ADV7604_PAGE_TEST,

	ADV7604_PAGE_CP,

	ADV76XX_PAGE_AFE,

	ADV76XX_PAGE_REP,

	ADV76XX_PAGE_EDID,

	ADV76XX_PAGE_HDMI,

	ADV76XX_PAGE_TEST,

	ADV76XX_PAGE_CP,

	ADV7604_PAGE_VDP,

	ADV7604_PAGE_MAX,

	ADV76XX_PAGE_MAX,

};



/* Platform dependent definition */

struct adv7604_platform_data {

struct adv76xx_platform_data {

	/* DIS_PWRDNB: 1 if the PWRDNB pin is unused and unconnected */

	unsigned disable_pwrdnb:1;
@@ -116,7 +117,7 @@ struct adv7604_platform_data { 
	enum adv7604_op_format_mode_sel op_format_mode_sel;



	/* Configuration of the INT1 pin */

	enum adv7604_int1_config int1_config;

	enum adv76xx_int1_config int1_config;



	/* IO register 0x02 */

	unsigned alt_gamma:1;
@@ -134,9 +135,9 @@ struct adv7604_platform_data { 
	unsigned inv_llc_pol:1;



	/* IO register 0x14 */

	enum adv7604_drive_strength dr_str_data;

	enum adv7604_drive_strength dr_str_clk;

	enum adv7604_drive_strength dr_str_sync;

	enum adv76xx_drive_strength dr_str_data;

	enum adv76xx_drive_strength dr_str_clk;

	enum adv76xx_drive_strength dr_str_sync;



	/* IO register 0x30 */

	unsigned output_bus_lsb_to_msb:1;
@@ -145,11 +146,11 @@ struct adv7604_platform_data { 
	unsigned hdmi_free_run_mode;



	/* i2c addresses: 0 == use default */

	u8 i2c_addresses[ADV7604_PAGE_MAX];

	u8 i2c_addresses[ADV76XX_PAGE_MAX];

};



enum adv7604_pad {

	ADV7604_PAD_HDMI_PORT_A = 0,

enum adv76xx_pad {

	ADV76XX_PAD_HDMI_PORT_A = 0,

	ADV7604_PAD_HDMI_PORT_B = 1,

	ADV7604_PAD_HDMI_PORT_C = 2,

	ADV7604_PAD_HDMI_PORT_D = 3,
@@ -158,7 +159,7 @@ enum adv7604_pad { 
	/* The source pad is either 1 (ADV7611) or 6 (ADV7604) */

	ADV7604_PAD_SOURCE = 6,

	ADV7611_PAD_SOURCE = 1,

	ADV7604_PAD_MAX = 7,

	ADV76XX_PAD_MAX = 7,

};



#define V4L2_CID_ADV_RX_ANALOG_SAMPLING_PHASE	(V4L2_CID_DV_CLASS_BASE + 0x1000)
@@ -166,7 +167,7 @@ enum adv7604_pad { 
#define V4L2_CID_ADV_RX_FREE_RUN_COLOR		(V4L2_CID_DV_CLASS_BASE + 0x1002)



/* notify events */

#define ADV7604_HOTPLUG		1

#define ADV7604_FMT_CHANGE	2

#define ADV76XX_HOTPLUG		1

#define ADV76XX_FMT_CHANGE	2



#endif