diff options
| author | Martin Bugge <marbugge@cisco.com> | 2013-12-05 11:55:48 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-07 06:30:55 -0200 |
| commit | 8e4e3631531050c6287a9fc3542c26b601f3e533 (patch) | |
| tree | 9d2beb097146f34ceb91de074d1ce4451dfe7103 | |
| parent | 3c4da74fe55e52e2635b08af99471a5679a7a92e (diff) | |
| download | blackbird-obmc-linux-8e4e3631531050c6287a9fc3542c26b601f3e533.tar.gz blackbird-obmc-linux-8e4e3631531050c6287a9fc3542c26b601f3e533.zip | |
[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>
| -rw-r--r-- | drivers/media/i2c/adv7842.c | 2 | ||||
| -rw-r--r-- | include/media/adv7842.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index dcafc8e7a86a..86db9fca77f6 100644 --- 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 5327ba36d846..c12de2d2f46f 100644 --- 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; |
