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

Commit 8331d30b authored by William Towle's avatar William Towle Committed by Mauro Carvalho Chehab
Browse files

[media] media: adv7604: chip info and formats for ADV7612 



Add support for the ADV7612 chip as implemented on Renesas' Lager
board to adv7604.c, including lists for formats/colourspace/timing
selection and an IRQ handler.

Signed-off-by: default avatarWilliam Towle <william.towle@codethink.co.uk>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
[hans.verkuil@cisco.com: fix merge conflicts due to regmap patch]

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

drivers/media/i2c/adv7604.c

+87 −4
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ MODULE_LICENSE("GPL"); 
enum adv76xx_type {

	ADV7604,

	ADV7611,

	ADV7612,

};



struct adv76xx_reg_seq {
@@ -754,6 +755,23 @@ static const struct adv76xx_format_info adv7611_formats[] = { 
	  ADV76XX_OP_MODE_SEL_SDR_422_2X | ADV76XX_OP_FORMAT_SEL_12BIT },

};



static const struct adv76xx_format_info adv7612_formats[] = {

	{ MEDIA_BUS_FMT_RGB888_1X24, ADV76XX_OP_CH_SEL_RGB, true, false,

	  ADV76XX_OP_MODE_SEL_SDR_444 | ADV76XX_OP_FORMAT_SEL_8BIT },

	{ MEDIA_BUS_FMT_YUYV8_2X8, ADV76XX_OP_CH_SEL_RGB, false, false,

	  ADV76XX_OP_MODE_SEL_SDR_422 | ADV76XX_OP_FORMAT_SEL_8BIT },

	{ MEDIA_BUS_FMT_YVYU8_2X8, ADV76XX_OP_CH_SEL_RGB, false, true,

	  ADV76XX_OP_MODE_SEL_SDR_422 | ADV76XX_OP_FORMAT_SEL_8BIT },

	{ MEDIA_BUS_FMT_UYVY8_1X16, ADV76XX_OP_CH_SEL_RBG, false, false,

	  ADV76XX_OP_MODE_SEL_SDR_422_2X | ADV76XX_OP_FORMAT_SEL_8BIT },

	{ MEDIA_BUS_FMT_VYUY8_1X16, ADV76XX_OP_CH_SEL_RBG, false, true,

	  ADV76XX_OP_MODE_SEL_SDR_422_2X | ADV76XX_OP_FORMAT_SEL_8BIT },

	{ MEDIA_BUS_FMT_YUYV8_1X16, ADV76XX_OP_CH_SEL_RGB, false, false,

	  ADV76XX_OP_MODE_SEL_SDR_422_2X | ADV76XX_OP_FORMAT_SEL_8BIT },

	{ MEDIA_BUS_FMT_YVYU8_1X16, ADV76XX_OP_CH_SEL_RGB, false, true,

	  ADV76XX_OP_MODE_SEL_SDR_422_2X | ADV76XX_OP_FORMAT_SEL_8BIT },

};



static const struct adv76xx_format_info *

adv76xx_format_info(struct adv76xx_state *state, u32 code)

{
@@ -2498,6 +2516,11 @@ static void adv7611_setup_irqs(struct v4l2_subdev *sd) 
	io_write(sd, 0x41, 0xd0); /* STDI irq for any change, disable INT2 */

}



static void adv7612_setup_irqs(struct v4l2_subdev *sd)

{

	io_write(sd, 0x41, 0xd0); /* disable INT2 */

}



static void adv76xx_unregister_clients(struct adv76xx_state *state)

{

	unsigned int i;
@@ -2585,6 +2608,19 @@ static const struct adv76xx_reg_seq adv7611_recommended_settings_hdmi[] = { 
	{ ADV76XX_REG_SEQ_TERM, 0 },

};



static const struct adv76xx_reg_seq adv7612_recommended_settings_hdmi[] = {

	{ ADV76XX_REG(ADV76XX_PAGE_CP, 0x6c), 0x00 },

	{ ADV76XX_REG(ADV76XX_PAGE_HDMI, 0x9b), 0x03 },

	{ ADV76XX_REG(ADV76XX_PAGE_HDMI, 0x6f), 0x08 },

	{ ADV76XX_REG(ADV76XX_PAGE_HDMI, 0x85), 0x1f },

	{ ADV76XX_REG(ADV76XX_PAGE_HDMI, 0x87), 0x70 },

	{ ADV76XX_REG(ADV76XX_PAGE_HDMI, 0x57), 0xda },

	{ ADV76XX_REG(ADV76XX_PAGE_HDMI, 0x58), 0x01 },

	{ ADV76XX_REG(ADV76XX_PAGE_HDMI, 0x03), 0x98 },

	{ ADV76XX_REG(ADV76XX_PAGE_HDMI, 0x4c), 0x44 },

	{ ADV76XX_REG_SEQ_TERM, 0 },

};



static const struct adv76xx_chip_info adv76xx_chip_info[] = {

	[ADV7604] = {

		.type = ADV7604,
@@ -2673,17 +2709,59 @@ static const struct adv76xx_chip_info adv76xx_chip_info[] = { 
		.field1_vsync_mask = 0x3fff,

		.field1_vbackporch_mask = 0x3fff,

	},

	[ADV7612] = {

		.type = ADV7612,

		.has_afe = false,

		.max_port = ADV7604_PAD_HDMI_PORT_B,

		.num_dv_ports = 2,

		.edid_enable_reg = 0x74,

		.edid_status_reg = 0x76,

		.lcf_reg = 0xa3,

		.tdms_lock_mask = 0x43,

		.cable_det_mask = 0x01,

		.fmt_change_digital_mask = 0x03,

		.formats = adv7612_formats,

		.nformats = ARRAY_SIZE(adv7612_formats),

		.set_termination = adv7611_set_termination,

		.setup_irqs = adv7612_setup_irqs,

		.read_hdmi_pixelclock = adv7611_read_hdmi_pixelclock,

		.read_cable_det = adv7611_read_cable_det,

		.recommended_settings = {

		    [1] = adv7612_recommended_settings_hdmi,

		},

		.num_recommended_settings = {

		    [1] = ARRAY_SIZE(adv7612_recommended_settings_hdmi),

		},

		.page_mask = BIT(ADV76XX_PAGE_IO) | BIT(ADV76XX_PAGE_CEC) |

			BIT(ADV76XX_PAGE_INFOFRAME) | BIT(ADV76XX_PAGE_AFE) |

			BIT(ADV76XX_PAGE_REP) |  BIT(ADV76XX_PAGE_EDID) |

			BIT(ADV76XX_PAGE_HDMI) | BIT(ADV76XX_PAGE_CP),

		.linewidth_mask = 0x1fff,

		.field0_height_mask = 0x1fff,

		.field1_height_mask = 0x1fff,

		.hfrontporch_mask = 0x1fff,

		.hsync_mask = 0x1fff,

		.hbackporch_mask = 0x1fff,

		.field0_vfrontporch_mask = 0x3fff,

		.field0_vsync_mask = 0x3fff,

		.field0_vbackporch_mask = 0x3fff,

		.field1_vfrontporch_mask = 0x3fff,

		.field1_vsync_mask = 0x3fff,

		.field1_vbackporch_mask = 0x3fff,

	},

};



static const struct i2c_device_id adv76xx_i2c_id[] = {

	{ "adv7604", (kernel_ulong_t)&adv76xx_chip_info[ADV7604] },

	{ "adv7611", (kernel_ulong_t)&adv76xx_chip_info[ADV7611] },

	{ "adv7612", (kernel_ulong_t)&adv76xx_chip_info[ADV7612] },

	{ }

};

MODULE_DEVICE_TABLE(i2c, adv76xx_i2c_id);



static const struct of_device_id adv76xx_of_id[] __maybe_unused = {

	{ .compatible = "adi,adv7611", .data = &adv76xx_chip_info[ADV7611] },

	{ .compatible = "adi,adv7612", .data = &adv76xx_chip_info[ADV7612] },

	{ }

};

MODULE_DEVICE_TABLE(of, adv76xx_of_id);
@@ -2978,7 +3056,8 @@ static int adv76xx_probe(struct i2c_client *client, 
	 * identifies the revision, while on ADV7611 it identifies the model as

	 * well. Use the HDMI slave address on ADV7604 and RD_INFO on ADV7611.

	 */

	if (state->info->type == ADV7604) {

	switch (state->info->type) {

	case ADV7604:

		err = regmap_read(state->regmap[ADV76XX_PAGE_IO], 0xfb, &val);

		if (err) {

			v4l2_err(sd, "Error %d reading IO Regmap\n", err);
@@ -2989,7 +3068,9 @@ static int adv76xx_probe(struct i2c_client *client, 
					client->addr << 1);

			return -ENODEV;

		}

	} else {

		break;

	case ADV7611:

	case ADV7612:

		err = regmap_read(state->regmap[ADV76XX_PAGE_IO],

				0xea,

				&val);
@@ -3006,11 +3087,13 @@ static int adv76xx_probe(struct i2c_client *client, 
			return -ENODEV;

		}

		val2 |= val;

		if (val2 != 0x2051) {

			v4l2_err(sd, "not an adv7611 on address 0x%x\n",

		if ((state->info->type == ADV7611 && val != 0x2051) ||

			(state->info->type == ADV7612 && val != 0x2041)) {

			v4l2_err(sd, "not an adv761x on address 0x%x\n",

					client->addr << 1);

			return -ENODEV;

		}

		break;

	}



	/* control handlers */