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

Commit a7f2bdb3 authored by Antonio Ospite's avatar Antonio Ospite Committed by Eric Miao
Browse files

[ARM] pxa/em-x270: don't use pxa_camera init() callback 



pxa_camera init() is ambiguous, it's better to statically configure the sensor.

Signed-off-by: default avatarAntonio Ospite <ospite@studenti.unina.it>
Acked-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent db205463

arch/arm/mach-pxa/em-x270.c

+5 −4
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ static inline void em_x270_init_gpio_keys(void) {} 
#if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)

static struct regulator *em_x270_camera_ldo;



static int em_x270_sensor_init(struct device *dev)

static int em_x270_sensor_init(void)

{

	int ret;
@@ -996,7 +996,6 @@ static int em_x270_sensor_init(struct device *dev) 
}



struct pxacamera_platform_data em_x270_camera_platform_data = {

	.init	= em_x270_sensor_init,

	.flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |

		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,

	.mclk_10khz = 2600,
@@ -1049,9 +1048,11 @@ static struct platform_device em_x270_camera = { 


static void  __init em_x270_init_camera(void)

{

	if (em_x270_sensor_init() == 0) {

		pxa_set_camera_info(&em_x270_camera_platform_data);

		platform_device_register(&em_x270_camera);

	}

}

#else

static inline void em_x270_init_camera(void) {}

#endif