From: utx@penguin.cz (Stanislav Brabec) Date: Fri, 16 Oct 2009 20:50:05 +0200 Subject: [PATCH] Re: spitz: add gpio button support (fixes regression) In-Reply-To: <20091016093950.GI15898@elf.ucw.cz> References: <20091007085806.GB28807@elf.ucw.cz> <1254914991.4213.80.camel@hammer.suse.cz> <20091007120643.GA17069@rakim.wolfsonmicro.main> <20091006200933.GA1606@ucw.cz> <1255641385.3985.55.camel@utx.utx.cz> <20091015212024.GC15898@elf.ucw.cz> <1255643252.3985.63.camel@utx.utx.cz> <20091015215215.GG15898@elf.ucw.cz> <1255685315.5470.3.camel@hammer.suse.cz> <20091016093950.GI15898@elf.ucw.cz> Message-ID: <1255719006.9583.31.camel@utx.utx.cz> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Pavel Machek wrote: >Ok, lets do it that way, then. Updating desc for lid keys and resending patch with proper comments: ? Define Spitz buttons as GPIO keys in a way compatible with the old driver: On/Off: As Suspend EV_PWR key ?Raw values of? lid sensors ?SWA and SWB: As EV_SW switches SWA: Display Down SWB: Lid Closed Recommended user space decoding: ?SWA==0 & SWB==0: lid opened (landscape mode) ??SWA==1 & SWB==0: ?invalid (or mechanic race condition) SWA==0 & SWB==1: ?lid closed with display up (portrait mode or ?mechanic race condition while closing to ?display-less mode) SWA==1 & SWB==1: lid closed with display down (display-less mode) ?AK_INT remote trigger is not mapped as input event. Without complete remote driver and remote pull-up control it has no useful interpretation. Signed-off-by: Stanislav Brabec Acked-by: Pavel Machek diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index ee8d603..c690522 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -375,6 +376,43 @@ static struct platform_device spitzkbd_device = { }; +static struct gpio_keys_button spitz_gpio_keys[] = { + { + .type = EV_PWR, + .code = KEY_SUSPEND, + .gpio = SPITZ_GPIO_ON_KEY, + .desc = "On/Off", + .wakeup = 1, + }, + /* Two buttons detecting the lid state */ + { + .type = EV_SW, + .code = 0, + .gpio = SPITZ_GPIO_SWA, + .desc = "?Display Down", + }, + { + .type = EV_SW, + .code = 1, + .gpio = SPITZ_GPIO_SWB, + .desc = "?Lid Closed", + }, +}; + +static struct gpio_keys_platform_data spitz_gpio_keys_platform_data = { + .buttons = spitz_gpio_keys, + .nbuttons = ARRAY_SIZE(spitz_gpio_keys), +}; + +static struct platform_device spitz_gpio_keys_device = { + .name = "gpio-keys", + .id = -1, + .dev = { + .platform_data = &spitz_gpio_keys_platform_data, + }, +}; + + /* * Spitz LEDs */ @@ -689,6 +727,7 @@ static struct platform_device sharpsl_rom_device = { static struct platform_device *devices[] __initdata = { &spitzscoop_device, &spitzkbd_device, + &spitz_gpio_keys_device, &spitzled_device, &sharpsl_nand_device, &sharpsl_rom_device, ________________________________________________________________________ Stanislav Brabec http://www.penguin.cz/~utx