diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-21 06:44:57 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-21 06:44:56 -0800 |
| commit | f79329e286535417c07ca4ae005a79164002ddd4 (patch) | |
| tree | 9b8e7f4cd5e6d42395ae1a91b8d18d47c78c993e /drivers/media/i2c | |
| parent | c4f4e49994e59567202c97c358cd1a9faad6bad5 (diff) | |
| parent | c884da03cc44118b28d63e1fe81563dd1ee94b4b (diff) | |
Merge "Revert "ais: query field info and pass to user space""
Diffstat (limited to 'drivers/media/i2c')
| -rw-r--r-- | drivers/media/i2c/adv7481.c | 17 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7481_reg.h | 5 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/media/i2c/adv7481.c b/drivers/media/i2c/adv7481.c index b6b89a9eefe2..74d7b9584827 100644 --- a/drivers/media/i2c/adv7481.c +++ b/drivers/media/i2c/adv7481.c @@ -1005,7 +1005,6 @@ static long adv7481_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) { struct adv7481_state *state = to_state(sd); int *ret_val = arg; - uint8_t status = 0; long ret = 0; int param = 0; @@ -1040,22 +1039,6 @@ static long adv7481_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) case VIDIOC_HDMI_RX_CEC_S_ENABLE: ret = adv7481_cec_powerup(state, arg); break; - case VIDIOC_CVBS_G_FIELD_STATUS: - /* Select SDP read-only Map 1 */ - adv7481_wr_byte(&state->i2c_client, state->i2c_sdp_addr, - SDP_RW_MAP_REG, 0x02); - status = adv7481_rd_byte(&state->i2c_client, - state->i2c_sdp_addr, SDP_RO_MAP_1_FIELD_ADDR); - adv7481_wr_byte(&state->i2c_client, state->i2c_sdp_addr, - SDP_RW_MAP_REG, 0x00); - if (ret_val) { - *ret_val = ADV_REG_GETFIELD(status, - SDP_RO_MAP_1_EVEN_FIELD); - } else { - pr_err("%s: NULL pointer provided\n", __func__); - ret = -EINVAL; - } - break; default: pr_err("Not a typewriter! Command: 0x%x", cmd); ret = -ENOTTY; diff --git a/drivers/media/i2c/adv7481_reg.h b/drivers/media/i2c/adv7481_reg.h index 96f0a5df10c0..b0bb5784d2ef 100644 --- a/drivers/media/i2c/adv7481_reg.h +++ b/drivers/media/i2c/adv7481_reg.h @@ -411,11 +411,6 @@ #define SDP_RO_MAIN_IN_LOCK_BMSK 0x0001 #define SDP_RO_MAIN_IN_LOCK_SHFT 0 -/* SDP R/O Map 1 Registers */ -#define SDP_RO_MAP_1_FIELD_ADDR 0x45 -#define SDP_RO_MAP_1_EVEN_FIELD_BMSK 0x10 -#define SDP_RO_MAP_1_EVEN_FIELD_SHFT 4 - /* * CSI Map Registers |