From: Tarun Kanti DebBarma <tarun.kanti@ti.com>
To: linux-omap@vger.kernel.org
Cc: khilman@ti.com, tony@atomide.com,
linux-arm-kernel@lists.infradead.org,
Tarun Kanti DebBarma <tarun.kanti@ti.com>,
Charulatha V <charu@ti.com>
Subject: [PATCH v9 09/31] gpio/omap: remove hardcoded offsets in context save/restore
Date: Wed, 14 Dec 2011 01:50:11 +0530 [thread overview]
Message-ID: <1323807633-23713-10-git-send-email-tarun.kanti@ti.com> (raw)
In-Reply-To: <1323807633-23713-1-git-send-email-tarun.kanti@ti.com>
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>
---
arch/arm/mach-omap2/gpio.c | 2 +
arch/arm/plat-omap/include/plat/gpio.h | 1 +
drivers/gpio/gpio-omap.c | 42 +++++++++++++++----------------
3 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
index ae5043e..f4c45ca 100644
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@ -84,6 +84,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
pdata->regs->irqstatus = OMAP24XX_GPIO_IRQSTATUS1;
pdata->regs->irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2;
pdata->regs->irqenable = OMAP24XX_GPIO_IRQENABLE1;
+ pdata->regs->irqenable2 = OMAP24XX_GPIO_IRQENABLE2;
pdata->regs->set_irqenable = OMAP24XX_GPIO_SETIRQENABLE1;
pdata->regs->clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1;
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->irqstatus2 = OMAP4_GPIO_IRQSTATUS1;
pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0;
+ pdata->regs->irqenable2 = OMAP4_GPIO_IRQSTATUSSET1;
pdata->regs->set_irqenable = OMAP4_GPIO_IRQSTATUSSET0;
pdata->regs->clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0;
pdata->regs->debounce = OMAP4_GPIO_DEBOUNCINGTIME;
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index 97f8c4e..93f533f 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -184,6 +184,7 @@ struct omap_gpio_reg_offs {
u16 irqstatus;
u16 irqstatus2;
u16 irqenable;
+ u16 irqenable2;
u16 set_irqenable;
u16 clr_irqenable;
u16 debounce;
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 7b25115..9c0ff4b 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1377,45 +1377,43 @@ void omap2_gpio_resume_after_idle(void)
static void omap_gpio_save_context(struct gpio_bank *bank)
{
bank->context.irqenable1 =
- __raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE1);
+ __raw_readl(bank->base + bank->regs->irqenable);
bank->context.irqenable2 =
- __raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE2);
+ __raw_readl(bank->base + bank->regs->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);
+ __raw_readl(bank->base + bank->regs->wkup_en);
+ bank->context.ctrl = __raw_readl(bank->base + bank->regs->ctrl);
+ bank->context.oe = __raw_readl(bank->base + bank->regs->direction);
bank->context.leveldetect0 =
- __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0);
+ __raw_readl(bank->base + bank->regs->leveldetect0);
bank->context.leveldetect1 =
- __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1);
+ __raw_readl(bank->base + bank->regs->leveldetect1);
bank->context.risingdetect =
- __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT);
+ __raw_readl(bank->base + bank->regs->risingdetect);
bank->context.fallingdetect =
- __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT);
- bank->context.dataout =
- __raw_readl(bank->base + OMAP24XX_GPIO_DATAOUT);
+ __raw_readl(bank->base + bank->regs->fallingdetect);
+ bank->context.dataout = __raw_readl(bank->base + bank->regs->dataout);
}
static void omap_gpio_restore_context(struct gpio_bank *bank)
{
__raw_writel(bank->context.irqenable1,
- bank->base + OMAP24XX_GPIO_IRQENABLE1);
+ bank->base + bank->regs->irqenable);
__raw_writel(bank->context.irqenable2,
- bank->base + OMAP24XX_GPIO_IRQENABLE2);
+ bank->base + bank->regs->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);
+ bank->base + bank->regs->wkup_en);
+ __raw_writel(bank->context.ctrl, bank->base + bank->regs->ctrl);
+ __raw_writel(bank->context.oe, bank->base + bank->regs->direction);
__raw_writel(bank->context.leveldetect0,
- bank->base + OMAP24XX_GPIO_LEVELDETECT0);
+ bank->base + bank->regs->leveldetect0);
__raw_writel(bank->context.leveldetect1,
- bank->base + OMAP24XX_GPIO_LEVELDETECT1);
+ bank->base + bank->regs->leveldetect1);
__raw_writel(bank->context.risingdetect,
- bank->base + OMAP24XX_GPIO_RISINGDETECT);
+ bank->base + bank->regs->risingdetect);
__raw_writel(bank->context.fallingdetect,
- bank->base + OMAP24XX_GPIO_FALLINGDETECT);
- __raw_writel(bank->context.dataout,
- bank->base + OMAP24XX_GPIO_DATAOUT);
+ bank->base + bank->regs->fallingdetect);
+ __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);
}
#endif
--
1.7.0.4
next prev parent reply other threads:[~2011-12-13 20:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-13 20:20 [PATCH v9 00/31] gpio/omap: driver cleanup and fixes Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 01/31] gpio/omap: remove dependency on gpio_bank_count Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 02/31] gpio/omap: use flag to identify wakeup domain Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 03/31] gpio/omap: make gpio_context part of gpio_bank structure Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 04/31] gpio/omap: handle save/restore context in GPIO driver Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 05/31] gpio/omap: make non-wakeup GPIO part of pdata Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 06/31] gpio/omap: avoid cpu checks during module ena/disable Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 07/31] gpio/omap: further cleanup using wkup_en register Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 08/31] gpio/omap: use level/edge detect reg offsets Tarun Kanti DebBarma
2011-12-13 20:20 ` Tarun Kanti DebBarma [this message]
2011-12-13 20:20 ` [PATCH v9 10/31] gpio/omap: cleanup set_gpio_triggering function Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 11/31] gpio/omap: cleanup omap_gpio_mod_init function Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 12/31] gpio/omap: use pinctrl offset instead of macro Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 13/31] gpio/omap: remove unnecessary bit-masking for read access Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 14/31] gpio/omap: remove bank->method & METHOD_* macros Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 15/31] gpio/omap: fix bankwidth for OMAP7xx MPUIO Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 16/31] gpio/omap: use pm-runtime framework Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 17/31] gpio/omap: optimize suspend and resume functions Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 18/31] gpio/omap: cleanup prepare_for_idle and resume_after_idle Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 19/31] gpio/omap: fix debounce clock handling Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 20/31] gpio/omap: fix incorrect access of debounce module Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 21/31] gpio/omap: remove omap_gpio_save_context overhead Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 22/31] gpio/omap: save and restore debounce registers Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 23/31] gpio/omap: enable irq at the end of all configuration in restore Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 24/31] gpio/omap: restore OE only after setting the output level Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 25/31] gpio/omap: handle set_dataout reg capable IP on restore Tarun Kanti DebBarma
2011-12-16 7:28 ` [PATCH v9 00/31] gpio/omap: driver cleanup and fixes Shilimkar, Santosh
2011-12-16 8:24 ` DebBarma, Tarun Kanti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1323807633-23713-10-git-send-email-tarun.kanti@ti.com \
--to=tarun.kanti@ti.com \
--cc=charu@ti.com \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).