From: charu@ti.com (Varadarajan, Charulatha)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/15] OMAP: GPIO: Remove hardcoded offsets in ctxt save/restore
Date: Thu, 26 May 2011 15:18:28 +0530 [thread overview]
Message-ID: <BANLkTikA63fLpGFspPg3h3fx3juUy7X60w@mail.gmail.com> (raw)
In-Reply-To: <B85A65D85D7EB246BE421B3FB0FBB593024D177FF4@dbde02.ent.ti.com>
Sanjeev,
On Thu, May 26, 2011 at 15:12, Premi, Sanjeev <premi@ti.com> wrote:
>> -----Original Message-----
>> From: linux-omap-owner at vger.kernel.org
>> [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of
>> DebBarma, Tarun Kanti
>> Sent: Tuesday, May 24, 2011 7:55 PM
>> To: linux-omap at vger.kernel.org
>> Cc: Hilman, Kevin; Shilimkar, Santosh; tony at atomide.com;
>> linux-arm-kernel at lists.infradead.org; DebBarma, Tarun Kanti;
>> Varadarajan, Charulatha
>> Subject: [PATCH 11/15] OMAP: GPIO: Remove hardcoded offsets
>> in ctxt 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>
>> ---
>> ?arch/arm/mach-omap2/gpio.c ? ? ? ? ? ? | ? ?2 +
>> ?arch/arm/plat-omap/include/plat/gpio.h | ? ?1 +
>> ?drivers/gpio/gpio_omap.c ? ? ? ? ? ? ? | ?123
>> ++++++++++----------------------
>> ?3 files changed, 40 insertions(+), 86 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
>> index 0f8782f..5c888dd 100644
>
> [snip]...[snip]
>> diff --git a/drivers/gpio/gpio_omap.c b/drivers/gpio/gpio_omap.c
>> index 28390a9..05c2857 100644
>> --- a/drivers/gpio/gpio_omap.c
>> +++ b/drivers/gpio/gpio_omap.c
>> @@ -1395,96 +1395,47 @@ restore_gpio_ctx:
>>
>> ?void omap_gpio_save_context(struct gpio_bank *bank)
>> ?{
>
> [sp] The [PATCH 06/15] OMAP4: GPIO: Save/restore context
> ? ? seems to be doing exactly opposite:
> ? ? It introduces the checks for
> [quote]
> ?+ ? ? ? ? ? ? ?if (bank->method == METHOD_GPIO_24XX) {
> ...
> ...
> ?+ ? ? ? ? ? ? ?} else if (bank->method == METHOD_GPIO_44XX) {
> [/quote]
>
> and this patch removes the same checks.
>
> Am I missing something?
Patch 6 introduces the save/restore context code for OMAP4 and this patch
tries to replace all the macro usage with the reg offset values which is nothing
but cleanup.
Based on your comments and Kevin's I understand that I should make cleanups
first and then any fixes/functionality changes to avoid confusions.
Will do that and send a revised series next week.
-V Charulatha
>
> ~sanjeev
>
>
>> - ? ? 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);
>> - ? ? }
>> + ? ? bank->context.irqenable1 =
>> + ? ? ? ? ? ? ? ? ? ? __raw_readl(bank->base + bank->regs->irqenable);
>> + ? ? bank->context.irqenable2 =
>> + ? ? ? ? ? ? ? ? ? ? __raw_readl(bank->base +
>> bank->regs->irqenable2);
>> + ? ? bank->context.wake_en =
>> + ? ? ? ? ? ? ? ? ? ? __raw_readl(bank->base +
>> bank->regs->wkupstatus);
>> + ? ? 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 +
>> bank->regs->leveldetect0);
>> + ? ? bank->context.leveldetect1 =
>> + ? ? ? ? ? ? ? ? ? ? __raw_readl(bank->base +
>> bank->regs->leveldetect1);
>> + ? ? bank->context.risingdetect =
>> + ? ? ? ? ? ? ? ? ? ? __raw_readl(bank->base +
>> bank->regs->risingdetect);
>> + ? ? bank->context.fallingdetect =
>> + ? ? ? ? ? ? ? ? ? ? __raw_readl(bank->base +
>> bank->regs->fallingdetect);
>> + ? ? bank->context.dataout = __raw_readl(bank->base +
>> bank->regs->dataout);
>> ?}
>>
>> ?void omap_gpio_restore_context(struct gpio_bank *bank)
>> ?{
>> - ? ? 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);
>> - ? ? }
>> + ? ? __raw_writel(bank->context.irqenable1,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->irqenable);
>> + ? ? __raw_writel(bank->context.irqenable2,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->irqenable2);
>> + ? ? __raw_writel(bank->context.wake_en,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->wkupstatus);
>> + ? ? __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 + bank->regs->leveldetect0);
>> + ? ? __raw_writel(bank->context.leveldetect1,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->leveldetect1);
>> + ? ? __raw_writel(bank->context.risingdetect,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->risingdetect);
>> + ? ? __raw_writel(bank->context.fallingdetect,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->fallingdetect);
>> + ? ? __raw_writel(bank->context.dataout,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->dataout);
>> ?}
>>
>> ?#endif
>> --
>> 1.6.0.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe
>> linux-omap" in
>> the body of a message to majordomo at vger.kernel.org
>> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>>
next prev parent reply other threads:[~2011-05-26 9:48 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-24 14:24 [PATCH 00/15] OMAP: GPIO: Cleanup OMAP GPIO driver Tarun Kanti DebBarma
2011-05-24 14:24 ` [PATCH 01/15] OMAP: GPIO: Avoid cpu_is checks during module ena/disable Tarun Kanti DebBarma
2011-05-25 21:19 ` Kevin Hilman
2011-05-26 9:38 ` Varadarajan, Charulatha
2011-05-24 14:24 ` [PATCH 02/15] OMAP2PLUS: GPIO: Fix non-wakeup GPIO and rev_ids Tarun Kanti DebBarma
2011-05-25 21:34 ` Kevin Hilman
2011-05-26 9:38 ` Varadarajan, Charulatha
2011-05-26 17:15 ` Kevin Hilman
2011-05-26 17:39 ` Varadarajan, Charulatha
2011-05-26 18:32 ` Kevin Hilman
2011-05-26 9:23 ` Premi, Sanjeev
2011-05-26 9:43 ` Varadarajan, Charulatha
2011-05-26 10:11 ` Cousson, Benoit
2011-05-26 11:47 ` Premi, Sanjeev
2011-05-26 12:11 ` Cousson, Benoit
2011-05-26 12:38 ` Premi, Sanjeev
2011-05-26 12:46 ` Cousson, Benoit
2011-05-26 13:19 ` Premi, Sanjeev
2011-05-26 13:38 ` B.J. Buchalter
2011-05-26 14:12 ` Cousson, Benoit
2011-05-24 14:24 ` [PATCH 03/15] OMAP: GPIO: Remove dependency on gpio_bank_count Tarun Kanti DebBarma
2011-05-24 14:24 ` [PATCH 04/15] OMAP2PLUS: GPIO: Use flag to identify wkup dmn GPIO Tarun Kanti DebBarma
2011-05-25 21:40 ` Kevin Hilman
2011-05-24 14:24 ` [PATCH 05/15] OMAP: GPIO: Make gpio_context part of gpio_bank structure Tarun Kanti DebBarma
2011-05-25 21:41 ` Kevin Hilman
2011-05-26 9:58 ` Premi, Sanjeev
2011-05-26 10:07 ` Varadarajan, Charulatha
2011-05-26 9:59 ` Premi, Sanjeev
2011-05-24 14:24 ` [PATCH 06/15] OMAP4: GPIO: Save/restore context Tarun Kanti DebBarma
2011-05-25 21:43 ` Kevin Hilman
2011-05-26 9:37 ` Varadarajan, Charulatha
2011-05-24 14:24 ` [PATCH 07/15] OMAP: GPIO: handle save/restore ctx in GPIO driver Tarun Kanti DebBarma
2011-05-25 22:33 ` Kevin Hilman
2011-05-25 22:36 ` Kevin Hilman
2011-05-24 14:24 ` [PATCH 08/15] OMAP2+: GPIO: make workaround_enabled bank specific Tarun Kanti DebBarma
2011-05-25 22:39 ` Kevin Hilman
2011-05-26 9:37 ` Varadarajan, Charulatha
2011-05-24 14:24 ` [PATCH 09/15] OMAP: GPIO: cleanup suspend and resume functions Tarun Kanti DebBarma
2011-05-25 22:57 ` Kevin Hilman
2011-05-26 10:02 ` Varadarajan, Charulatha
2011-05-24 14:24 ` [PATCH 10/15] OMAP: GPIO: cleanup prepare/resume idle functions Tarun Kanti DebBarma
2011-05-25 23:00 ` Kevin Hilman
2011-05-24 14:24 ` [PATCH 11/15] OMAP: GPIO: Remove hardcoded offsets in ctxt save/restore Tarun Kanti DebBarma
2011-05-25 23:01 ` Kevin Hilman
2011-05-26 9:36 ` Varadarajan, Charulatha
2011-05-26 9:42 ` Premi, Sanjeev
2011-05-26 9:48 ` Varadarajan, Charulatha [this message]
2011-05-24 14:24 ` [PATCH 12/15] OMAP: GPIO: Fix: use wake set/clear regs Tarun Kanti DebBarma
2011-05-25 23:14 ` Kevin Hilman
2011-05-26 9:36 ` Varadarajan, Charulatha
2011-05-24 14:24 ` [PATCH 13/15] OMAP: GPIO: clean set_gpio_triggering function Tarun Kanti DebBarma
2011-05-25 23:27 ` Kevin Hilman
2011-05-26 9:55 ` Varadarajan, Charulatha
2011-05-24 14:24 ` [PATCH 14/15] OMAP: GPIO: Use memset for omap_gpio_reg_offs Tarun Kanti DebBarma
2011-05-25 23:30 ` Kevin Hilman
2011-05-24 14:24 ` [PATCH 15/15] OMAP: GPIO: clean omap_gpio_mod_init function Tarun Kanti DebBarma
2011-05-25 23:48 ` Kevin Hilman
2011-06-03 11:20 ` Varadarajan, Charulatha
2011-06-03 14:31 ` Kevin Hilman
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=BANLkTikA63fLpGFspPg3h3fx3juUy7X60w@mail.gmail.com \
--to=charu@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).