aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-mackerel.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-07-28 17:19:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:28:10 -0400
commit71f5ec8406e0d2f7c85bc1207df88207cf784377 (patch)
treebb5b26e59b231ed0a8b45a20483c4284c8f38688 /arch/arm/mach-shmobile/board-mackerel.c
parent78a07f018c9d1eb1ee5798c5d3456260cc63c014 (diff)
[media] ARM: mach-shmobile: mackerel doesn't need legacy SOCAM_* flags anymore
The sh_mobile_ceu_camera driver has been converted to use the V4L2 subdevice .[gs]_mbus_config() operations, therefore we don't need SOCAM_* flags for the soc_camera_platform driver anymore. Remove them. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 8a9100b1afed..682042306ea2 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1223,9 +1223,6 @@ static struct soc_camera_platform_info camera_info = {
1223 .width = 640, 1223 .width = 640,
1224 .height = 480, 1224 .height = 480,
1225 }, 1225 },
1226 .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
1227 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 |
1228 SOCAM_DATA_ACTIVE_HIGH,
1229 .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | 1226 .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
1230 V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH | 1227 V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
1231 V4L2_MBUS_DATA_ACTIVE_HIGH, 1228 V4L2_MBUS_DATA_ACTIVE_HIGH,