From 9551e7332a206fb96849b77cba2cf3a874beabda Mon Sep 17 00:00:00 2001
From: Jongpill Lee <boyko.lee@samsung.com>
Date: Wed, 18 Aug 2010 22:20:31 +0900
Subject: [PATCH] --- yaml --- r: 210111 b: refs/heads/master c:
 3ff310206db33e66c076b1f656e70e9080f5be50 h: refs/heads/master i:   210109:
 5f5cc341c82f9e3e8b75bbded49d21361b3b4e3a   210107:
 7faa31d9db71b13de99b3cc08e2f73c4c121ebd9   210103:
 a02a34b54c8785eb26125187da475f73323d7726   210095:
 7fe8523da9242b9f6aafb846599f7086daa4293d   210079:
 62a9f2e11f439bb6e0fc2915cd42f08f488dffd2   210047:
 6461ab68d771903fd5ecc21c4df68102d022c3d5 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/mach-s5pv310/clock.c | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 64bab65c9a87..38c7f9f516ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d235f7934ab55329a5cb34d7e3949ba50b511d4
+refs/heads/master: 3ff310206db33e66c076b1f656e70e9080f5be50
diff --git a/trunk/arch/arm/mach-s5pv310/clock.c b/trunk/arch/arm/mach-s5pv310/clock.c
index 1659eb1e7b07..b3f50426148d 100644
--- a/trunk/arch/arm/mach-s5pv310/clock.c
+++ b/trunk/arch/arm/mach-s5pv310/clock.c
@@ -39,6 +39,14 @@ static struct clksrc_clk clk_mout_apll = {
 	},
 	.sources	= &clk_src_apll,
 	.reg_src	= { .reg = S5P_CLKSRC_CPU, .shift = 0, .size = 1 },
+};
+
+static struct clksrc_clk clk_sclk_apll = {
+	.clk	= {
+		.name		= "sclk_apll",
+		.id		= -1,
+		.parent		= &clk_mout_apll.clk,
+	},
 	.reg_div	= { .reg = S5P_CLKDIV_CPU, .shift = 24, .size = 3 },
 };
 
@@ -61,7 +69,7 @@ static struct clksrc_clk clk_mout_mpll = {
 };
 
 static struct clk *clkset_moutcore_list[] = {
-	[0] = &clk_mout_apll.clk,
+	[0] = &clk_sclk_apll.clk,
 	[1] = &clk_mout_mpll.clk,
 };
 
@@ -154,7 +162,7 @@ static struct clksrc_clk clk_pclk_dbg = {
 
 static struct clk *clkset_corebus_list[] = {
 	[0] = &clk_mout_mpll.clk,
-	[1] = &clk_mout_apll.clk,
+	[1] = &clk_sclk_apll.clk,
 };
 
 static struct clksrc_sources clkset_mout_corebus = {
@@ -220,7 +228,7 @@ static struct clksrc_clk clk_pclk_acp = {
 
 static struct clk *clkset_aclk_top_list[] = {
 	[0] = &clk_mout_mpll.clk,
-	[1] = &clk_mout_apll.clk,
+	[1] = &clk_sclk_apll.clk,
 };
 
 static struct clksrc_sources clkset_aclk_200 = {
@@ -411,6 +419,7 @@ static struct clksrc_clk clksrcs[] = {
 /* Clock initialization code */
 static struct clksrc_clk *sysclks[] = {
 	&clk_mout_apll,
+	&clk_sclk_apll,
 	&clk_mout_epll,
 	&clk_mout_mpll,
 	&clk_moutcore,