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

Commit 67af5ebd authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Robert Jarzmik
Browse files

ARM: pxa: ezx: fix a910 camera data 



The camera_supply_dummy_device definition is shared between a780 and a910,
but only provided when the first is enabled and fails to build for a
configuration with only a910:

arch/arm/mach-pxa/ezx.c:1097:3: error: 'camera_supply_dummy_device' undeclared here (not in a function)

This moves the definition into its own section.

Fixes: 6c1b417a ("ARM: pxa: ezx: use the new pxa_camera platform_data")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
parent 7ce7d89f

arch/arm/mach-pxa/ezx.c

+30 −26
Original line number Original line Diff line number Diff line
@@ -696,32 +696,7 @@ static struct pxa27x_keypad_platform_data e2_keypad_platform_data = { 
};

};

#endif /* CONFIG_MACH_EZX_E2 */

#endif /* CONFIG_MACH_EZX_E2 */





#ifdef CONFIG_MACH_EZX_A780

#if defined(CONFIG_MACH_EZX_A780) || defined(CONFIG_MACH_EZX_A910)

/* gpio_keys */

static struct gpio_keys_button a780_buttons[] = {

	[0] = {

		.code       = SW_LID,

		.gpio       = GPIO12_A780_FLIP_LID,

		.active_low = 0,

		.desc       = "A780 flip lid",

		.type       = EV_SW,

		.wakeup     = 1,

	},

};



static struct gpio_keys_platform_data a780_gpio_keys_platform_data = {

	.buttons  = a780_buttons,

	.nbuttons = ARRAY_SIZE(a780_buttons),

};



static struct platform_device a780_gpio_keys = {

	.name = "gpio-keys",

	.id   = -1,

	.dev  = {

		.platform_data = &a780_gpio_keys_platform_data,

	},

};



/* camera */

/* camera */

static struct regulator_consumer_supply camera_dummy_supplies[] = {

static struct regulator_consumer_supply camera_dummy_supplies[] = {

	REGULATOR_SUPPLY("vdd", "0-005d"),

	REGULATOR_SUPPLY("vdd", "0-005d"),
@@ -750,6 +725,35 @@ static struct platform_device camera_supply_dummy_device = { 
		.platform_data = &camera_dummy_config,

		.platform_data = &camera_dummy_config,

	},

	},

};

};

#endif



#ifdef CONFIG_MACH_EZX_A780

/* gpio_keys */

static struct gpio_keys_button a780_buttons[] = {

	[0] = {

		.code       = SW_LID,

		.gpio       = GPIO12_A780_FLIP_LID,

		.active_low = 0,

		.desc       = "A780 flip lid",

		.type       = EV_SW,

		.wakeup     = 1,

	},

};



static struct gpio_keys_platform_data a780_gpio_keys_platform_data = {

	.buttons  = a780_buttons,

	.nbuttons = ARRAY_SIZE(a780_buttons),

};



static struct platform_device a780_gpio_keys = {

	.name = "gpio-keys",

	.id   = -1,

	.dev  = {

		.platform_data = &a780_gpio_keys_platform_data,

	},

};



/* camera */

static int a780_camera_reset(struct device *dev)

static int a780_camera_reset(struct device *dev)

{

{

	gpio_set_value(GPIO19_GEN1_CAM_RST, 0);

	gpio_set_value(GPIO19_GEN1_CAM_RST, 0);