From: Guennadi Liakhovetski Date: Tue, 26 Jul 2011 15:49:13 +0000 (-0300) Subject: [media] ARM: ap4evb: switch imx074 configuration to default number of lanes X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=19a1780b628ecbc943465fa4d53b69e94c279f23;p=linux-beck.git [media] ARM: ap4evb: switch imx074 configuration to default number of lanes The sh_mobile_csi2 driver will change meaning of the .lanes platform data field from "bitmask of used lanes" to "number of used lanes." To avoid a regression during this transition switch ap4evb to rely on the 2 lane default. Signed-off-by: Guennadi Liakhovetski Acked-by: Magnus Damm Signed-off-by: Mauro Carvalho Chehab --- diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 5b7edadf4647..f9f66c20c9f1 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -933,7 +933,7 @@ static struct platform_device ap4evb_camera = { static struct sh_csi2_client_config csi2_clients[] = { { .phy = SH_CSI2_PHY_MAIN, - .lanes = 3, + .lanes = 0, /* default: 2 lanes */ .channel = 0, .pdev = &ap4evb_camera, },