Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58419abd authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

sh: fix soc-camera compile breakage on Migo-R. 



Fix Migo-R compile breakage caused by incomplete merge.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b56050ae

arch/sh/boards/mach-migor/setup.c

+9 −2
Original line number Diff line number Diff line
@@ -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[] = {