public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: linux-omap@vger.kernel.org,
	"Jouni Högander" <jouni.hogander@nokia.com>,
	"Tony Lindgren" <tony@atomide.com>
Subject: [PATCH 7/11] ARM: OMAP: Fix 34xx to use correct shift values for gpio2-6 fclks
Date: Thu,  8 May 2008 15:49:31 -0700	[thread overview]
Message-ID: <1210286975-29506-8-git-send-email-tony@atomide.com> (raw)
In-Reply-To: <1210286975-29506-7-git-send-email-tony@atomide.com>

From: Jouni Högander <jouni.hogander@nokia.com>

Wrong shift values were used for gpio2-6  fclks (gpt2-6 shift).

Signed-off-by: Jouni Högander <jouni.hogander@nokia.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/clock34xx.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index cf4644a..a728117 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -2344,7 +2344,7 @@ static struct clk gpio6_fck = {
 	.name		= "gpio6_fck",
 	.parent		= &per_32k_alwon_fck,
 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
-	.enable_bit	= OMAP3430_EN_GPT6_SHIFT,
+	.enable_bit	= OMAP3430_EN_GPIO6_SHIFT,
 	.flags		= CLOCK_IN_OMAP343X,
 	.recalc		= &followparent_recalc,
 };
@@ -2353,7 +2353,7 @@ static struct clk gpio5_fck = {
 	.name		= "gpio5_fck",
 	.parent		= &per_32k_alwon_fck,
 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
-	.enable_bit	= OMAP3430_EN_GPT5_SHIFT,
+	.enable_bit	= OMAP3430_EN_GPIO5_SHIFT,
 	.flags		= CLOCK_IN_OMAP343X,
 	.recalc		= &followparent_recalc,
 };
@@ -2362,7 +2362,7 @@ static struct clk gpio4_fck = {
 	.name		= "gpio4_fck",
 	.parent		= &per_32k_alwon_fck,
 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
-	.enable_bit	= OMAP3430_EN_GPT4_SHIFT,
+	.enable_bit	= OMAP3430_EN_GPIO4_SHIFT,
 	.flags		= CLOCK_IN_OMAP343X,
 	.recalc		= &followparent_recalc,
 };
@@ -2371,7 +2371,7 @@ static struct clk gpio3_fck = {
 	.name		= "gpio3_fck",
 	.parent		= &per_32k_alwon_fck,
 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
-	.enable_bit	= OMAP3430_EN_GPT3_SHIFT,
+	.enable_bit	= OMAP3430_EN_GPIO3_SHIFT,
 	.flags		= CLOCK_IN_OMAP343X,
 	.recalc		= &followparent_recalc,
 };
@@ -2380,7 +2380,7 @@ static struct clk gpio2_fck = {
 	.name		= "gpio2_fck",
 	.parent		= &per_32k_alwon_fck,
 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
-	.enable_bit	= OMAP3430_EN_GPT2_SHIFT,
+	.enable_bit	= OMAP3430_EN_GPIO2_SHIFT,
 	.flags		= CLOCK_IN_OMAP343X,
 	.recalc		= &followparent_recalc,
 };
-- 
1.5.3.6

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

  reply	other threads:[~2008-05-08 22:49 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-08 22:49 [PATCH 0/11] Omap fixes for 2.6.26-rc1 Tony Lindgren
2008-05-08 22:49 ` [PATCH 1/11] ARM: OMAP: Update MMC header to fix compile Tony Lindgren
2008-05-08 22:49   ` [PATCH 2/11] ARM: OMAP: Add calls to omap2_set_globals_*() Tony Lindgren
2008-05-08 22:49     ` [PATCH 3/11] ARM: OMAP: Warn on disabling clocks with no users Tony Lindgren
2008-05-08 22:49       ` [PATCH 4/11] ARM: OMAP: DMA: Fix incorrect channel linking Tony Lindgren
2008-05-08 22:49         ` [PATCH 5/11] ARM: OMAP: Fix Unbalanced enable for IRQ in omap mailbox Tony Lindgren
2008-05-08 22:49           ` [PATCH 6/11] ARM: OMAP: Keymap fix for palmte and palmz71 Tony Lindgren
2008-05-08 22:49             ` Tony Lindgren [this message]
2008-05-08 22:49               ` [PATCH 8/11] ARM: OMAP: Add fuctional clock enabler for iva2 Tony Lindgren
2008-05-08 22:49                 ` [PATCH 9/11] ARM: OMAP: PRCM fixes to ssi clock handling Tony Lindgren
2008-05-08 22:49                   ` [PATCH 10/11] ARM: OMAP: Add PARENT_CONTROLS_CLOCK flag to dpll5_m2_ck Tony Lindgren
2008-05-08 22:49                     ` [PATCH 11/11] ARM: OMAP: Fixed comments on global PRM register usage Tony Lindgren
2008-05-09  9:51   ` [PATCH 1/11] ARM: OMAP: Update MMC header to fix compile Felipe Balbi
2008-05-09 17:30     ` Tony Lindgren
2008-05-10 18:15 ` Git pull request for omap-fixes ([PATCH 0/11] Omap fixes for 2.6.26-rc1) Tony Lindgren

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=1210286975-29506-8-git-send-email-tony@atomide.com \
    --to=tony@atomide.com \
    --cc=jouni.hogander@nokia.com \
    --cc=linux-arm-kernel@lists.arm.linux.org.uk \
    --cc=linux-omap@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox