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

public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed

From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 4/8] ARM: OMAP1: Move 16xx GPIO system clock to platform init code
Date: Thu, 23 Feb 2012 15:42:19 -0800	[thread overview]
Message-ID: <20120223234219.GG18185@atomide.com> (raw)
In-Reply-To: <20120221234042.18709.57610.stgit@kaulin.local>

* Tony Lindgren <tony@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 <tony@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.likely@secretlab•ca>
Signed-off-by: Tony Lindgren <tony@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(0xffffffff, bank->base

next prev parent reply	other threads:[~2012-02-23 23:42 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-21 23:40 [PATCH 0/8] Split omap plat/io.h into local iomap.h files Tony Lindgren
2012-02-21 23:40 ` [PATCH 1/8] ARM: OMAP2+: Move DISPC L3 firewall to happen in omap_display_init() Tony Lindgren
2012-02-22  8:09   ` Tomi Valkeinen
2012-02-22 19:05     ` Tony Lindgren
2012-02-22 22:17       ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 2/8] ARM: OMAP2+: Move SDRC related functions from io.h into local common.h Tony Lindgren
2012-02-21 23:40 ` [PATCH 3/8] ARM: OMAP: Move omap_init_consistent_dma_size() to " Tony Lindgren
2012-02-21 23:40 ` [PATCH 4/8] ARM: OMAP1: Move 16xx GPIO system clock to platform init code Tony Lindgren
2012-02-23 23:42   ` Tony Lindgren [this message]
2012-03-12 17:30   ` Grant Likely
2012-03-12 18:05     ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 5/8] ARM: OMAP1: Move most of plat/io.h into local iomap.h Tony Lindgren
2012-02-23 23:44   ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 6/8] ARM: OMAP2+: " Tony Lindgren
2012-02-23 23:46   ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 7/8] ARM: OMAP: Remove plat/io.h by moving it into mach/io.h Tony Lindgren
2012-02-22  2:24   ` Rob Herring
2012-02-24  0:06     ` Tony Lindgren
2012-02-24 18:22       ` Tony Lindgren
2012-02-27  3:47         ` Rob Herring
2012-02-29  1:47           ` Tony Lindgren
2012-02-29  1:49             ` Tony Lindgren
2012-02-29 23:59             ` Rob Herring
2012-03-01  0:11               ` Russell King - ARM Linux
2012-03-01  0:39                 ` Tony Lindgren
2012-03-01  1:03                   ` Tony Lindgren
2012-03-01  3:34                     ` Rob Herring
2012-03-01  3:46                       ` Tony Lindgren
2012-03-01  3:53                         ` Rob Herring
2012-03-01  4:54                           ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 8/8] ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers Tony Lindgren
2012-02-22  8:14   ` Tomi Valkeinen
2012-02-22 18:57     ` Tony Lindgren
2012-02-22 22:44       ` Tony Lindgren
2012-02-24 18:25         ` Tony Lindgren

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:0b05629 dfblob:5b7b164 )
 OR (
bs:"ARM: OMAP1: Move 16xx GPIO system clock to platform init code" )
	(help)

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=20120223234219.GG18185@atomide.com \
    --to=tony@atomide$(echo .)com \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

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