From: u.kleine-koenig@pengutronix.de (Uwe =?iso-8859-1?Q?Kleine-K=F6nig?=) Date: Wed, 27 Oct 2010 09:30:44 +0200 Subject: [patch v3 07/10] efikamx: add support for power key In-Reply-To: <20101026201002.466426845@rtp-net.org> References: <20101026200723.839428019@rtp-net.org> <20101026201002.466426845@rtp-net.org> Message-ID: <20101027073044.GY8554@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Oct 26, 2010 at 10:07:30PM +0200, Arnaud Patard wrote: > This patch adds support for power key button of the efika mx. It's connected > on GPIO 2 31. > > Signed-off-by: Arnaud Patard > > Index: linux-2.6-submit/arch/arm/mach-mx5/board-mx51_efikamx.c > =================================================================== > --- linux-2.6-submit.orig/arch/arm/mach-mx5/board-mx51_efikamx.c 2010-10-26 19:57:16.000000000 +0200 > +++ linux-2.6-submit/arch/arm/mach-mx5/board-mx51_efikamx.c 2010-10-26 19:59:16.000000000 +0200 > @@ -19,6 +19,8 @@ > #include > #include > #include > +#include Do you really need linux/input.h? > +#include this is included by devices-common.h (which is included by devices-imx51.h). So you can drop this. > #include > #include > #include > @@ -48,10 +50,13 @@ > #define EFIKAMX_GREEN_LED (2*32 + 14) > #define EFIKAMX_RED_LED (2*32 + 15) > > +#define EFIKAMX_POWER_KEY (1*32 + 31) > + > /* the pci ids pin have pull up. they're driven low according to board id */ > #define MX51_PAD_PCBID0 IOMUX_PAD(0x518, 0x130, 3, 0x0, 0, PAD_CTL_PUS_100K_UP) > #define MX51_PAD_PCBID1 IOMUX_PAD(0x51C, 0x134, 3, 0x0, 0, PAD_CTL_PUS_100K_UP) > #define MX51_PAD_PCBID2 IOMUX_PAD(0x504, 0x128, 3, 0x0, 0, PAD_CTL_PUS_100K_UP) > +#define MX51_PAD_PWRKEY IOMUX_PAD(0x48c, 0x0f8, 1, 0x0, 0, PAD_CTL_PUS_100K_UP | PAD_CTL_PKE) > > static struct pad_desc mx51efikamx_pads[] = { > /* UART1 */ > @@ -91,6 +96,9 @@ > MX51_PAD_CSI1_D9__GPIO_3_13, > MX51_PAD_CSI1_VSYNC__GPIO_3_14, > MX51_PAD_CSI1_HSYNC__GPIO_3_15, > + > + /* power key */ > + MX51_PAD_PWRKEY, > }; > > /* Serial ports */ > @@ -220,6 +228,22 @@ > }, > }; > > +static struct gpio_keys_button mx51_efikamx_powerkey[] = { this should be const and __initconst > + { > + .code = KEY_POWER, > + .gpio = EFIKAMX_POWER_KEY, > + .type = EV_PWR, > + .desc = "Power Button (CM)", > + .wakeup = 1, > + .debounce_interval = 10, /* ms */ > + }, > +}; I'd prefer s/ *=/ =/ here. The equal signs are not aligned anyhow because of the last line. > + > +static struct gpio_keys_platform_data mx51_efikamx_powerkey_data = { > + .buttons = mx51_efikamx_powerkey, > + .nbuttons = ARRAY_SIZE(mx51_efikamx_powerkey), > +}; > + > static void __init mxc_board_init(void) > { > mxc_iomux_v3_setup_multiple_pads(mx51efikamx_pads, > @@ -236,6 +260,7 @@ > } > > platform_device_register(&mx51_efikamx_leds_device); > + imx51_add_gpio_keys(&mx51_efikamx_powerkey_data); > } > > static void __init mx51_efikamx_timer_init(void) > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |