summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBartosz Golaszewski <bgolaszewski@baylibre.com>2017-02-16 16:08:01 -0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-03-22 11:55:56 -0300
commita16cb91ad9c4bb959e7d1be69d83d8c24a88e9f2 (patch)
treef8711896b00aa3dd3a3687eb2bdc3b400ca28c0f /arch/arm
parent28af1325e11d46a759ca8443df5492916328819b (diff)
downloadlinux-stable-a16cb91ad9c4bb959e7d1be69d83d8c24a88e9f2.tar.gz
linux-stable-a16cb91ad9c4bb959e7d1be69d83d8c24a88e9f2.tar.bz2
linux-stable-a16cb91ad9c4bb959e7d1be69d83d8c24a88e9f2.zip
[media] media: vpif: use a configurable i2c_adapter_id for vpif display
The vpif display driver uses a static i2c adapter ID of 1 but on the da850-evm board in DT boot mode the i2c adapter ID is actually 0. Make the adapter ID configurable like it already is for vpif capture. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Acked-by: Kevin Hilman <khilman@baylibre.com> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-davinci/board-da850-evm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index df3ca38778af..6f1e1299cab9 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1290,6 +1290,7 @@ static struct vpif_display_config da850_vpif_display_config = {
.output_count = ARRAY_SIZE(da850_ch0_outputs),
},
.card_name = "DA850/OMAP-L138 Video Display",
+ .i2c_adapter_id = 1,
};
static __init void da850_vpif_init(void)