ARM: S3C2416: Add armdiv_mask constant

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>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

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 df6434f326f0585d63d3d5a49115f87de75914e4..c3feff3c0488156fd1c89d833e7f979371e46229 100644 (file)
--- 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 72b7c6274c79fcd4c21186f2bdaf029d4082a26b..5569def1a10724d73ee28d3b6e912ae6a4514c22 100644 (file)
--- 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];
 }