Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb6b0d69 authored by Sekhar Nori's avatar Sekhar Nori Committed by Greg Kroah-Hartman
Browse files

ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF 



[ Upstream commit 7d46899d57f8b61eb28701d9a4043b71e3392c26 ]

commit a16cb91a ("[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: a16cb91a ("[media] media: vpif: use a configurable i2c_adapter_id for vpif display")
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae7418dd

arch/arm/mach-davinci/board-dm646x-evm.c

+2 −0
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ static struct vpif_display_config dm646x_vpif_display_config = { 
	.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_vpif_capture_cfg = { 
	.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),