p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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>
This commit is contained in:
Bartosz Golaszewski 2017-02-16 16:08:01 -02:00 committed by Mauro Carvalho Chehab
parent 28af1325e1
commit a16cb91ad9
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-davinci/board-da850-evm.c
View File

@ -1290,6 +1290,7 @@ static struct vpif_display_config da850_vpif_display_config = {
.output_count = ARRAY_SIZE(da850_ch0_outputs), .output_count = ARRAY_SIZE(da850_ch0_outputs),
}, },
.card_name = "DA850/OMAP-L138 Video Display", .card_name = "DA850/OMAP-L138 Video Display",
.i2c_adapter_id = 1,
}; };
static __init void da850_vpif_init(void) static __init void da850_vpif_init(void)

2
drivers/media/platform/davinci/vpif_display.c
View File

@ -1287,7 +1287,7 @@ static __init int vpif_probe(struct platform_device *pdev)
} }
if (!vpif_obj.config->asd_sizes) { 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++) { for (i = 0; i < subdev_count; i++) {
vpif_obj.sd[i] = vpif_obj.sd[i] =
v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev, v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev,

1
include/media/davinci/vpif_types.h
View File

@ -53,6 +53,7 @@ struct vpif_display_config {
int (*set_clock)(int, int); int (*set_clock)(int, int);
struct vpif_subdev_info *subdevinfo; struct vpif_subdev_info *subdevinfo;
int subdev_count; int subdev_count;
int i2c_adapter_id;
struct vpif_display_chan_config chan_config[VPIF_DISPLAY_MAX_CHANNELS]; struct vpif_display_chan_config chan_config[VPIF_DISPLAY_MAX_CHANNELS];
const char *card_name; const char *card_name;
struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */ struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */