]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] adv7842: set default input in platform-data
authorMartin Bugge <marbugge@cisco.com>
Thu, 5 Dec 2013 14:55:48 +0000 (11:55 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 7 Jan 2014 08:30:55 +0000 (06:30 -0200)
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>
drivers/media/i2c/adv7842.c
include/media/adv7842.h

index dcafc8e7a86a90294434900085ba669af11bdccf..86db9fca77f6fa8706f6c62bea686555b3aa9e2b 100644 (file)
@@ -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 |
index 5327ba36d8469a8227dc024bb11d7b9e4d6a8708..c12de2d2f46f1591b6f8b6277ec6251c2c9eab7d 100644 (file)
@@ -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;