| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Sekhar Nori <nsekhar@ti.com> |
| Date: Fri, 11 May 2018 20:51:35 +0530 |
| Subject: ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF |
| |
| From: Sekhar Nori <nsekhar@ti.com> |
| |
| [ Upstream commit 7d46899d57f8b61eb28701d9a4043b71e3392c26 ] |
| |
| commit a16cb91ad9c4 ("[media] media: vpif: use a configurable |
| i2c_adapter_id for vpif display") removed hardcoded I2C adaptor |
| setting in VPIF driver, but missed updating platform data passed |
| from DM646x board. |
| |
| Fix it. |
| |
| Fixes: a16cb91ad9c4 ("[media] media: vpif: use a configurable i2c_adapter_id for vpif display") |
| Signed-off-by: Sekhar Nori <nsekhar@ti.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/mach-davinci/board-dm646x-evm.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/arch/arm/mach-davinci/board-dm646x-evm.c |
| +++ b/arch/arm/mach-davinci/board-dm646x-evm.c |
| @@ -534,6 +534,7 @@ static struct vpif_display_config dm646x |
| .set_clock = set_vpif_clock, |
| .subdevinfo = dm646x_vpif_subdev, |
| .subdev_count = ARRAY_SIZE(dm646x_vpif_subdev), |
| + .i2c_adapter_id = 1, |
| .chan_config[0] = { |
| .outputs = dm6467_ch0_outputs, |
| .output_count = ARRAY_SIZE(dm6467_ch0_outputs), |
| @@ -676,6 +677,7 @@ static struct vpif_capture_config dm646x |
| .setup_input_channel_mode = setup_vpif_input_channel_mode, |
| .subdev_info = vpif_capture_sdev_info, |
| .subdev_count = ARRAY_SIZE(vpif_capture_sdev_info), |
| + .i2c_adapter_id = 1, |
| .chan_config[0] = { |
| .inputs = dm6467_ch0_inputs, |
| .input_count = ARRAY_SIZE(dm6467_ch0_inputs), |