aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-07-28 17:24:25 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:28:03 -0400
commit284f28eec2a44e3ce81abbb451bca72a5d5833f3 (patch)
tree0261f714b8d06b5e411974404843f0134d99e5f2 /arch/sh/boards
parentdb669e79ed27b7842d1d3495836238fb46e29769 (diff)
[media] sh: ap3rxa: remove redundant soc-camera platform data fields
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. The ov772x driver only supports 8 bits per sample pixel codes, hence the OV772X_FLAG_8BIT flag has no effect. Remove both of 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/sh/boards')
-rw-r--r--arch/sh/boards/mach-ap325rxa/setup.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 93a9f5dc5918..7030f4c8cf11 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -345,9 +345,6 @@ static struct soc_camera_platform_info camera_info = {
345 .width = 640, 345 .width = 640,
346 .height = 480, 346 .height = 480,
347 }, 347 },
348 .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
349 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 |
350 SOCAM_DATA_ACTIVE_HIGH,
351 .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | 348 .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
352 V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH | 349 V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
353 V4L2_MBUS_DATA_ACTIVE_HIGH, 350 V4L2_MBUS_DATA_ACTIVE_HIGH,
@@ -505,8 +502,7 @@ static struct i2c_board_info ap325rxa_i2c_camera[] = {
505}; 502};
506 503
507static struct ov772x_camera_info ov7725_info = { 504static struct ov772x_camera_info ov7725_info = {
508 .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP | \ 505 .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
509 OV772X_FLAG_8BIT,
510 .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0), 506 .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0),
511}; 507};
512 508