From: Tarun Kanti DebBarma <tarun.kanti@ti.com> To: linux-omap@vger.kernel.org Cc: khilman@ti.com, tony@atomide.com, b-cousson@ti.com, grant.likely@secretlab.ca, linux-arm-kernel@lists.infradead.org, Tarun Kanti DebBarma <tarun.kanti@ti.com> Subject: [PATCH v4 01/12] gpio/omap: remove saved_fallingdetect, saved_risingdetect fields Date: Fri, 16 Mar 2012 19:35:49 +0530 [thread overview] Message-ID: <1331906760-5259-2-git-send-email-tarun.kanti@ti.com> (raw) In-Reply-To: <1331906760-5259-1-git-send-email-tarun.kanti@ti.com> Since we already have context.fallingdetect and context.risingdetect there is no more need to have these additional fields. Also, getting rid of extra reads associated with them. Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> --- drivers/gpio/gpio-omap.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 7cbad85..0c1c529 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -63,8 +63,6 @@ struct gpio_bank { u32 enabled_non_wakeup_gpios; struct gpio_regs context; u32 saved_datain; - u32 saved_fallingdetect; - u32 saved_risingdetect; u32 level_mask; u32 toggle_mask; spinlock_t lock; @@ -1244,11 +1242,9 @@ static int omap_gpio_runtime_suspend(struct device *dev) bank->saved_datain = __raw_readl(bank->base + bank->regs->datain); - l1 = __raw_readl(bank->base + bank->regs->fallingdetect); - l2 = __raw_readl(bank->base + bank->regs->risingdetect); + l1 = bank->context.fallingdetect; + l2 = bank->context.risingdetect; - bank->saved_fallingdetect = l1; - bank->saved_risingdetect = l2; l1 &= ~bank->enabled_non_wakeup_gpios; l2 &= ~bank->enabled_non_wakeup_gpios; @@ -1307,9 +1303,9 @@ static int omap_gpio_runtime_resume(struct device *dev) } } - __raw_writel(bank->saved_fallingdetect, + __raw_writel(bank->context.fallingdetect, bank->base + bank->regs->fallingdetect); - __raw_writel(bank->saved_risingdetect, + __raw_writel(bank->context.risingdetect, bank->base + bank->regs->risingdetect); l = __raw_readl(bank->base + bank->regs->datain); @@ -1326,14 +1322,15 @@ static int omap_gpio_runtime_resume(struct device *dev) * No need to generate IRQs for the rising edge for gpio IRQs * configured with falling edge only; and vice versa. */ - gen0 = l & bank->saved_fallingdetect; + gen0 = l & bank->context.fallingdetect; gen0 &= bank->saved_datain; - gen1 = l & bank->saved_risingdetect; + gen1 = l & bank->context.risingdetect; gen1 &= ~(bank->saved_datain); /* FIXME: Consider GPIO IRQs with level detections properly! */ - gen = l & (~(bank->saved_fallingdetect) & ~(bank->saved_risingdetect)); + gen = l & (~(bank->context.fallingdetect) & + ~(bank->context.risingdetect)); /* Consider all GPIO IRQs needed to be updated */ gen |= gen0 | gen1; -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: tarun.kanti@ti.com (Tarun Kanti DebBarma) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 01/12] gpio/omap: remove saved_fallingdetect, saved_risingdetect fields Date: Fri, 16 Mar 2012 19:35:49 +0530 [thread overview] Message-ID: <1331906760-5259-2-git-send-email-tarun.kanti@ti.com> (raw) In-Reply-To: <1331906760-5259-1-git-send-email-tarun.kanti@ti.com> Since we already have context.fallingdetect and context.risingdetect there is no more need to have these additional fields. Also, getting rid of extra reads associated with them. Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> --- drivers/gpio/gpio-omap.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 7cbad85..0c1c529 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -63,8 +63,6 @@ struct gpio_bank { u32 enabled_non_wakeup_gpios; struct gpio_regs context; u32 saved_datain; - u32 saved_fallingdetect; - u32 saved_risingdetect; u32 level_mask; u32 toggle_mask; spinlock_t lock; @@ -1244,11 +1242,9 @@ static int omap_gpio_runtime_suspend(struct device *dev) bank->saved_datain = __raw_readl(bank->base + bank->regs->datain); - l1 = __raw_readl(bank->base + bank->regs->fallingdetect); - l2 = __raw_readl(bank->base + bank->regs->risingdetect); + l1 = bank->context.fallingdetect; + l2 = bank->context.risingdetect; - bank->saved_fallingdetect = l1; - bank->saved_risingdetect = l2; l1 &= ~bank->enabled_non_wakeup_gpios; l2 &= ~bank->enabled_non_wakeup_gpios; @@ -1307,9 +1303,9 @@ static int omap_gpio_runtime_resume(struct device *dev) } } - __raw_writel(bank->saved_fallingdetect, + __raw_writel(bank->context.fallingdetect, bank->base + bank->regs->fallingdetect); - __raw_writel(bank->saved_risingdetect, + __raw_writel(bank->context.risingdetect, bank->base + bank->regs->risingdetect); l = __raw_readl(bank->base + bank->regs->datain); @@ -1326,14 +1322,15 @@ static int omap_gpio_runtime_resume(struct device *dev) * No need to generate IRQs for the rising edge for gpio IRQs * configured with falling edge only; and vice versa. */ - gen0 = l & bank->saved_fallingdetect; + gen0 = l & bank->context.fallingdetect; gen0 &= bank->saved_datain; - gen1 = l & bank->saved_risingdetect; + gen1 = l & bank->context.risingdetect; gen1 &= ~(bank->saved_datain); /* FIXME: Consider GPIO IRQs with level detections properly! */ - gen = l & (~(bank->saved_fallingdetect) & ~(bank->saved_risingdetect)); + gen = l & (~(bank->context.fallingdetect) & + ~(bank->context.risingdetect)); /* Consider all GPIO IRQs needed to be updated */ gen |= gen0 | gen1; -- 1.7.0.4
next prev parent reply other threads:[~2012-03-16 14:06 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-16 14:05 [PATCH v4 00/12] gpio/omap: Some more driver cleanup and fixes Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma [this message] 2012-03-16 14:05 ` [PATCH v4 01/12] gpio/omap: remove saved_fallingdetect, saved_risingdetect fields Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 02/12] gpio/omap: fix wakeup_en register update in _set_gpio_wakeup() Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 03/12] gpio/omap: remove suspend_wakeup field from struct gpio_bank Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 04/12] gpio/omap: remove saved_wakeup " Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-07-09 9:43 ` Roger Quadros 2012-07-09 9:43 ` Roger Quadros 2012-07-09 11:16 ` DebBarma, Tarun Kanti 2012-07-09 11:16 ` DebBarma, Tarun Kanti 2012-07-09 11:51 ` Roger Quadros 2012-07-09 11:51 ` Roger Quadros 2012-07-09 12:30 ` DebBarma, Tarun Kanti 2012-07-09 12:30 ` DebBarma, Tarun Kanti 2012-07-11 14:49 ` Roger Quadros 2012-07-11 14:49 ` Roger Quadros 2012-07-26 6:20 ` DebBarma, Tarun Kanti 2012-07-26 6:20 ` DebBarma, Tarun Kanti 2012-03-16 14:05 ` [PATCH v4 05/12] gpio/omap: get rid of retrigger variable in gpio_irq_handler Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 06/12] gpio/omap: fix trigger type to unsigned Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 07/12] gpio/omap: fix _set_gpio_irqenable implementation Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 08/12] gpio/omap: remove redundant decoding of gpio offset Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 09/12] gpio/omap: remove suspend/resume callbacks Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 10/12] gpio/omap: fix missing dataout context save in _set_gpio_dataout_reg Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:05 ` [PATCH v4 11/12] gpio/omap: fix incorrect context restore logic in omap_gpio_runtime_* Tarun Kanti DebBarma 2012-03-16 14:05 ` Tarun Kanti DebBarma 2012-03-16 14:06 ` [PATCH v4 12/12] gpio/omap: fix incorrect update to context.irqenable1 Tarun Kanti DebBarma 2012-03-16 14:06 ` Tarun Kanti DebBarma 2012-03-20 0:37 ` [PATCH v4 00/12] gpio/omap: Some more driver cleanup and fixes Kevin Hilman 2012-03-20 0:37 ` Kevin Hilman 2012-03-20 2:35 ` DebBarma, Tarun Kanti 2012-03-20 2:35 ` 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=1331906760-5259-2-git-send-email-tarun.kanti@ti.com \ --to=tarun.kanti@ti.com \ --cc=b-cousson@ti.com \ --cc=grant.likely@secretlab.ca \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.