From: "Heiko Stübner" <heiko@sntech.de>
To: Kukjin Kim <kgene.kim@samsung.com>, 'Ben Dooks' <ben-linux@fluff.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, heiko@sntech.de
Subject: [PATCH 1/8] S3C2416: Add armdiv_mask constant
Date: Wed, 28 Sep 2011 12:18:53 +0200 [thread overview]
Message-ID: <201109281218.53972.heiko@sntech.de> (raw)
In-Reply-To: <201109281217.33813.heiko@sntech.de>
The S3C2416/2450 has only 3 bits for the armdiv setting instead
of the 4 bits of the S3C2443.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
.../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 +
arch/arm/mach-s3c2416/clock.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
index df6434f..c3feff3 100644
--- a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
@@ -65,6 +65,7 @@
#define S3C2443_CLKDIV0_PREDIV_MASK (3<<4)
#define S3C2443_CLKDIV0_PREDIV_SHIFT (4)
+#define S3C2416_CLKDIV0_ARMDIV_MASK (7 << 9)
#define S3C2443_CLKDIV0_ARMDIV_MASK (15<<9)
#define S3C2443_CLKDIV0_ARMDIV_SHIFT (9)
#define S3C2443_CLKDIV0_ARMDIV_1 (0<<9)
diff --git a/arch/arm/mach-s3c2416/clock.c b/arch/arm/mach-s3c2416/clock.c
index 72b7c62..5569def 100644
--- a/arch/arm/mach-s3c2416/clock.c
+++ b/arch/arm/mach-s3c2416/clock.c
@@ -127,7 +127,7 @@ static struct clk hsmmc0_clk = {
static inline unsigned int s3c2416_fclk_div(unsigned long clkcon0)
{
- clkcon0 &= 7 << S3C2443_CLKDIV0_ARMDIV_SHIFT;
+ clkcon0 &= S3C2416_CLKDIV0_ARMDIV_MASK;
return armdiv[clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT];
}
--
1.7.5.4
WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/8] S3C2416: Add armdiv_mask constant
Date: Wed, 28 Sep 2011 12:18:53 +0200 [thread overview]
Message-ID: <201109281218.53972.heiko@sntech.de> (raw)
In-Reply-To: <201109281217.33813.heiko@sntech.de>
The S3C2416/2450 has only 3 bits for the armdiv setting instead
of the 4 bits of the S3C2443.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
.../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 +
arch/arm/mach-s3c2416/clock.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
index df6434f..c3feff3 100644
--- a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
@@ -65,6 +65,7 @@
#define S3C2443_CLKDIV0_PREDIV_MASK (3<<4)
#define S3C2443_CLKDIV0_PREDIV_SHIFT (4)
+#define S3C2416_CLKDIV0_ARMDIV_MASK (7 << 9)
#define S3C2443_CLKDIV0_ARMDIV_MASK (15<<9)
#define S3C2443_CLKDIV0_ARMDIV_SHIFT (9)
#define S3C2443_CLKDIV0_ARMDIV_1 (0<<9)
diff --git a/arch/arm/mach-s3c2416/clock.c b/arch/arm/mach-s3c2416/clock.c
index 72b7c62..5569def 100644
--- a/arch/arm/mach-s3c2416/clock.c
+++ b/arch/arm/mach-s3c2416/clock.c
@@ -127,7 +127,7 @@ static struct clk hsmmc0_clk = {
static inline unsigned int s3c2416_fclk_div(unsigned long clkcon0)
{
- clkcon0 &= 7 << S3C2443_CLKDIV0_ARMDIV_SHIFT;
+ clkcon0 &= S3C2416_CLKDIV0_ARMDIV_MASK;
return armdiv[clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT];
}
--
1.7.5.4
next prev parent reply other threads:[~2011-09-28 10:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 10:17 [PATCH 0/8] S3C2416: Enable armdiv and armclk Heiko Stübner
2011-09-28 10:17 ` Heiko Stübner
2011-09-28 10:18 ` Heiko Stübner [this message]
2011-09-28 10:18 ` [PATCH 1/8] S3C2416: Add armdiv_mask constant Heiko Stübner
2011-09-28 10:19 ` [PATCH 2/8] S3C2443: Add infrastructure to transmit armdiv to common code Heiko Stübner
2011-09-28 10:19 ` Heiko Stübner
2011-09-28 10:20 ` [PATCH 3/8] S3C2443: Move clk_arm and clk_armdiv " Heiko Stübner
2011-09-28 10:20 ` Heiko Stübner
2011-09-28 10:20 ` [PATCH 4/8] S3C2416: Add comment describing the armdiv/armclk Heiko Stübner
2011-09-28 10:20 ` Heiko Stübner
2011-09-28 10:21 ` [PATCH 5/8] S3C2443: Add get_rate operation for clk_armdiv Heiko Stübner
2011-09-28 10:21 ` Heiko Stübner
2011-09-28 10:22 ` [PATCH 6/8] S3C2443: handle unset armdiv values gracefully Heiko Stübner
2011-09-28 10:22 ` Heiko Stübner
2011-09-28 10:22 ` [PATCH 7/8] S3C2443: Accommodate cpufreq frequency scheme in armdiv Heiko Stübner
2011-09-28 10:22 ` Heiko Stübner
2011-09-28 10:23 ` [PATCH 8/8] S3C2443: use clk_get_rate to init fclk in common_setup_clocks Heiko Stübner
2011-09-28 10:23 ` Heiko Stübner
2011-10-14 7:14 ` [PATCH 0/8] S3C2416: Enable armdiv and armclk Kukjin Kim
2011-10-14 7:14 ` Kukjin Kim
2011-10-14 7:27 ` Heiko Stübner
2011-10-14 7:27 ` Heiko Stübner
2011-10-14 7:44 ` Kukjin Kim
2011-10-14 7:44 ` Kukjin Kim
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=201109281218.53972.heiko@sntech.de \
--to=heiko@sntech.de \
--cc=ben-linux@fluff.org \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@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 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.