aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2008-10-20 23:44:38 -0400
committerPaul Mundt <lethal@linux-sh.org>2008-10-20 23:51:51 -0400
commit58419abd507dd9cc20644b99f122bc7b5507a261 (patch)
treefe6a1e0a4ceedcc9fbb02ae9a1395d751facb2e3
parentb56050ae5e53ab8c5efedce7f4ec3923b6e42054 (diff)
sh: fix soc-camera compile breakage on Migo-R.
Fix Migo-R compile breakage caused by incomplete merge. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/boards/mach-migor/setup.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 769d63043424..94fbdc375bca 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -307,6 +307,14 @@ static void camera_power_off(void)
307 gpio_set_value(GPIO_PTT3, 0); 307 gpio_set_value(GPIO_PTT3, 0);
308} 308}
309 309
310static void camera_power(int mode)
311{
312 if (mode)
313 camera_power_on();
314 else
315 camera_power_off();
316}
317
310#ifdef CONFIG_I2C 318#ifdef CONFIG_I2C
311static unsigned char camera_ov772x_magic[] = 319static unsigned char camera_ov772x_magic[] =
312{ 320{
@@ -386,6 +394,7 @@ static struct soc_camera_platform_info ov772x_info = {
386 }, 394 },
387 .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | 395 .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
388 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8, 396 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
397 .power = camera_power,
389 .set_capture = ov772x_set_capture, 398 .set_capture = ov772x_set_capture,
390}; 399};
391 400
@@ -400,8 +409,6 @@ static struct platform_device migor_camera_device = {
400static struct sh_mobile_ceu_info sh_mobile_ceu_info = { 409static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
401 .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \ 410 .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \
402 | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH, 411 | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH,
403 .enable_camera = camera_power_on,
404 .disable_camera = camera_power_off,
405}; 412};
406 413
407static struct resource migor_ceu_resources[] = { 414static struct resource migor_ceu_resources[] = {