Re: spitz: add gpio button support (fixes regression)

Pavel Machek
2009-10-15T21:21:11Z

Hi!

> > > So what's the conclusion of the patch? Any ACK/NAK or patch needs updating?
>
> Well, AK_INT as it is implemented does not give any useful information,
> but it does not break anything. When inserting or removing remote, or
> (any) remote key is pressed, it generates one or more switch events.
> This code will have to be removed after implementing full remote support
> (turning pull-up resistor may cause false events, ???insert/remove needs
> more aggressive debounce), so I would prefer not adding AK_INT support.
> (See patch below.)

Ok.

> > Please take this updated version.
>
> > Spitz switched to generic matrix-gpio keyboard driver in 2.6.32-rc0,
> > but that means that support for power button and lid switches was
> > lost. This restores it, using button-gpio code.
>
> I just tested it. It returns keys function, but suspend button does not
> cause suspend. Just an input event occurs, see below for output from
> evtest. Resume after "echo mem >/sys/power/state" is impossible. I think
> it is not intended behavior.
> ???

Well, resume is hit by second regression.

Suspend key.... I restored it to the level of functionality in
2.6.31 :-).

> diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
> index ee8d603..a8ef058 100644
> --- a/arch/arm/mach-pxa/spitz.c
> +++ b/arch/arm/mach-pxa/spitz.c
> @@ -15,6 +15,7 @@
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> #include <linux/delay.h>
> +#include <linux/gpio_keys.h>
> #include <linux/gpio.h>
> #include <linux/leds.h>
> #include <linux/mtd/physmap.h>
> @@ -375,6 +376,43 @@ static struct platform_device spitzkbd_device = {
> };
>
>
> +static struct gpio_keys_button spitz_gpio_keys[] = {
> + {
> + .type = EV_KEY,
> + .code = KEY_SUSPEND,
> + .gpio = SPITZ_GPIO_ON_KEY,
> + .desc = "Power button",
> + .wakeup = 1,
> + },
> + /* Two buttons detecting the LID state */
> + {
> + .type = EV_SW,
> + .code = 0,
> + .gpio = SPITZ_GPIO_SWA,
> + .desc = "Lid SWA",
> + },
> + {
> + .type = EV_SW,
> + .code = 1,
> + .gpio = SPITZ_GPIO_SWB,
> + .desc = "Lid SWB",
> + },
> +};
> +
> +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,
>

Ack. Someone please apply it.
Pavel

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html