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
Unified · Split
| @@ -1946,10 +1946,9 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled) · 1945 unmodified lines | ||
| 1946 | 1946 | } |
| 1947 | 1947 | |
| 1948 | 1948 | /* tx 5v detect */ |
| 1949 | − tx_5v = io_read(sd, 0x70) & info->cable_det_mask; | |
| 1949 | + tx_5v = irq_reg_0x70 & info->cable_det_mask; | |
| 1950 | 1950 | if (tx_5v) { |
| 1951 | 1951 | v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v); |
| 1952 | − io_write(sd, 0x71, tx_5v); | |
| 1953 | 1952 | adv76xx_s_detect_tx_5v_ctrl(sd); |
| 1954 | 1953 | if (handled) |
| 1955 | 1954 | *handled = true; |
| @@ -66,17 +66,17 @@ struct media_device_info { · 65 unmodified lines | ||
| 66 | 66 | /* |
| 67 | 67 | * DVB entities |
| 68 | 68 | */ |
| 69 | −#define MEDIA_ENT_F_DTV_DEMOD (MEDIA_ENT_F_BASE + 1) | |
| 70 | −#define MEDIA_ENT_F_TS_DEMUX (MEDIA_ENT_F_BASE + 2) | |
| 71 | −#define MEDIA_ENT_F_DTV_CA (MEDIA_ENT_F_BASE + 3) | |
| 72 | −#define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 4) | |
| 69 | +#define MEDIA_ENT_F_DTV_DEMOD (MEDIA_ENT_F_BASE + 0x00001) | |
| 70 | +#define MEDIA_ENT_F_TS_DEMUX (MEDIA_ENT_F_BASE + 0x00002) | |
| 71 | +#define MEDIA_ENT_F_DTV_CA (MEDIA_ENT_F_BASE + 0x00003) | |
| 72 | +#define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 0x00004) | |
| 73 | 73 | |
| 74 | 74 | /* |
| 75 | 75 | * I/O entities |
| 76 | 76 | */ |
| 77 | −#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 1001) | |
| 78 | −#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 1002) | |
| 79 | −#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 1003) | |
| 77 | +#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 0x01001) | |
| 78 | +#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 0x01002) | |
| 79 | +#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 0x01003) | |
| 80 | 80 | |
| 81 | 81 | /* |
| 82 | 82 | * Analog TV IF-PLL decoders |
| @@ -98,9 +98,9 @@ struct media_device_info { · 15 unmodified lines | ||
| 98 | 98 | * Connectors |
| 99 | 99 | */ |
| 100 | 100 | /* It is a responsibility of the entity drivers to add connectors and links */ |
| 101 | −#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 10001) | |
| 102 | −#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 10002) | |
| 103 | −#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 10003) | |
| 101 | +#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 0x30001) | |
| 102 | +#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 0x30002) | |
| 103 | +#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 0x30003) | |
| 104 | 104 | |
| 105 | 105 | /* |
| 106 | 106 | * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and |