On Sat 2010-01-02 16:27:24, Pavel Machek wrote:
> On Sat 2010-01-02 14:56:09, Pavel Machek wrote:
> > Hi!
> >
> > > > > We ignore the failure right now in the mainline but that causes stack
> > > > > traces on resume as we trying to disable not enabled wakeup GPIOs. That
> > > > > was original Pavel's complaint.
> > > >
> > > > Yep...
> > > >
> > > > I'd say that BUG() simply should not trigger if wakeup can not be
> > > > enabled/disabled for particular source...?
> > >
> > > Pavel,
> > >
> > > Could you please try the patch below and let me know if it fixes the
> > > problem for you?
> >
> > (sorry for long delay).
> >
> > With 33-rc1+your patch, warnings are no longer there.
> >
> > I still have one on irq191, but that's gpio button driver.
> >
> > But please, hold the patch for few more days. I may have cleaner/nicer
> > solution. It seems that zaurus is doing something very stupid in low
> > layers.
>
> I'm thinking that maybe something like this should do the trick.
And it does, simplyfing pxa-specific code. More testing would be nice,
but I guess simplifying pxa is preferable to adding workarounds in
input.
Signed-off-by: Pavel Machek <pavel@xxxxxx>
> --- ./arch/arm.ofic/mach-pxa/mfp-pxa2xx.c 2009-09-10 00:13:59.000000000 +0200
> +++ ./arch/arm/mach-pxa/mfp-pxa2xx.c 2009-12-29 03:16:40.000000000 +0100
> @@ -34,7 +34,6 @@
> struct gpio_desc {
> unsigned valid : 1;
> unsigned can_wakeup : 1;
> - unsigned keypad_gpio : 1;
> unsigned dir_inverted : 1;
> unsigned int mask; /* bit mask in PWER or PKWR */
> unsigned int mux_mask; /* bit mask of muxed gpio bits, 0 if no mux */
> @@ -178,9 +177,6 @@
> if (!d->valid)
> return -EINVAL;
>
> - if (d->keypad_gpio)
> - return -EINVAL;
> -
> mux_taken = (PWER & d->mux_mask) & (~d->mask);
> if (on && mux_taken)
> return -EBUSY;
> @@ -231,32 +227,6 @@
> #endif /* CONFIG_PXA25x */
>
> #ifdef CONFIG_PXA27x
> -static int pxa27x_pkwr_gpio[] = {
> - 13, 16, 17, 34, 36, 37, 38, 39, 90, 91, 93, 94,
> - 95, 96, 97, 98, 99, 100, 101, 102
> -};
> -
> -int keypad_set_wake(unsigned int on)
> -{
> - unsigned int i, gpio, mask = 0;
> -
> - if (!on) {
> - PKWR = 0;
> - return 0;
> - }
> -
> - for (i = 0; i < ARRAY_SIZE(pxa27x_pkwr_gpio); i++) {
> -
> - gpio = pxa27x_pkwr_gpio[i];
> -
> - if (gpio_desc[gpio].config & MFP_LPM_CAN_WAKEUP)
> - mask |= gpio_desc[gpio].mask;
> - }
> -
> - PKWR = mask;
> - return 0;
> -}
> -
> #define PWER_WEMUX2_GPIO38 (1 << 16)
> #define PWER_WEMUX2_GPIO53 (2 << 16)
> #define PWER_WEMUX2_GPIO40 (3 << 16)
> @@ -273,6 +243,12 @@
> gpio_desc[(gpio)].mux_mask = PWER_ ## mux ## _MASK; \
> } while (0)
>
> +
> +static int pxa27x_pkwr_gpio[] = {
> + 13, 16, 17, 34, 36, 37, 38, 39, 90, 91, 93, 94,
> + 95, 96, 97, 98, 99, 100, 101, 102
> +};
> +
> static void __init pxa27x_mfp_init(void)
> {
> int i, gpio;
> @@ -291,7 +267,6 @@
> for (i = 0; i < ARRAY_SIZE(pxa27x_pkwr_gpio); i++) {
> gpio = pxa27x_pkwr_gpio[i];
> gpio_desc[gpio].can_wakeup = 1;
> - gpio_desc[gpio].keypad_gpio = 1;
> gpio_desc[gpio].mask = 1 << i;
> }
>
> --- ./arch/arm.ofic/mach-pxa/pxa27x.c 2009-09-10 00:13:59.000000000 +0200
> +++ ./arch/arm/mach-pxa/pxa27x.c 2009-12-29 03:13:00.000000000 +0100
> @@ -323,9 +323,6 @@
> if (gpio >= 0 && gpio < 128)
> return gpio_set_wake(gpio, on);
>
> - if (irq == IRQ_KEYPAD)
> - return keypad_set_wake(on);
> -
> switch (irq) {
> case IRQ_RTCAlrm:
> mask = PWER_RTC;
>
>
>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
