dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

gpio/omap: remove hardcoded offsets in context save/restore 

It is not required to use hard-coded offsets any more in context save and
restore functions and instead use the generic offsets which have been correctly
initialized during device registration.

Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Signed-off-by: Charulatha V <charu@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Tarun Kanti DebBarma 2011-08-30 15:24:27 +05:30
parent 9ea14d8cbb
commit ae10f2336b
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/gpio.c
View File

@ -84,6 +84,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
pdata->regs->irqstatus = OMAP24XX_GPIO_IRQSTATUS1; pdata->regs->irqstatus = OMAP24XX_GPIO_IRQSTATUS1;
pdata->regs->irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2; pdata->regs->irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2;
pdata->regs->irqenable = OMAP24XX_GPIO_IRQENABLE1; pdata->regs->irqenable = OMAP24XX_GPIO_IRQENABLE1;
pdata->regs->irqenable2 = OMAP24XX_GPIO_IRQENABLE2;
pdata->regs->set_irqenable = OMAP24XX_GPIO_SETIRQENABLE1; pdata->regs->set_irqenable = OMAP24XX_GPIO_SETIRQENABLE1;
pdata->regs->clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1; pdata->regs->clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1;
pdata->regs->debounce = OMAP24XX_GPIO_DEBOUNCE_VAL; pdata->regs->debounce = OMAP24XX_GPIO_DEBOUNCE_VAL;
@ -106,6 +107,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0; pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0;
pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1; pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1;
pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0; pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0;
pdata->regs->irqenable2 = OMAP4_GPIO_IRQSTATUSSET1;
pdata->regs->set_irqenable = OMAP4_GPIO_IRQSTATUSSET0; pdata->regs->set_irqenable = OMAP4_GPIO_IRQSTATUSSET0;
pdata->regs->clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0; pdata->regs->clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0;
pdata->regs->debounce = OMAP4_GPIO_DEBOUNCINGTIME; pdata->regs->debounce = OMAP4_GPIO_DEBOUNCINGTIME;

1
arch/arm/plat-omap/include/plat/gpio.h
View File

@ -184,6 +184,7 @@ struct omap_gpio_reg_offs {
u16 irqstatus; u16 irqstatus;
u16 irqstatus2; u16 irqstatus2;
u16 irqenable; u16 irqenable;
u16 irqenable2;
u16 set_irqenable; u16 set_irqenable;
u16 clr_irqenable; u16 clr_irqenable;
u16 debounce; u16 debounce;

42
drivers/gpio/gpio-omap.c
View File

@ -1369,45 +1369,43 @@ void omap2_gpio_resume_after_idle(void)
static void omap_gpio_save_context(struct gpio_bank *bank) static void omap_gpio_save_context(struct gpio_bank *bank)
{ {
bank->context.irqenable1 = bank->context.irqenable1 =
__raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE1); __raw_readl(bank->base + bank->regs->irqenable);
bank->context.irqenable2 = bank->context.irqenable2 =
__raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE2); __raw_readl(bank->base + bank->regs->irqenable2);
bank->context.wake_en = bank->context.wake_en =
__raw_readl(bank->base + OMAP24XX_GPIO_WAKE_EN); __raw_readl(bank->base + bank->regs->wkup_en);
bank->context.ctrl = __raw_readl(bank->base + OMAP24XX_GPIO_CTRL); bank->context.ctrl = __raw_readl(bank->base + bank->regs->ctrl);
bank->context.oe = __raw_readl(bank->base + OMAP24XX_GPIO_OE); bank->context.oe = __raw_readl(bank->base + bank->regs->direction);
bank->context.leveldetect0 = bank->context.leveldetect0 =
__raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); __raw_readl(bank->base + bank->regs->leveldetect0);
bank->context.leveldetect1 = bank->context.leveldetect1 =
__raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); __raw_readl(bank->base + bank->regs->leveldetect1);
bank->context.risingdetect = bank->context.risingdetect =
__raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT); __raw_readl(bank->base + bank->regs->risingdetect);
bank->context.fallingdetect = bank->context.fallingdetect =
__raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT); __raw_readl(bank->base + bank->regs->fallingdetect);
bank->context.dataout = bank->context.dataout = __raw_readl(bank->base + bank->regs->dataout);
__raw_readl(bank->base + OMAP24XX_GPIO_DATAOUT);
} }
static void omap_gpio_restore_context(struct gpio_bank *bank) static void omap_gpio_restore_context(struct gpio_bank *bank)
{ {
__raw_writel(bank->context.irqenable1, __raw_writel(bank->context.irqenable1,
bank->base + OMAP24XX_GPIO_IRQENABLE1); bank->base + bank->regs->irqenable);
__raw_writel(bank->context.irqenable2, __raw_writel(bank->context.irqenable2,
bank->base + OMAP24XX_GPIO_IRQENABLE2); bank->base + bank->regs->irqenable2);
__raw_writel(bank->context.wake_en, __raw_writel(bank->context.wake_en,
bank->base + OMAP24XX_GPIO_WAKE_EN); bank->base + bank->regs->wkup_en);
__raw_writel(bank->context.ctrl, bank->base + OMAP24XX_GPIO_CTRL); __raw_writel(bank->context.ctrl, bank->base + bank->regs->ctrl);
__raw_writel(bank->context.oe, bank->base + OMAP24XX_GPIO_OE); __raw_writel(bank->context.oe, bank->base + bank->regs->direction);
__raw_writel(bank->context.leveldetect0, __raw_writel(bank->context.leveldetect0,
bank->base + OMAP24XX_GPIO_LEVELDETECT0); bank->base + bank->regs->leveldetect0);
__raw_writel(bank->context.leveldetect1, __raw_writel(bank->context.leveldetect1,
bank->base + OMAP24XX_GPIO_LEVELDETECT1); bank->base + bank->regs->leveldetect1);
__raw_writel(bank->context.risingdetect, __raw_writel(bank->context.risingdetect,
bank->base + OMAP24XX_GPIO_RISINGDETECT); bank->base + bank->regs->risingdetect);
__raw_writel(bank->context.fallingdetect, __raw_writel(bank->context.fallingdetect,
bank->base + OMAP24XX_GPIO_FALLINGDETECT); bank->base + bank->regs->fallingdetect);
__raw_writel(bank->context.dataout, __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);
bank->base + OMAP24XX_GPIO_DATAOUT);
} }
#endif #endif