Re: [PATCH 4/8] ARM: OMAP1: Move 16xx GPIO system clock to platform init code

2012-03-12 Thread Grant Likely 
On Tue, 21 Feb 2012 15:40:42 -0800, Tony Lindgren t...@atomide.com wrote:
 This way we can remove omap_read/write call from the GPIO driver
 and remove include to linux/io.h.
 
 Cc: Grant Likely grant.lik...@secretlab.ca
 Signed-off-by: Tony Lindgren t...@atomide.com

Acked-by: Grant Likely grant.lik...@secretlab.ca

Who will be picking up this series?  How intertwined is it with your tree Tony?

g.

 ---
  arch/arm/mach-omap1/gpio16xx.c |7 +++
  drivers/gpio/gpio-omap.c   |8 
  2 files changed, 7 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c
 index 0f399bd..99cabc4 100644
 --- a/arch/arm/mach-omap1/gpio16xx.c
 +++ b/arch/arm/mach-omap1/gpio16xx.c
 @@ -218,6 +218,13 @@ static int __init omap16xx_gpio_init(void)
   if (!cpu_is_omap16xx())
   return -EINVAL;
  
 + /*
 +  * Enable system clock for GPIO module.
 +  * The CAM_CLK_CTRL *is* really the right place.
 +  */
 + omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
 + ULPD_CAM_CLK_CTRL);
 +
   for (i = 0; i  ARRAY_SIZE(omap16xx_gpio_dev); i++)
   platform_device_register(omap16xx_gpio_dev[i]);
  
 diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
 index 0b05629..1078a14 100644
 --- a/drivers/gpio/gpio-omap.c
 +++ b/drivers/gpio/gpio-omap.c
 @@ -18,7 +18,6 @@
  #include linux/syscore_ops.h
  #include linux/err.h
  #include linux/clk.h
 -#include linux/io.h
  #include linux/slab.h
  #include linux/pm_runtime.h
  
 @@ -1064,13 +1063,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank, 
 int id)
   + OMAP1610_GPIO_IRQSTATUS1);
   __raw_writew(0x0014, bank-base
   + OMAP1610_GPIO_SYSCONFIG);
 -
 - /*
 -  * Enable system clock for GPIO module.
 -  * The CAM_CLK_CTRL *is* really the right place.
 -  */
 - omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
 - ULPD_CAM_CLK_CTRL);
   }
   if (cpu_is_omap7xx()  bank-method == METHOD_GPIO_7XX) {
   __raw_writel(0x, bank-base
 

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.
--
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

Re: [PATCH 4/8] ARM: OMAP1: Move 16xx GPIO system clock to platform init code

2012-03-12 Thread Tony Lindgren 
* Grant Likely grant.lik...@secretlab.ca [120312 10:32]:
 On Tue, 21 Feb 2012 15:40:42 -0800, Tony Lindgren t...@atomide.com wrote:
  This way we can remove omap_read/write call from the GPIO driver
  and remove include to linux/io.h.
  
  Cc: Grant Likely grant.lik...@secretlab.ca
  Signed-off-by: Tony Lindgren t...@atomide.com
 
 Acked-by: Grant Likely grant.lik...@secretlab.ca
 
 Who will be picking up this series?  How intertwined is it with your tree 
 Tony?

Thanks for following up on this, no need to do anything on this.

This popped up few weeks ago and was resolved by pulling your GPIO
branch into arm-soc. For more info, please see:

Subject: linux-next: manual merge of the arm-soc tree with the gpio tree

http://lkml.org/lkml/2012/3/1/7

Regards,

Tony
--
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

Re: [PATCH 4/8] ARM: OMAP1: Move 16xx GPIO system clock to platform init code

2012-02-23 Thread Tony Lindgren 
* Tony Lindgren t...@atomide.com [120221 15:09]:
 This way we can remove omap_read/write call from the GPIO driver
 and remove include to linux/io.h.
...

 --- a/drivers/gpio/gpio-omap.c
 +++ b/drivers/gpio/gpio-omap.c
 @@ -18,7 +18,6 @@
  #include linux/syscore_ops.h
  #include linux/err.h
  #include linux/clk.h
 -#include linux/io.h
  #include linux/slab.h
  #include linux/pm_runtime.h
  

I'll drop this hunk, it causes a conflict with Kevin's
GPIO runtime PM series and it's not really related to
this patch or actually needed. Updated patch below.

Regards,

Tony

From: Tony Lindgren t...@atomide.com
Date: Wed, 22 Feb 2012 14:52:38 -0800
Subject: [PATCH] ARM: OMAP1: Move 16xx GPIO system clock to platform init code

This way we can remove omap_read/write call from the GPIO driver
and remove include to linux/io.h.

Cc: Grant Likely grant.lik...@secretlab.ca
Signed-off-by: Tony Lindgren t...@atomide.com

--- a/arch/arm/mach-omap1/gpio16xx.c
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@ -218,6 +218,13 @@ static int __init omap16xx_gpio_init(void)
if (!cpu_is_omap16xx())
return -EINVAL;
 
+   /*
+* Enable system clock for GPIO module.
+* The CAM_CLK_CTRL *is* really the right place.
+*/
+   omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
+   ULPD_CAM_CLK_CTRL);
+
for (i = 0; i  ARRAY_SIZE(omap16xx_gpio_dev); i++)
platform_device_register(omap16xx_gpio_dev[i]);
 
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 0b05629..5b7b164 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1064,13 +1064,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank, 
int id)
+ OMAP1610_GPIO_IRQSTATUS1);
__raw_writew(0x0014, bank-base
+ OMAP1610_GPIO_SYSCONFIG);
-
-   /*
-* Enable system clock for GPIO module.
-* The CAM_CLK_CTRL *is* really the right place.
-*/
-   omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
-   ULPD_CAM_CLK_CTRL);
}
if (cpu_is_omap7xx()  bank-method == METHOD_GPIO_7XX) {
__raw_writel(0x, bank-base
--
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 4/8] ARM: OMAP1: Move 16xx GPIO system clock to platform init code

2012-02-21 Thread Tony Lindgren 
This way we can remove omap_read/write call from the GPIO driver
and remove include to linux/io.h.

Cc: Grant Likely grant.lik...@secretlab.ca
Signed-off-by: Tony Lindgren t...@atomide.com
---
 arch/arm/mach-omap1/gpio16xx.c |7 +++
 drivers/gpio/gpio-omap.c   |8 
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c
index 0f399bd..99cabc4 100644
--- a/arch/arm/mach-omap1/gpio16xx.c
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@ -218,6 +218,13 @@ static int __init omap16xx_gpio_init(void)
if (!cpu_is_omap16xx())
return -EINVAL;
 
+   /*
+* Enable system clock for GPIO module.
+* The CAM_CLK_CTRL *is* really the right place.
+*/
+   omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
+   ULPD_CAM_CLK_CTRL);
+
for (i = 0; i  ARRAY_SIZE(omap16xx_gpio_dev); i++)
platform_device_register(omap16xx_gpio_dev[i]);
 
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 0b05629..1078a14 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -18,7 +18,6 @@
 #include linux/syscore_ops.h
 #include linux/err.h
 #include linux/clk.h
-#include linux/io.h
 #include linux/slab.h
 #include linux/pm_runtime.h
 
@@ -1064,13 +1063,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank, 
int id)
+ OMAP1610_GPIO_IRQSTATUS1);
__raw_writew(0x0014, bank-base
+ OMAP1610_GPIO_SYSCONFIG);
-
-   /*
-* Enable system clock for GPIO module.
-* The CAM_CLK_CTRL *is* really the right place.
-*/
-   omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
-   ULPD_CAM_CLK_CTRL);
}
if (cpu_is_omap7xx()  bank-method == METHOD_GPIO_7XX) {
__raw_writel(0x, bank-base

--
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