Re: [PATCH 7/8] gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()

[Santosh Shilimkar]

On Friday 27 April 2012 07:43 PM, Tarun Kanti DebBarma wrote:
 Add register offsets for GPIO_IRQSTATUS_RAW_0, GPIO_IRQSTATUS_RAW_0
 which are present on OMAP4+ processors. Now we can distinguish
 conditions applicable to OMAP4,5 and those specific to OMAP24xx
 and OMAP3xxx.
 
 Cc: Kevin Hilman khil...@ti.com
 Cc: Tony Lindgren t...@atomide.com
 Cc: Santosh Shilimkar santosh.shilim...@ti.com
 Cc: Cousson, Benoit b-cous...@ti.com
 Cc: Grant Likely grant.lik...@secretlab.ca
 Signed-off-by: Tarun Kanti DebBarma tarun.ka...@ti.com
 ---
  arch/arm/mach-omap2/gpio.c |2 ++
  arch/arm/plat-omap/include/plat/gpio.h |2 ++
  drivers/gpio/gpio-omap.c   |4 ++--
  3 files changed, 6 insertions(+), 2 deletions(-)
 
Looks like this was the last cpu_is_*() in gpio driver.
Thanks for cleaning up this.

Reviewed-by: Santosh Shilimkar santosh.shilim...@ti.com

Regards
Santosh
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 7/8] gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()

[Tarun Kanti DebBarma]

Add register offsets for GPIO_IRQSTATUS_RAW_0, GPIO_IRQSTATUS_RAW_0
which are present on OMAP4+ processors. Now we can distinguish
conditions applicable to OMAP4,5 and those specific to OMAP24xx
and OMAP3xxx.

Cc: Kevin Hilman khil...@ti.com
Cc: Tony Lindgren t...@atomide.com
Cc: Santosh Shilimkar santosh.shilim...@ti.com
Cc: Cousson, Benoit b-cous...@ti.com
Cc: Grant Likely grant.lik...@secretlab.ca
Signed-off-by: Tarun Kanti DebBarma tarun.ka...@ti.com
---
 arch/arm/mach-omap2/gpio.c |2 ++
 arch/arm/plat-omap/include/plat/gpio.h |2 ++
 drivers/gpio/gpio-omap.c   |4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
index 86f91a6..a144e22 100644
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@ -101,6 +101,8 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod 
*oh, void *unused)
pdata-regs-dataout = OMAP4_GPIO_DATAOUT;
pdata-regs-set_dataout = OMAP4_GPIO_SETDATAOUT;
pdata-regs-clr_dataout = OMAP4_GPIO_CLEARDATAOUT;
+   pdata-regs-irqstatus_raw0 = OMAP4_GPIO_IRQSTATUSRAW0;
+   pdata-regs-irqstatus_raw1 = OMAP4_GPIO_IRQSTATUSRAW1;
pdata-regs-irqstatus = OMAP4_GPIO_IRQSTATUS0;
pdata-regs-irqstatus2 = OMAP4_GPIO_IRQSTATUS1;
pdata-regs-irqenable = OMAP4_GPIO_IRQSTATUSSET0;
diff --git a/arch/arm/plat-omap/include/plat/gpio.h 
b/arch/arm/plat-omap/include/plat/gpio.h
index d903e7d..50fb7cc 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -172,6 +172,8 @@ struct omap_gpio_reg_offs {
u16 clr_dataout;
u16 irqstatus;
u16 irqstatus2;
+   u16 irqstatus_raw0;
+   u16 irqstatus_raw1;
u16 irqenable;
u16 irqenable2;
u16 set_irqenable;
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index ae62c62..d238f84 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1289,14 +1289,14 @@ static int omap_gpio_runtime_resume(struct device *dev)
old0 = __raw_readl(bank-base + bank-regs-leveldetect0);
old1 = __raw_readl(bank-base + bank-regs-leveldetect1);
 
-   if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
+   if (!bank-regs-irqstatus_raw0) {
__raw_writel(old0 | gen, bank-base +
bank-regs-leveldetect0);
__raw_writel(old1 | gen, bank-base +
bank-regs-leveldetect1);
}
 
-   if (cpu_is_omap44xx()) {
+   if (bank-regs-irqstatus_raw0) {
__raw_writel(old0 | l, bank-base +
bank-regs-leveldetect0);
__raw_writel(old1 | l, bank-base +
-- 
1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html