Просмотр исходного кода

[ARM] 4985/1: S3C2412: Fix ARMDIVN name in CLKDIVN definition.

Fix the name of the S3C2412_CLKDIVN_ARMDIVN define.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks 17 лет назад
Родитель
Сommit
1017be88d3
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      arch/arm/mach-s3c2412/s3c2412.c
  2. 1 1
      include/asm-arm/arch-s3c2410/regs-clock.h

+ 1 - 1
arch/arm/mach-s3c2412/s3c2412.c

@@ -175,7 +175,7 @@ void __init s3c2412_init_clocks(int xtal)
 	/* work out clock scalings */
 
 	hclk = fclk / ((tmp & S3C2412_CLKDIVN_HDIVN_MASK) + 1);
-	hclk /= ((tmp & S3C2421_CLKDIVN_ARMDIVN) ? 2 : 1);
+	hclk /= ((tmp & S3C2412_CLKDIVN_ARMDIVN) ? 2 : 1);
 	pclk = hclk / ((tmp & S3C2412_CLKDIVN_PDIVN) ? 2 : 1);
 
 	/* print brieft summary of clocks, etc */

+ 1 - 1
include/asm-arm/arch-s3c2410/regs-clock.h

@@ -137,7 +137,7 @@ s3c2410_get_pll(unsigned int pllval, unsigned int baseclk)
 
 #define S3C2412_CLKDIVN_PDIVN		(1<<2)
 #define S3C2412_CLKDIVN_HDIVN_MASK	(3<<0)
-#define S3C2421_CLKDIVN_ARMDIVN		(1<<3)
+#define S3C2412_CLKDIVN_ARMDIVN		(1<<3)
 #define S3C2412_CLKDIVN_DVSEN		(1<<4)
 #define S3C2412_CLKDIVN_HALFHCLK	(1<<5)
 #define S3C2412_CLKDIVN_USB48DIV	(1<<6)