Commit 4b35ba11 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents f2d53a8f d9bd2645

MAINTAINERS

+2 −6
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-pxa/ezx.c

+30 −26
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-pxa/idp.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

CRA Git | Maintained and supported by SUSTech CRA and CCSE