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

Commit aa9f6d6b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'armadillo800eva' of... 

Merge branch 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

* 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
  ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions
parents 981ba657 5c1d2d16

arch/arm/mach-shmobile/board-armadillo800eva.c

+6 −5
Original line number Diff line number Diff line
@@ -520,13 +520,14 @@ static struct platform_device hdmi_lcdc_device = { 
};



/* GPIO KEY */

#define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 }

#define GPIO_KEY(c, g, d, ...) \

	{ .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ }



static struct gpio_keys_button gpio_buttons[] = {

	GPIO_KEY(KEY_POWER,	GPIO_PORT99,	"SW1"),

	GPIO_KEY(KEY_BACK,	GPIO_PORT100,	"SW2"),

	GPIO_KEY(KEY_MENU,	GPIO_PORT97,	"SW3"),

	GPIO_KEY(KEY_HOME,	GPIO_PORT98,	"SW4"),

	GPIO_KEY(KEY_POWER,	GPIO_PORT99,	"SW3", .wakeup = 1),

	GPIO_KEY(KEY_BACK,	GPIO_PORT100,	"SW4"),

	GPIO_KEY(KEY_MENU,	GPIO_PORT97,	"SW5"),

	GPIO_KEY(KEY_HOME,	GPIO_PORT98,	"SW6"),

};



static struct gpio_keys_platform_data gpio_key_info = {