From 699575a22d396a95ab17101be83647932b159b6a Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Fri, 14 Oct 2011 15:08:56 +0900 Subject: [PATCH] --- yaml --- r: 274096 b: refs/heads/master c: 0d23d059da0f7a2ce4744b2212d64a17057d8424 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 + trunk/arch/arm/mach-s3c2416/clock.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a4ea3ae2c0e2..2a6531ab377a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 716e84d139b2e209d8d17d21f09f3a5dc0026537 +refs/heads/master: 0d23d059da0f7a2ce4744b2212d64a17057d8424 diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/trunk/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h index df6434f326f0..c3feff3c0488 100644 --- a/trunk/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h +++ b/trunk/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/trunk/arch/arm/mach-s3c2416/clock.c b/trunk/arch/arm/mach-s3c2416/clock.c index 72b7c6274c79..5569def1a107 100644 --- a/trunk/arch/arm/mach-s3c2416/clock.c +++ b/trunk/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]; }