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>
This commit is contained in:
parent
b56050ae5e
commit
58419abd50
|
@ -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[] = {
|
||||
|
|
Loading…
Reference in a new issue