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

Commit 664716ad authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'v4l_for_linus' into patchwork 

We need to import the changes at media.h, as we have a
followup patch that depends on it.

* v4l_for_linus:
  [media] media.h: use hex values for range offsets,  move connectors base up.
  [media] adv7604: fix tx 5v detect regression
parents 697fe725 58402b6e

drivers/media/i2c/adv7604.c

+1 −2
Original line number Diff line number Diff line
@@ -1946,10 +1946,9 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled) 
	}



	/* tx 5v detect */

	tx_5v = io_read(sd, 0x70) & info->cable_det_mask;

	tx_5v = irq_reg_0x70 & info->cable_det_mask;

	if (tx_5v) {

		v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v);

		io_write(sd, 0x71, tx_5v);

		adv76xx_s_detect_tx_5v_ctrl(sd);

		if (handled)

			*handled = true;

include/uapi/linux/media.h

+10 −10
Original line number Diff line number Diff line
@@ -66,17 +66,17 @@ struct media_device_info { 
/*

 * DVB entities

 */

#define MEDIA_ENT_F_DTV_DEMOD		(MEDIA_ENT_F_BASE + 1)

#define MEDIA_ENT_F_TS_DEMUX		(MEDIA_ENT_F_BASE + 2)

#define MEDIA_ENT_F_DTV_CA		(MEDIA_ENT_F_BASE + 3)

#define MEDIA_ENT_F_DTV_NET_DECAP	(MEDIA_ENT_F_BASE + 4)

#define MEDIA_ENT_F_DTV_DEMOD		(MEDIA_ENT_F_BASE + 0x00001)

#define MEDIA_ENT_F_TS_DEMUX		(MEDIA_ENT_F_BASE + 0x00002)

#define MEDIA_ENT_F_DTV_CA		(MEDIA_ENT_F_BASE + 0x00003)

#define MEDIA_ENT_F_DTV_NET_DECAP	(MEDIA_ENT_F_BASE + 0x00004)



/*

 * I/O entities

 */

#define MEDIA_ENT_F_IO_DTV		(MEDIA_ENT_F_BASE + 1001)

#define MEDIA_ENT_F_IO_VBI		(MEDIA_ENT_F_BASE + 1002)

#define MEDIA_ENT_F_IO_SWRADIO		(MEDIA_ENT_F_BASE + 1003)

#define MEDIA_ENT_F_IO_DTV		(MEDIA_ENT_F_BASE + 0x01001)

#define MEDIA_ENT_F_IO_VBI		(MEDIA_ENT_F_BASE + 0x01002)

#define MEDIA_ENT_F_IO_SWRADIO		(MEDIA_ENT_F_BASE + 0x01003)



/*

 * Analog TV IF-PLL decoders
@@ -98,9 +98,9 @@ struct media_device_info { 
 * Connectors

 */

/* It is a responsibility of the entity drivers to add connectors and links */

#define MEDIA_ENT_F_CONN_RF		(MEDIA_ENT_F_BASE + 10001)

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 10002)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 10003)

#define MEDIA_ENT_F_CONN_RF		(MEDIA_ENT_F_BASE + 0x30001)

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 0x30002)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 0x30003)



/*

 * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and