mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

This is the pxa changes for v4.11 cycle. 

This cycle is a minor fixes one, covering :
  - build fixes from Arnd, mainly include related
  - transfer of maintainance of Motorala phone to Robert
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYibmfAAoJEAP2et0duMsSNoMP/0XbmPRO7cu0HjrBUYm9aWeJ
 omandU8yhpfvHbURWhq0sAMMbOJuBanQbI/W6n91Pijx5ms2X2nGPD820Csj/2SN
 LQoRhqFp3nf9c/U9PSJuBwHooYY2VWvdY2LiCu4H/cbgOe5XEdSHYYexynStVxuW
 1+eINYeoNQz63o2u29PJceHdZgXAJrymqXaI3T53oUyfIY8EvZu4Cs6hCBBrurU/
 vdvAQ1oRJUj2Rfbzb7JxVmY9kVRoMEecbPfd1EPrrsDs6QBsQnSmnhavDWn1AG04
 8VfbMeuFJrkBhXMUeKbEDIRT9DD5bVbQ5S/Lvz/mWIRq0M7noIYR1BIVes2auYfs
 9DAgZ4C0yqyN+Qd/us3iU97OxL3qNX38a1hiH4AMSiDd0d8MzZV73UUzPXjPRFRB
 dZ1KedAPqGCtwAuvvDf9ldPVrt1PX29EgYGbRXxLPcK+60QOKuajs3PYqDAGYLa1
 RHqz81xWMBSF50VsU9GD3PaE1W0+oQikHCDn+DY1z0pPJvsnQ+Ew2/5XEPoLlCES
 MsJhpBliir7ZvYrCrVHzaKwlH+Ps6CPZG7VXHx42XsuG4JMexS8wnXhv77xV4wRu
 uFiO69raOeeSZOoAvWiqXEX2gtN+saE1UzyG/HAjWUFbROUgNCrhkm2BpqVW7FtM
 VnXT0cwOLcj6RXbI1cCu
 =Z3AX
 -----END PGP SIGNATURE-----

Merge tag 'pxa-for-4.11' of https://github.com/rjarzmik/linux into next/soc

This is the pxa changes for v4.11 cycle.

This cycle is a minor fixes one, covering :
 - build fixes from Arnd, mainly include related
 - transfer of maintainance of Motorala phone to Robert

* tag 'pxa-for-4.11' of https://github.com/rjarzmik/linux:
  MAINTAINERS: transfer maintainership for the EZX platform
  ARM: pxa: include linux/leds.h
  ARM: pxa: ezx: fix a910 camera data

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-01-29 17:36:44 -08:00
parent f2d53a8f6e d9bd264596
commit 4b35ba1108
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MAINTAINERS
View File

@ -1227,13 +1227,9 @@ S: Maintained
N: efm32
ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
M: Daniel Ribeiro <drwyrm@gmail.com>
M: Stefan Schmidt <stefan@openezx.org>
M: Harald Welte <laforge@openezx.org>
L: openezx-devel@lists.openezx.org (moderated for non-subscribers)
W: http://www.openezx.org/
M: Robert Jarzmik <robert.jarzmik@free.fr>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: topgit git://git.openezx.org/openezx.git
F: arch/arm/mach-pxa/ezx.c
ARM/FARADAY FA526 PORT

56
arch/arm/mach-pxa/ezx.c
View File

@ -696,32 +696,7 @@ static struct pxa27x_keypad_platform_data e2_keypad_platform_data = {
};
#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_supply_dummy_device = {
.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);

1
arch/arm/mach-pxa/idp.c
View File

@ -19,6 +19,7 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/leds.h>
#include <linux/platform_device.h>
#include <linux/fb.h>