All of lore.kernel.org
 help / color / mirror / Atom feed
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, Charulatha V <charu@ti.com>
Subject: [PATCH v7 07/26] gpio/omap: avoid cpu checks during module ena/disable
Date: Tue, 13 Sep 2011 18:32:40 +0530	[thread overview]
Message-ID: <1315918979-26173-8-git-send-email-tarun.kanti@ti.com> (raw)
In-Reply-To: <1315918979-26173-1-git-send-email-tarun.kanti@ti.com>

From: Charulatha V <charu@ti.com>

Remove cpu-is checks while enabling/disabling OMAP GPIO module during a gpio
request/free.

Signed-off-by: Charulatha V <charu@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 arch/arm/mach-omap2/gpio.c             |    2 +
 arch/arm/plat-omap/include/plat/gpio.h |    1 +
 drivers/gpio/gpio-omap.c               |   53 ++++++++++++++------------------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
index a430fb1..72a640d 100644
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@ -98,6 +98,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
 		pdata->regs->clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1;
 		pdata->regs->debounce = OMAP24XX_GPIO_DEBOUNCE_VAL;
 		pdata->regs->debounce_en = OMAP24XX_GPIO_DEBOUNCE_EN;
+		pdata->regs->ctrl = OMAP24XX_GPIO_CTRL;
 		break;
 	case 2:
 		pdata->bank_type = METHOD_GPIO_44XX;
@@ -114,6 +115,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
 		pdata->regs->clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0;
 		pdata->regs->debounce = OMAP4_GPIO_DEBOUNCINGTIME;
 		pdata->regs->debounce_en = OMAP4_GPIO_DEBOUNCENABLE;
+		pdata->regs->ctrl = OMAP4_GPIO_CTRL;
 		break;
 	default:
 		WARN(1, "Invalid gpio bank_type\n");
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index a93adeb..eaa6de3 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -188,6 +188,7 @@ struct omap_gpio_reg_offs {
 	u16 clr_irqenable;
 	u16 debounce;
 	u16 debounce_en;
+	u16 ctrl;
 
 	bool irqenable_inv;
 };
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 090feb8..84cd934 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -83,6 +83,7 @@ struct gpio_bank {
 
 #define GPIO_INDEX(bank, gpio) (gpio % bank->width)
 #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio))
+#define GPIO_MOD_CTRL_BIT	BIT(0)
 
 static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
 {
@@ -577,22 +578,18 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
 		__raw_writel(__raw_readl(reg) | (1 << offset), reg);
 	}
 #endif
-	if (!cpu_class_is_omap1()) {
-		if (!bank->mod_usage) {
-			void __iomem *reg = bank->base;
-			u32 ctrl;
-
-			if (cpu_is_omap24xx() || cpu_is_omap34xx())
-				reg += OMAP24XX_GPIO_CTRL;
-			else if (cpu_is_omap44xx())
-				reg += OMAP4_GPIO_CTRL;
-			ctrl = __raw_readl(reg);
-			/* Module is enabled, clocks are not gated */
-			ctrl &= 0xFFFFFFFE;
-			__raw_writel(ctrl, reg);
-		}
-		bank->mod_usage |= 1 << offset;
+	if (bank->regs->ctrl && !bank->mod_usage) {
+		void __iomem *reg = bank->base + bank->regs->ctrl;
+		u32 ctrl;
+
+		ctrl = __raw_readl(reg);
+		/* Module is enabled, clocks are not gated */
+		ctrl &= ~GPIO_MOD_CTRL_BIT;
+		__raw_writel(ctrl, reg);
 	}
+
+	bank->mod_usage |= 1 << offset;
+
 	spin_unlock_irqrestore(&bank->lock, flags);
 
 	return 0;
@@ -625,22 +622,18 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
 		__raw_writel(1 << offset, reg);
 	}
 #endif
-	if (!cpu_class_is_omap1()) {
-		bank->mod_usage &= ~(1 << offset);
-		if (!bank->mod_usage) {
-			void __iomem *reg = bank->base;
-			u32 ctrl;
-
-			if (cpu_is_omap24xx() || cpu_is_omap34xx())
-				reg += OMAP24XX_GPIO_CTRL;
-			else if (cpu_is_omap44xx())
-				reg += OMAP4_GPIO_CTRL;
-			ctrl = __raw_readl(reg);
-			/* Module is disabled, clocks are gated */
-			ctrl |= 1;
-			__raw_writel(ctrl, reg);
-		}
+	bank->mod_usage &= ~(1 << offset);
+
+	if (bank->regs->ctrl && !bank->mod_usage) {
+		void __iomem *reg = bank->base + bank->regs->ctrl;
+		u32 ctrl;
+
+		ctrl = __raw_readl(reg);
+		/* Module is disabled, clocks are gated */
+		ctrl |= GPIO_MOD_CTRL_BIT;
+		__raw_writel(ctrl, reg);
 	}
+
 	_reset_gpio(bank, bank->chip.base + offset);
 	spin_unlock_irqrestore(&bank->lock, flags);
 }
-- 
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 v7 07/26] gpio/omap: avoid cpu checks during module ena/disable
Date: Tue, 13 Sep 2011 18:32:40 +0530	[thread overview]
Message-ID: <1315918979-26173-8-git-send-email-tarun.kanti@ti.com> (raw)
In-Reply-To: <1315918979-26173-1-git-send-email-tarun.kanti@ti.com>

From: Charulatha V <charu@ti.com>

Remove cpu-is checks while enabling/disabling OMAP GPIO module during a gpio
request/free.

Signed-off-by: Charulatha V <charu@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 arch/arm/mach-omap2/gpio.c             |    2 +
 arch/arm/plat-omap/include/plat/gpio.h |    1 +
 drivers/gpio/gpio-omap.c               |   53 ++++++++++++++------------------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
index a430fb1..72a640d 100644
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@ -98,6 +98,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
 		pdata->regs->clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1;
 		pdata->regs->debounce = OMAP24XX_GPIO_DEBOUNCE_VAL;
 		pdata->regs->debounce_en = OMAP24XX_GPIO_DEBOUNCE_EN;
+		pdata->regs->ctrl = OMAP24XX_GPIO_CTRL;
 		break;
 	case 2:
 		pdata->bank_type = METHOD_GPIO_44XX;
@@ -114,6 +115,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
 		pdata->regs->clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0;
 		pdata->regs->debounce = OMAP4_GPIO_DEBOUNCINGTIME;
 		pdata->regs->debounce_en = OMAP4_GPIO_DEBOUNCENABLE;
+		pdata->regs->ctrl = OMAP4_GPIO_CTRL;
 		break;
 	default:
 		WARN(1, "Invalid gpio bank_type\n");
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index a93adeb..eaa6de3 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -188,6 +188,7 @@ struct omap_gpio_reg_offs {
 	u16 clr_irqenable;
 	u16 debounce;
 	u16 debounce_en;
+	u16 ctrl;
 
 	bool irqenable_inv;
 };
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 090feb8..84cd934 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -83,6 +83,7 @@ struct gpio_bank {
 
 #define GPIO_INDEX(bank, gpio) (gpio % bank->width)
 #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio))
+#define GPIO_MOD_CTRL_BIT	BIT(0)
 
 static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
 {
@@ -577,22 +578,18 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
 		__raw_writel(__raw_readl(reg) | (1 << offset), reg);
 	}
 #endif
-	if (!cpu_class_is_omap1()) {
-		if (!bank->mod_usage) {
-			void __iomem *reg = bank->base;
-			u32 ctrl;
-
-			if (cpu_is_omap24xx() || cpu_is_omap34xx())
-				reg += OMAP24XX_GPIO_CTRL;
-			else if (cpu_is_omap44xx())
-				reg += OMAP4_GPIO_CTRL;
-			ctrl = __raw_readl(reg);
-			/* Module is enabled, clocks are not gated */
-			ctrl &= 0xFFFFFFFE;
-			__raw_writel(ctrl, reg);
-		}
-		bank->mod_usage |= 1 << offset;
+	if (bank->regs->ctrl && !bank->mod_usage) {
+		void __iomem *reg = bank->base + bank->regs->ctrl;
+		u32 ctrl;
+
+		ctrl = __raw_readl(reg);
+		/* Module is enabled, clocks are not gated */
+		ctrl &= ~GPIO_MOD_CTRL_BIT;
+		__raw_writel(ctrl, reg);
 	}
+
+	bank->mod_usage |= 1 << offset;
+
 	spin_unlock_irqrestore(&bank->lock, flags);
 
 	return 0;
@@ -625,22 +622,18 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
 		__raw_writel(1 << offset, reg);
 	}
 #endif
-	if (!cpu_class_is_omap1()) {
-		bank->mod_usage &= ~(1 << offset);
-		if (!bank->mod_usage) {
-			void __iomem *reg = bank->base;
-			u32 ctrl;
-
-			if (cpu_is_omap24xx() || cpu_is_omap34xx())
-				reg += OMAP24XX_GPIO_CTRL;
-			else if (cpu_is_omap44xx())
-				reg += OMAP4_GPIO_CTRL;
-			ctrl = __raw_readl(reg);
-			/* Module is disabled, clocks are gated */
-			ctrl |= 1;
-			__raw_writel(ctrl, reg);
-		}
+	bank->mod_usage &= ~(1 << offset);
+
+	if (bank->regs->ctrl && !bank->mod_usage) {
+		void __iomem *reg = bank->base + bank->regs->ctrl;
+		u32 ctrl;
+
+		ctrl = __raw_readl(reg);
+		/* Module is disabled, clocks are gated */
+		ctrl |= GPIO_MOD_CTRL_BIT;
+		__raw_writel(ctrl, reg);
 	}
+
 	_reset_gpio(bank, bank->chip.base + offset);
 	spin_unlock_irqrestore(&bank->lock, flags);
 }
-- 
1.7.0.4

  parent reply	other threads:[~2011-09-13 13:03 UTC|newest]

Thread overview: 120+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-13 13:02 [PATCH v7 00/26] gpio/omap: driver cleanup and fixes Tarun Kanti DebBarma
2011-09-13 13:02 ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 01/26] gpio/omap: remove dependency on gpio_bank_count Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:41   ` Tony Lindgren
2011-09-21 14:41     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 02/26] gpio/omap: use flag to identify wakeup domain Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 03/26] gpio/omap: make gpio_context part of gpio_bank structure Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 04/26] gpio/omap: fix pwrdm_post_transition call sequence Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:47   ` Tony Lindgren
2011-09-21 14:47     ` Tony Lindgren
2011-09-26 23:15   ` Kevin Hilman
2011-09-26 23:15     ` Kevin Hilman
2011-09-13 13:02 ` [PATCH v7 05/26] gpio/omap: handle save/restore context in GPIO driver Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:48   ` Tony Lindgren
2011-09-21 14:48     ` Tony Lindgren
2011-09-26 23:22   ` Kevin Hilman
2011-09-26 23:22     ` Kevin Hilman
2011-09-13 13:02 ` [PATCH v7 06/26] gpio/omap: make non-wakeup GPIO part of pdata Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:49   ` Tony Lindgren
2011-09-21 14:49     ` Tony Lindgren
2011-09-13 13:02 ` Tarun Kanti DebBarma [this message]
2011-09-13 13:02   ` [PATCH v7 07/26] gpio/omap: avoid cpu checks during module ena/disable Tarun Kanti DebBarma
2011-09-21 14:49   ` Tony Lindgren
2011-09-21 14:49     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 08/26] gpio/omap: further cleanup using wkup_en register Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:49   ` Tony Lindgren
2011-09-21 14:49     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 09/26] gpio/omap: use level/edge detect reg offsets Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:55   ` Tony Lindgren
2011-09-21 14:55     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 10/26] gpio/omap: remove hardcoded offsets in context save/restore Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:55   ` Tony Lindgren
2011-09-21 14:55     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 11/26] gpio/omap: cleanup set_gpio_triggering function Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:55   ` Tony Lindgren
2011-09-21 14:55     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 12/26] gpio/omap: cleanup omap_gpio_mod_init function Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:56   ` Tony Lindgren
2011-09-21 14:56     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 13/26] gpio/omap: use pinctrl offset instead of macro Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 14:56   ` Tony Lindgren
2011-09-21 14:56     ` Tony Lindgren
2011-09-21 15:03   ` Tony Lindgren
2011-09-21 15:03     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 14/26] gpio/omap: remove unnecessary bit-masking for read access Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-14 11:19   ` Sergei Shtylyov
2011-09-14 11:19     ` Sergei Shtylyov
2011-09-14 13:08     ` DebBarma, Tarun Kanti
2011-09-14 13:08       ` DebBarma, Tarun Kanti
2011-09-13 13:02 ` [PATCH v7 15/26] gpio/omap: remove bank->method & METHOD_* macros Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 15:05   ` Tony Lindgren
2011-09-21 15:05     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 16/26] gpio/omap: fix bankwidth for OMAP7xx MPUIO Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 15:05   ` Tony Lindgren
2011-09-21 15:05     ` Tony Lindgren
2011-09-13 13:02 ` [PATCH v7 17/26] gpio/omap: use pm-runtime framework Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 18/26] gpio/omap: optimize suspend and resume functions Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 19/26] gpio/omap: cleanup prepare_for_idle and resume_after_idle Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 20/26] gpio/omap: skip operations in runtime callbacks Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 21/26] gpio/omap: remove omap_gpio_save_context overhead Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 22/26] gpio/omap: save and restore debounce registers Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 23/26] gpio/omap: enable irq at the end of all configuration in restore Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 24/26] gpio/omap: restore OE only after setting the output level Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 25/26] gpio/omap: handle set_dataout reg capable IP on restore Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-13 13:02 ` [PATCH v7 26/26] gpio/omap: add dbclk aliases for all gpio modules Tarun Kanti DebBarma
2011-09-13 13:02   ` Tarun Kanti DebBarma
2011-09-21 15:13   ` Tony Lindgren
2011-09-21 15:13     ` Tony Lindgren
2011-09-22 15:27 ` [PATCH v7 00/26] gpio/omap: driver cleanup and fixes DebBarma, Tarun Kanti
2011-09-22 15:27   ` DebBarma, Tarun Kanti
2011-09-22 20:36   ` Kevin Hilman
2011-09-22 20:36     ` Kevin Hilman
2011-09-23  4:24     ` DebBarma, Tarun Kanti
2011-09-23  4:24       ` DebBarma, Tarun Kanti
2011-09-22 23:57 ` Kevin Hilman
2011-09-22 23:57   ` Kevin Hilman
2011-09-24  3:56   ` DebBarma, Tarun Kanti
2011-09-24  3:56     ` DebBarma, Tarun Kanti
2011-09-24  8:50     ` Santosh Shilimkar
2011-09-24  8:50       ` Santosh Shilimkar
2011-09-24 10:41       ` DebBarma, Tarun Kanti
2011-09-24 10:41         ` DebBarma, Tarun Kanti
2011-09-26 18:39         ` Kevin Hilman
2011-09-26 18:39           ` Kevin Hilman
2011-09-26 22:10           ` DebBarma, Tarun Kanti
2011-09-26 22:10             ` DebBarma, Tarun Kanti
2011-09-26 22:59             ` Kevin Hilman
2011-09-26 22:59               ` Kevin Hilman
2011-09-26 23:10         ` Kevin Hilman
2011-09-26 23:10           ` Kevin Hilman
2011-09-27 14:31           ` DebBarma, Tarun Kanti
2011-09-27 14:31             ` DebBarma, Tarun Kanti
2011-09-27 16:22             ` Kevin Hilman
2011-09-27 16:22               ` Kevin Hilman
2011-09-27 23:42               ` DebBarma, Tarun Kanti
2011-09-27 23:42                 ` 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=1315918979-26173-8-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 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.