From 3c72a63407d3e7c8fbe7a380c6ddd627189279a9 Mon Sep 17 00:00:00 2001
From: Heiko Stuebner <heiko@sntech.de>
Date: Fri, 14 Oct 2011 15:08:56 +0900
Subject: [PATCH] --- yaml --- r: 274097 b: refs/heads/master c:
 d9a3bfbd7e80ecf24d2322659d5c0542f9d95e78 h: refs/heads/master i:   274095:
 29010bf7a8fe951cb93c15ed03174b971017565d v: v3

---
 [refs]                                             |  2 +-
 trunk/arch/arm/mach-s3c2416/clock.c                |  4 +++-
 trunk/arch/arm/mach-s3c2443/clock.c                |  4 +++-
 trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c        | 12 +++++++++++-
 trunk/arch/arm/plat-samsung/include/plat/s3c2443.h |  4 +++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2a6531ab377a..3119e84a7e5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d23d059da0f7a2ce4744b2212d64a17057d8424
+refs/heads/master: d9a3bfbd7e80ecf24d2322659d5c0542f9d95e78
diff --git a/trunk/arch/arm/mach-s3c2416/clock.c b/trunk/arch/arm/mach-s3c2416/clock.c
index 5569def1a107..3060796b0e7d 100644
--- a/trunk/arch/arm/mach-s3c2416/clock.c
+++ b/trunk/arch/arm/mach-s3c2416/clock.c
@@ -158,7 +158,9 @@ void __init s3c2416_init_clocks(int xtal)
 
 	clk_epll.parent = &clk_epllref.clk;
 
-	s3c2443_common_init_clocks(xtal, s3c2416_get_pll, s3c2416_fclk_div);
+	s3c2443_common_init_clocks(xtal, s3c2416_get_pll, s3c2416_fclk_div,
+				   armdiv, ARRAY_SIZE(armdiv),
+				   S3C2416_CLKDIV0_ARMDIV_MASK);
 
 	for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
 		s3c_register_clksrc(clksrcs[ptr], 1);
diff --git a/trunk/arch/arm/mach-s3c2443/clock.c b/trunk/arch/arm/mach-s3c2443/clock.c
index cd51d04e1de7..88edc55838a1 100644
--- a/trunk/arch/arm/mach-s3c2443/clock.c
+++ b/trunk/arch/arm/mach-s3c2443/clock.c
@@ -283,7 +283,9 @@ void __init s3c2443_init_clocks(int xtal)
 	clk_epll.rate = s3c2443_get_epll(epllcon, xtal);
 	clk_epll.parent = &clk_epllref.clk;
 
-	s3c2443_common_init_clocks(xtal, s3c2443_get_mpll, s3c2443_fclk_div);
+	s3c2443_common_init_clocks(xtal, s3c2443_get_mpll, s3c2443_fclk_div,
+				   armdiv, ARRAY_SIZE(armdiv),
+				   S3C2443_CLKDIV0_ARMDIV_MASK);
 
 	s3c2443_setup_clocks();
 
diff --git a/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c b/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c
index 07a4c81587ac..3f2117b8c0d4 100644
--- a/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c
+++ b/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c
@@ -160,6 +160,10 @@ static struct clk clk_prediv = {
 	},
 };
 
+static unsigned int *armdiv;
+static int nr_armdiv;
+static int armdivmask;
+
 /* usbhost
  *
  * usb host bus-clock, usually 48MHz to provide USB bus clock timing
@@ -470,10 +474,16 @@ static struct clksrc_clk *clksrcs[] __initdata = {
 };
 
 void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,
-				       fdiv_fn get_fdiv)
+				       fdiv_fn get_fdiv,
+				       unsigned int *divs, int nr_divs,
+				       int divmask)
 {
 	int ptr;
 
+	armdiv = divs;
+	nr_armdiv = nr_divs;
+	armdivmask = divmask;
+
 	/* s3c2443 parents h and p clocks from prediv */
 	clk_h.parent = &clk_prediv;
 	clk_p.parent = &clk_prediv;
diff --git a/trunk/arch/arm/plat-samsung/include/plat/s3c2443.h b/trunk/arch/arm/plat-samsung/include/plat/s3c2443.h
index 4b2ac9a272b2..5fc4ad0fd756 100644
--- a/trunk/arch/arm/plat-samsung/include/plat/s3c2443.h
+++ b/trunk/arch/arm/plat-samsung/include/plat/s3c2443.h
@@ -40,7 +40,9 @@ typedef unsigned int (*pll_fn)(unsigned int reg, unsigned int base);
 typedef unsigned int (*fdiv_fn)(unsigned long clkcon0);
 
 extern void s3c2443_common_setup_clocks(pll_fn get_mpll, fdiv_fn fdiv);
-extern void s3c2443_common_init_clocks(int xtal, pll_fn get_mpll, fdiv_fn fdiv);
+extern void s3c2443_common_init_clocks(int xtal, pll_fn get_mpll, fdiv_fn fdiv,
+				       unsigned int *divs, int nr_divs,
+				       int divmask);
 
 extern int s3c2443_clkcon_enable_h(struct clk *clk, int enable);
 extern int s3c2443_clkcon_enable_p(struct clk *clk, int enable);