Patch "ARM: pxa: ezx: fix a910 camera data" has been added to the 4.10-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
ARM: pxa: ezx: fix a910 camera data
to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-pxa-ezx-fix-a910-camera-data.patch
and it can be found in the queue-4.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
67af5ebde1a4cd10e7bb663440de0773b7597c70Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Thu, 24 Nov 2016 17:29:18 +0100
Subject: ARM: pxa: ezx: fix a910 camera data
From: Arnd Bergmann <[email protected]>
commit 67af5ebde1a4cd10e7bb663440de0773b7597c70 upstream.
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.
--- arch/arm/mach-pxa/ezx.c | 56 +++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 26 deletions(-)
arch/arm/mach-pxa/ezx.c +30 -26
@@ -696,32 +696,7 @@ static struct pxa27x_keypad_platform_dat };#endif /* CONFIG_MACH_EZX_E2 */ -#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, - }, -}; - +#if defined(CONFIG_MACH_EZX_A780 ) || defined(CONFIG_MACH_EZX_A910 )/* camera */ static struct regulator_consumer_supply camera_dummy_supplies[] = { REGULATOR_SUPPLY("vdd", "0-005d"),
@@ -750,6 +725,35 @@ static struct platform_device camera_sup .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) {gpio_set_value (GPIO19_GEN1_CAM_RST ,0 );
Patches currently in stable-queue which might be from [email protected] are
queue-4.10/scsi-smartpqi-fix-time-handling.patch queue-4.10/leds-ktd2692-avoid-harmless-maybe-uninitialized-warning.patch queue-4.10/scsi-qedi-fix-build-error-without-debug_fs.patch queue-4.10/arm-pxa-ezx-fix-a910-camera-data.patch