From 59c6d1f9b05e42e14869bb7228acf8241a620de4 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Thu, 5 Aug 2010 18:22:27 +0900
Subject: [PATCH] --- yaml --- r: 208737 b: refs/heads/master c:
 aaeedff6b1f3cc8e2de0d2899c9ab2699a1ce817 h: refs/heads/master i:   208735:
 ee8a7cc9d6d5bc94ecd03585f52657e5e703c2f1 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-s5pc100/clock.c       | 6 +++---
 trunk/arch/arm/mach-s5pc100/setup-sdhci.c | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 522bcb39ce91..e2d0c6b2d8d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa9ce74255d9ed5bff4c69e005dcd3a529ad9f66
+refs/heads/master: aaeedff6b1f3cc8e2de0d2899c9ab2699a1ce817
diff --git a/trunk/arch/arm/mach-s5pc100/clock.c b/trunk/arch/arm/mach-s5pc100/clock.c
index e1136f4ad3c2..084abd13b0a5 100644
--- a/trunk/arch/arm/mach-s5pc100/clock.c
+++ b/trunk/arch/arm/mach-s5pc100/clock.c
@@ -1078,7 +1078,7 @@ static struct clksrc_clk clksrcs[] = {
 		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 24, .size = 4 },
 	}, {
 		.clk	= {
-			.name		= "mmc_bus",
+			.name		= "sclk_mmc",
 			.id		= 0,
 			.ctrlbit	= (1 << 12),
 			.enable		= s5pc100_sclk1_ctrl,
@@ -1089,7 +1089,7 @@ static struct clksrc_clk clksrcs[] = {
 		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 0, .size = 4 },
 	}, {
 		.clk	= {
-			.name		= "mmc_bus",
+			.name		= "sclk_mmc",
 			.id		= 1,
 			.ctrlbit	= (1 << 13),
 			.enable		= s5pc100_sclk1_ctrl,
@@ -1100,7 +1100,7 @@ static struct clksrc_clk clksrcs[] = {
 		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 4, .size = 4 },
 	}, {
 		.clk	= {
-			.name		= "mmc_bus",
+			.name		= "sclk_mmc",
 			.id		= 2,
 			.ctrlbit	= (1 << 14),
 			.enable		= s5pc100_sclk1_ctrl,
diff --git a/trunk/arch/arm/mach-s5pc100/setup-sdhci.c b/trunk/arch/arm/mach-s5pc100/setup-sdhci.c
index ea7ff19adb95..f16946e456e9 100644
--- a/trunk/arch/arm/mach-s5pc100/setup-sdhci.c
+++ b/trunk/arch/arm/mach-s5pc100/setup-sdhci.c
@@ -26,10 +26,10 @@
 /* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */
 
 char *s5pc100_hsmmc_clksrcs[4] = {
-	[0] = "hsmmc",
-	[1] = "hsmmc",
-	/* [2] = "mmc_bus", not yet successfully used yet */
-	/* [3] = "48m", - note not successfully used yet */
+	[0] = "hsmmc",		/* HCLK */
+	/* [1] = "hsmmc",	- duplicate HCLK entry */
+	[2] = "sclk_mmc",	/* mmc_bus */
+	/* [3] = "48m",		- note not successfully used yet */
 };