From: Charulatha V <[email protected]> Modify the omap_gpio_save/restore_context to support OMAP4 architecture so that the OMAP GPIO driver need not be modified when OMAP4 off mode support is available.
Signed-off-by: Charulatha V <[email protected]> --- drivers/gpio/gpio_omap.c | 130 +++++++++++++++++++++++++++++++--------------- 1 files changed, 87 insertions(+), 43 deletions(-) diff --git a/drivers/gpio/gpio_omap.c b/drivers/gpio/gpio_omap.c index 5673951..9d55b7d 100644 --- a/drivers/gpio/gpio_omap.c +++ b/drivers/gpio/gpio_omap.c @@ -1476,9 +1476,6 @@ void omap2_gpio_resume_after_idle(void) } -#endif - -#ifdef CONFIG_ARCH_OMAP3 void omap_gpio_save_context(void) { struct gpio_bank *bank; @@ -1488,26 +1485,49 @@ void omap_gpio_save_context(void) if (!bank->loses_context) continue; - bank->context.irqenable1 = - __raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE1); - bank->context.irqenable2 = - __raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE2); - bank->context.wake_en = - __raw_readl(bank->base + OMAP24XX_GPIO_WAKE_EN); - bank->context.ctrl = - __raw_readl(bank->base + OMAP24XX_GPIO_CTRL); - bank->context.oe = - __raw_readl(bank->base + OMAP24XX_GPIO_OE); - bank->context.leveldetect0 = - __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); - bank->context.leveldetect1 = - __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); - bank->context.risingdetect = - __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT); - bank->context.fallingdetect = - __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT); - bank->context.dataout = - __raw_readl(bank->base + OMAP24XX_GPIO_DATAOUT); + if (bank->method == METHOD_GPIO_24XX) { + bank->context.irqenable1 = __raw_readl( + bank->base + OMAP24XX_GPIO_IRQENABLE1); + bank->context.irqenable2 = __raw_readl( + bank->base + OMAP24XX_GPIO_IRQENABLE2); + bank->context.wake_en = __raw_readl( + bank->base + OMAP24XX_GPIO_WAKE_EN); + bank->context.ctrl = __raw_readl( + bank->base + OMAP24XX_GPIO_CTRL); + bank->context.oe = __raw_readl( + bank->base + OMAP24XX_GPIO_OE); + bank->context.leveldetect0 = __raw_readl(bank->base + + OMAP24XX_GPIO_LEVELDETECT0); + bank->context.leveldetect1 = __raw_readl(bank->base + + OMAP24XX_GPIO_LEVELDETECT1); + bank->context.risingdetect = __raw_readl(bank->base + + OMAP24XX_GPIO_RISINGDETECT); + bank->context.fallingdetect = __raw_readl(bank->base + + OMAP24XX_GPIO_FALLINGDETECT); + bank->context.dataout = __raw_readl( + bank->base + OMAP24XX_GPIO_DATAOUT); + } else if (bank->method == METHOD_GPIO_44XX) { + bank->context.irqenable1 = __raw_readl( + bank->base + OMAP4_GPIO_IRQSTATUSSET0); + bank->context.irqenable2 = __raw_readl( + bank->base + OMAP4_GPIO_IRQSTATUSSET1); + bank->context.wake_en = __raw_readl( + bank->base + OMAP4_GPIO_IRQWAKEN0); + bank->context.ctrl = __raw_readl( + bank->base + OMAP4_GPIO_CTRL); + bank->context.oe = __raw_readl( + bank->base + OMAP24XX_GPIO_OE); + bank->context.leveldetect0 = __raw_readl(bank->base + + OMAP4_GPIO_LEVELDETECT0); + bank->context.leveldetect1 = __raw_readl(bank->base + + OMAP4_GPIO_LEVELDETECT1); + bank->context.risingdetect = __raw_readl(bank->base + + OMAP4_GPIO_RISINGDETECT); + bank->context.fallingdetect = __raw_readl(bank->base + + OMAP4_GPIO_FALLINGDETECT); + bank->context.dataout = __raw_readl( + bank->base + OMAP4_GPIO_DATAOUT); + } } } @@ -1520,28 +1540,52 @@ void omap_gpio_restore_context(void) if (!bank->loses_context) continue; - __raw_writel(bank->context.irqenable1, - bank->base + OMAP24XX_GPIO_IRQENABLE1); - __raw_writel(bank->context.irqenable2, - bank->base + OMAP24XX_GPIO_IRQENABLE2); - __raw_writel(bank->context.wake_en, - bank->base + OMAP24XX_GPIO_WAKE_EN); - __raw_writel(bank->context.ctrl, - bank->base + OMAP24XX_GPIO_CTRL); - __raw_writel(bank->context.oe, - bank->base + OMAP24XX_GPIO_OE); - __raw_writel(bank->context.leveldetect0, - bank->base + OMAP24XX_GPIO_LEVELDETECT0); - __raw_writel(bank->context.leveldetect1, - bank->base + OMAP24XX_GPIO_LEVELDETECT1); - __raw_writel(bank->context.risingdetect, - bank->base + OMAP24XX_GPIO_RISINGDETECT); - __raw_writel(bank->context.fallingdetect, - bank->base + OMAP24XX_GPIO_FALLINGDETECT); - __raw_writel(bank->context.dataout, - bank->base + OMAP24XX_GPIO_DATAOUT); + if (bank->method == METHOD_GPIO_24XX) { + __raw_writel(bank->context.irqenable1, bank->base + + OMAP24XX_GPIO_IRQENABLE1); + __raw_writel(bank->context.irqenable2, bank->base + + OMAP24XX_GPIO_IRQENABLE2); + __raw_writel(bank->context.wake_en, bank->base + + OMAP24XX_GPIO_WAKE_EN); + __raw_writel(bank->context.ctrl, bank->base + + OMAP24XX_GPIO_CTRL); + __raw_writel(bank->context.oe, bank->base + + OMAP24XX_GPIO_OE); + __raw_writel(bank->context.leveldetect0, bank->base + + OMAP24XX_GPIO_LEVELDETECT0); + __raw_writel(bank->context.leveldetect1, bank->base + + OMAP24XX_GPIO_LEVELDETECT1); + __raw_writel(bank->context.risingdetect, bank->base + + OMAP24XX_GPIO_RISINGDETECT); + __raw_writel(bank->context.fallingdetect, bank->base + + OMAP24XX_GPIO_FALLINGDETECT); + __raw_writel(bank->context.dataout, bank->base + + OMAP24XX_GPIO_DATAOUT); + } else if (bank->method == METHOD_GPIO_44XX) { + __raw_writel(bank->context.irqenable1, bank->base + + OMAP4_GPIO_IRQSTATUSSET0); + __raw_writel(bank->context.irqenable2, bank->base + + OMAP4_GPIO_IRQSTATUSSET1); + __raw_writel(bank->context.wake_en, bank->base + + OMAP4_GPIO_IRQWAKEN0); + __raw_writel(bank->context.ctrl, bank->base + + OMAP4_GPIO_CTRL); + __raw_writel(bank->context.oe, bank->base + + OMAP24XX_GPIO_OE); + __raw_writel(bank->context.leveldetect0, bank->base + + OMAP4_GPIO_LEVELDETECT0); + __raw_writel(bank->context.leveldetect1, bank->base + + OMAP4_GPIO_LEVELDETECT1); + __raw_writel(bank->context.risingdetect, bank->base + + OMAP4_GPIO_RISINGDETECT); + __raw_writel(bank->context.fallingdetect, bank->base + + OMAP4_GPIO_FALLINGDETECT); + __raw_writel(bank->context.dataout, bank->base + + OMAP4_GPIO_DATAOUT); + } } } + #endif static struct platform_driver omap_gpio_driver = { -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
