diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2008-10-21 07:44:38 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-21 07:51:51 +0400 |
| commit | 58419abd507dd9cc20644b99f122bc7b5507a261 (patch) | |
| tree | fe6a1e0a4ceedcc9fbb02ae9a1395d751facb2e3 /arch/sh/boards/mach-migor | |
| parent | b56050ae5e53ab8c5efedce7f4ec3923b6e42054 (diff) | |
| download | linux-58419abd507dd9cc20644b99f122bc7b5507a261.tar.xz | |
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>
Diffstat (limited to 'arch/sh/boards/mach-migor')
| -rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 11 |
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) gpio_set_value(GPIO_PTT3, 0); } +static void camera_power(int mode) +{ + if (mode) + camera_power_on(); + else + camera_power_off(); +} + #ifdef CONFIG_I2C static unsigned char camera_ov772x_magic[] = { @@ -386,6 +394,7 @@ static struct soc_camera_platform_info ov772x_info = { }, .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8, + .power = camera_power, .set_capture = ov772x_set_capture, }; @@ -400,8 +409,6 @@ static struct platform_device migor_camera_device = { static struct sh_mobile_ceu_info sh_mobile_ceu_info = { .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \ | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH, - .enable_camera = camera_power_on, - .disable_camera = camera_power_off, }; static struct resource migor_ceu_resources[] = { |