Skip to contentSkip to conversation

ARCH_OMAP34XX usage in gpio PM code

PATCH Ranjith Lohithakshan 2 participants 2 messages May 5, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Kevin,

Most of the ARCH_OMAP34XX usage has been converted to ARCH_OMAP3, however there is still a piece of code in gpio on PM branch that refers ARCH_OMAP34XX

arch/arm/plat-omap/gpio.c +0 -0
index 7b2178c..0c84aae 100644
@@ -2095,7 +2095,7 @@ static int omap_gpio_suspend(struct sys_device

*dev, pm_me

                __raw_writel(bank->suspend_wakeup, wake_set);
                spin_unlock_irqrestore(&bank->lock, flags);

-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3

                if (bank->method == METHOD_GPIO_24XX) {
                        int j;
                        for (j = 0; j < 32; j++) {

Shouldn't we be making this change? Let me know and I will include it in the ads7846 wakeup series.

Just ran into this when testing the ads7846 wakeup support patches and observing that no gpio wakeup was happening. This part of the code that was setting the wakeup pad configuration was getting excluded as ARCH_OMAP34XX is not defined anymore.

Thanks,
Ranjith

#1 lore raw
Quoted 21 lines · Ranjith Lohithakshan

Kevin,

Most of the ARCH_OMAP34XX usage has been converted to ARCH_OMAP3, however there is still a piece of code in gpio on PM branch that refers ARCH_OMAP34XX

arch/arm/plat-omap/gpio.c +1 -1
index 7b2178c..0c84aae 100644
@@ -2095,7 +2095,7 @@ static int omap_gpio_suspend(struct sys_device
 *dev, pm_me
                __raw_writel(bank->suspend_wakeup, wake_set);
                spin_unlock_irqrestore(&bank->lock, flags);
 
-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3
                if (bank->method == METHOD_GPIO_24XX) {
                        int j;
                        for (j = 0; j < 32; j++) {
Quoted 2 lines

Shouldn't we be making this change? Let me know and I will include it in the ads7846 wakeup series.

You're right. Good catch.

Please submit this fix as a separate patch and I will add it to the pm-gpio branch.

Thanks,

Kevin