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

Commit 51182a94 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] adv7604: Add 16-bit read functions for CP and HDMI 



16-bit registers are read through two 8-bit read operations. Factorize
that common pattern into 16-bit read accessors to simplify the code.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent f216ccb3

drivers/media/i2c/adv7604.c

+24 −24
Original line number Diff line number Diff line
@@ -542,6 +542,11 @@ static inline int hdmi_read(struct v4l2_subdev *sd, u8 reg) 
	return adv_smbus_read_byte_data(state->i2c_hdmi, reg);

}



static u16 hdmi_read16(struct v4l2_subdev *sd, u8 reg, u16 mask)

{

	return ((hdmi_read(sd, reg) << 8) | hdmi_read(sd, reg + 1)) & mask;

}



static inline int hdmi_write(struct v4l2_subdev *sd, u8 reg, u8 val)

{

	struct adv7604_state *state = to_state(sd);
@@ -575,6 +580,11 @@ static inline int cp_read(struct v4l2_subdev *sd, u8 reg) 
	return adv_smbus_read_byte_data(state->i2c_cp, reg);

}



static u16 cp_read16(struct v4l2_subdev *sd, u8 reg, u16 mask)

{

	return ((cp_read(sd, reg) << 8) | cp_read(sd, reg + 1)) & mask;

}



static inline int cp_write(struct v4l2_subdev *sd, u8 reg, u8 val)

{

	struct adv7604_state *state = to_state(sd);
@@ -1203,8 +1213,8 @@ static int read_stdi(struct v4l2_subdev *sd, struct stdi_readback *stdi) 
	}



	/* read STDI */

	stdi->bl = ((cp_read(sd, 0xb1) & 0x3f) << 8) | cp_read(sd, 0xb2);

	stdi->lcf = ((cp_read(sd, 0xb3) & 0x7) << 8) | cp_read(sd, 0xb4);

	stdi->bl = cp_read16(sd, 0xb1, 0x3fff);

	stdi->lcf = cp_read16(sd, 0xb3, 0x7ff);

	stdi->lcvs = cp_read(sd, 0xb3) >> 3;

	stdi->interlaced = io_read(sd, 0x12) & 0x10;
@@ -1315,8 +1325,8 @@ static int adv7604_query_dv_timings(struct v4l2_subdev *sd, 


		timings->type = V4L2_DV_BT_656_1120;



		bt->width = (hdmi_read(sd, 0x07) & 0x0f) * 256 + hdmi_read(sd, 0x08);

		bt->height = (hdmi_read(sd, 0x09) & 0x0f) * 256 + hdmi_read(sd, 0x0a);

		bt->width = hdmi_read16(sd, 0x07, 0xfff);

		bt->height = hdmi_read16(sd, 0x09, 0xfff);

		freq = (hdmi_read(sd, 0x06) * 1000000) +

			((hdmi_read(sd, 0x3b) & 0x30) >> 4) * 250000;

		if (is_hdmi(sd)) {
@@ -1326,29 +1336,19 @@ static int adv7604_query_dv_timings(struct v4l2_subdev *sd, 
			freq = freq * 8 / bits_per_channel;

		}

		bt->pixelclock = freq;

		bt->hfrontporch = (hdmi_read(sd, 0x20) & 0x03) * 256 +

			hdmi_read(sd, 0x21);

		bt->hsync = (hdmi_read(sd, 0x22) & 0x03) * 256 +

			hdmi_read(sd, 0x23);

		bt->hbackporch = (hdmi_read(sd, 0x24) & 0x03) * 256 +

			hdmi_read(sd, 0x25);

		bt->vfrontporch = ((hdmi_read(sd, 0x2a) & 0x1f) * 256 +

			hdmi_read(sd, 0x2b)) / 2;

		bt->vsync = ((hdmi_read(sd, 0x2e) & 0x1f) * 256 +

			hdmi_read(sd, 0x2f)) / 2;

		bt->vbackporch = ((hdmi_read(sd, 0x32) & 0x1f) * 256 +

			hdmi_read(sd, 0x33)) / 2;

		bt->hfrontporch = hdmi_read16(sd, 0x20, 0x3ff);

		bt->hsync = hdmi_read16(sd, 0x22, 0x3ff);

		bt->hbackporch = hdmi_read16(sd, 0x24, 0x3ff);

		bt->vfrontporch = hdmi_read16(sd, 0x2a, 0x1fff) / 2;

		bt->vsync = hdmi_read16(sd, 0x2e, 0x1fff) / 2;

		bt->vbackporch = hdmi_read16(sd, 0x32, 0x1fff) / 2;

		bt->polarities = ((hdmi_read(sd, 0x05) & 0x10) ? V4L2_DV_VSYNC_POS_POL : 0) |

			((hdmi_read(sd, 0x05) & 0x20) ? V4L2_DV_HSYNC_POS_POL : 0);

		if (bt->interlaced == V4L2_DV_INTERLACED) {

			bt->height += (hdmi_read(sd, 0x0b) & 0x0f) * 256 +

					hdmi_read(sd, 0x0c);

			bt->il_vfrontporch = ((hdmi_read(sd, 0x2c) & 0x1f) * 256 +

					hdmi_read(sd, 0x2d)) / 2;

			bt->il_vsync = ((hdmi_read(sd, 0x30) & 0x1f) * 256 +

					hdmi_read(sd, 0x31)) / 2;

			bt->vbackporch = ((hdmi_read(sd, 0x34) & 0x1f) * 256 +

					hdmi_read(sd, 0x35)) / 2;

			bt->height += hdmi_read16(sd, 0x0b, 0xfff);

			bt->il_vfrontporch = hdmi_read16(sd, 0x2c, 0x1fff) / 2;

			bt->il_vsync = hdmi_read16(sd, 0x30, 0x1fff) / 2;

			bt->vbackporch = hdmi_read16(sd, 0x34, 0x1fff) / 2;

		}

		adv7604_fill_optional_dv_timings_fields(sd, timings);

	} else {