diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2011-10-14 10:08:56 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-14 10:15:48 +0400 |
| commit | 0d23d059da0f7a2ce4744b2212d64a17057d8424 (patch) | |
| tree | 27557a7138c3149abbfc048641a50cec7b71212c | |
| parent | 716e84d139b2e209d8d17d21f09f3a5dc0026537 (diff) | |
| download | linux-0d23d059da0f7a2ce4744b2212d64a17057d8424.tar.xz | |
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>
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 | ||||
| -rw-r--r-- | 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 df6434f326f0..c3feff3c0488 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 72b7c6274c79..5569def1a107 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]; } |