summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Randgaard <matrandg@cisco.com>2013-12-05 14:23:03 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-07 09:06:45 +0100
commit94b130131115de6c7c6b6228379e61d270ab8966 (patch)
tree312221a578a346d798023d3bbd5a0f7e90c2df96
parent[media] adv7604: improve EDID handling (diff)
downloadlinux-94b130131115de6c7c6b6228379e61d270ab8966.tar.xz
linux-94b130131115de6c7c6b6228379e61d270ab8966.zip
[media] adv7604: remove connector type. Never used for anything useful
May also be wrong if the receiver is connected to more than one connector. Signed-off-by: Mats Randgaard <matrandg@cisco.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/i2c/adv7604.c4
-rw-r--r--include/media/adv7604.h3
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 501f40f5024f..c85f86c9c605 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -77,7 +77,6 @@ struct adv7604_state {
u32 rgb_quantization_range;
struct workqueue_struct *work_queues;
struct delayed_work delayed_work_enable_hotplug;
- bool connector_hdmi;
bool restart_stdi_once;
u32 prev_input_status;
@@ -1817,8 +1816,6 @@ static int adv7604_log_status(struct v4l2_subdev *sd)
v4l2_info(sd, "-----Chip status-----\n");
v4l2_info(sd, "Chip power: %s\n", no_power(sd) ? "off" : "on");
- v4l2_info(sd, "Connector type: %s\n", state->connector_hdmi ?
- "HDMI" : (is_digital_input(sd) ? "DVI-D" : "DVI-A"));
v4l2_info(sd, "EDID enabled port A: %s, B: %s, C: %s, D: %s\n",
((rep_read(sd, 0x7d) & 0x01) ? "Yes" : "No"),
((rep_read(sd, 0x7d) & 0x02) ? "Yes" : "No"),
@@ -2138,7 +2135,6 @@ static int adv7604_probe(struct i2c_client *client,
sd = &state->sd;
v4l2_i2c_subdev_init(sd, client, &adv7604_ops);
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
- state->connector_hdmi = pdata->connector_hdmi;
/* i2c access to adv7604? */
if (adv_smbus_read_byte_data_check(client, 0xfb, false) != 0x68) {
diff --git a/include/media/adv7604.h b/include/media/adv7604.h
index 22fd1ac9d71b..baf7250ee8a1 100644
--- a/include/media/adv7604.h
+++ b/include/media/adv7604.h
@@ -86,9 +86,6 @@ enum adv7604_drive_strength {
/* Platform dependent definition */
struct adv7604_platform_data {
- /* connector - HDMI or DVI? */
- unsigned connector_hdmi:1;
-
/* DIS_PWRDNB: 1 if the PWRDNB pin is unused and unconnected */
unsigned disable_pwrdnb:1;