upstream: [media] adv7842: set default input in platform-data

Signed-off-by: Martin Bugge <marbugge@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 7c86478..38fcfee 100644 (file)
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -2804,7 +2804,7 @@ static int adv7842_probe(struct i2c_client *client,
        state->connector_hdmi = pdata->connector_hdmi;
        state->mode = pdata->mode;
 
-       state->hdmi_port_a = true;
+       state->hdmi_port_a = pdata->input == ADV7842_SELECT_HDMI_PORT_A;
 
        /* i2c access to adv7842? */
        rev = adv_smbus_read_byte_data_check(client, 0xea, false) << 8 |

diff --git a/include/media/adv7842.h b/include/media/adv7842.h
index 5327ba3..c12de2d 100644 (file)
--- a/include/media/adv7842.h
+++ b/include/media/adv7842.h
@@ -160,6 +160,9 @@ struct adv7842_platform_data {
        /* Default mode */
        enum adv7842_mode mode;
 
+       /* Default input */
+       unsigned input;
+
        /* Video standard */
        enum adv7842_vid_std_select vid_std_select;