media: vpif: use a configurable i2c_adapter_id for vpif display
Subsystems (5)
PATCH 1/1 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.
--- arch/arm/mach-davinci/board-da850-evm.c | 1 + drivers/media/platform/davinci/vpif_display.c | 2 +- include/media/davinci/vpif_types.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-davinci/board-da850-evm.c +1 -0
@@ -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 )
drivers/media/platform/davinci/vpif_display.c +1 -1
@@ -1287,7 +1287,7 @@ static __init int vpif_probe(struct platform_device *pdev) }if (!vpif_obj.config->asd_sizes) { - i2c_adap =i2c_get_adapter (1 ); + i2c_adap =i2c_get_adapter (vpif_obj.config->i2c_adapter_id);for (i =0 ; i < subdev_count; i++) { vpif_obj.sd[i] = v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev,
include/media/davinci/vpif_types.h +1 -0
@@ -57,6 +57,7 @@ struct vpif_display_config {int (*set_clock)(int ,int );struct vpif_subdev_info *subdevinfo;int subdev_count; +int i2c_adapter_id;struct vpif_display_chan_config chan_config[VPIF_DISPLAY_MAX_CHANNELS ];const char *card_name;struct v4l2_async_subdev **asd;/* Flat array, arranged in groups */
Signature · 1 line
2.9.3
2017-02-16 19:08 GMT+01:00 Bartosz Golaszewski <[email protected]>:
Quoted 8 lines
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 <[email protected]>Acked-by Kevin Hilman <[email protected]>---
Hi Mauro, Prabhakar,
can we get an ack on this? Sekhar already merged the rest of the patches that need this to make vpif display work on the da850-evm board. I think it's best if it goes through his tree.
Thanks,
Bartosz
Hi Bartosz,
Thanks for the patch.
Quoted 6 lines · Bartosz Golaszewski
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.
Quoted 8 lines
Signed-off-by Bartosz Golaszewski <[email protected]>Acked-by Kevin Hilman <[email protected]>--- arch/arm/mach-davinci/board-da850-evm.c | 1 + drivers/media/platform/davinci/vpif_display.c | 2 +- include/media/davinci/vpif_types.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
Cheers,
--Prabhakar Lad
2017-03-07 18:12 GMT+01:00 Lad, Prabhakar <[email protected]>:
Quoted 21 lines
Hi Bartosz,
Thanks for the patch.
Quoted 6 lines · Bartosz Golaszewski
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.
Quoted 8 lines
Signed-off-by Bartosz Golaszewski <[email protected]>Acked-by Kevin Hilman <[email protected]>--- arch/arm/mach-davinci/board-da850-evm.c | 1 + drivers/media/platform/davinci/vpif_display.c | 2 +- include/media/davinci/vpif_types.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
Quoted 2 lines
Acked-by Lad, Prabhakar <[email protected]>
Thanks!
Sekhar let me know, that this should be picked up by media. Also:
there are still two DT bindings patches for vpif that can be picked up
- Rob Herring acked them.
Thanks,
Bartosz