From 2ea15865db54f6bd842b82ab12da83047cf77367 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 29 Mar 2010 17:35:04 +0900
Subject: [PATCH] --- yaml --- r: 191603 b: refs/heads/master c:
 5afdd0d93a32938752384f195fdbde06163b3c2e h: refs/heads/master i:   191601:
 e011c54b4d8ece9c9debc6eebb932f6eb4dbe250   191599:
 c7e868afabfdc55e7d8cfac7973d166b79bb2df8 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 4 ++--
 trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c1691c545d0f..1de5bb91b80b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dc50a068ad8fbbd2dd6dd5ac8ac2652589ba046
+refs/heads/master: 5afdd0d93a32938752384f195fdbde06163b3c2e
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
index c541301c7f2b..a63cdcaee0b2 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
@@ -154,8 +154,8 @@ static struct clk mstp_clks[] = {
 	MSTP("sh0", &div4_clks[DIV4_P], MSTPCR0, 20, 0),
 	MSTP("hudi0", &div4_clks[DIV4_P], MSTPCR0, 19, 0),
 	MSTP("ubc0", &div4_clks[DIV4_P], MSTPCR0, 17, 0),
-	MSTP("tmu0", &div4_clks[DIV4_P], MSTPCR0, 15, 0),
-	MSTP("cmt0", &r_clk, MSTPCR0, 14, 0),
+	MSTP("tmu_fck", &div4_clks[DIV4_P], MSTPCR0, 15, 0),
+	MSTP("cmt_fck", &r_clk, MSTPCR0, 14, 0),
 	MSTP("rwdt0", &r_clk, MSTPCR0, 13, 0),
 	MSTP("mfi0", &div4_clks[DIV4_P], MSTPCR0, 11, 0),
 	MSTP("flctl0", &div4_clks[DIV4_P], MSTPCR0, 10, 0),
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index 6f8394942fc5..3681cafdb4af 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
@@ -205,7 +205,6 @@ static struct platform_device jpu_device = {
 static struct sh_timer_config cmt_platform_data = {
 	.channel_offset = 0x60,
 	.timer_bit = 5,
-	.clk = "cmt0",
 	.clockevent_rating = 125,
 	.clocksource_rating = 200,
 };
@@ -235,7 +234,6 @@ static struct platform_device cmt_device = {
 static struct sh_timer_config tmu0_platform_data = {
 	.channel_offset = 0x04,
 	.timer_bit = 0,
-	.clk = "tmu0",
 	.clockevent_rating = 200,
 };
 
@@ -264,7 +262,6 @@ static struct platform_device tmu0_device = {
 static struct sh_timer_config tmu1_platform_data = {
 	.channel_offset = 0x10,
 	.timer_bit = 1,
-	.clk = "tmu0",
 	.clocksource_rating = 200,
 };
 
@@ -293,7 +290,6 @@ static struct platform_device tmu1_device = {
 static struct sh_timer_config tmu2_platform_data = {
 	.channel_offset = 0x1c,
 	.timer_bit = 2,
-	.clk = "tmu0",
 };
 
 static struct resource tmu2_resources[] = {