浏览代码

sh: sh7722 clock string death.

Kills off clock string usage, using the new function clock definition
instead.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Paul Mundt 15 年之前
父节点
当前提交
04b1731766
共有 2 个文件被更改,包括 2 次插入6 次删除
  1. 2 2
      arch/sh/kernel/cpu/sh4a/clock-sh7722.c
  2. 0 4
      arch/sh/kernel/cpu/sh4a/setup-sh7722.c

+ 2 - 2
arch/sh/kernel/cpu/sh4a/clock-sh7722.c

@@ -160,8 +160,8 @@ struct clk div6_clks[] = {
 static struct clk mstp_clks[] = {
 static struct clk mstp_clks[] = {
 	SH_HWBLK_CLK("uram0", -1, U_CLK, HWBLK_URAM, CLK_ENABLE_ON_INIT),
 	SH_HWBLK_CLK("uram0", -1, U_CLK, HWBLK_URAM, CLK_ENABLE_ON_INIT),
 	SH_HWBLK_CLK("xymem0", -1, B_CLK, HWBLK_XYMEM, CLK_ENABLE_ON_INIT),
 	SH_HWBLK_CLK("xymem0", -1, B_CLK, HWBLK_XYMEM, CLK_ENABLE_ON_INIT),
-	SH_HWBLK_CLK("tmu0", -1, P_CLK, HWBLK_TMU, 0),
-	SH_HWBLK_CLK("cmt0", -1, R_CLK, HWBLK_CMT, 0),
+	SH_HWBLK_CLK("tmu_fck", -1, P_CLK, HWBLK_TMU, 0),
+	SH_HWBLK_CLK("cmt_fck", -1, R_CLK, HWBLK_CMT, 0),
 	SH_HWBLK_CLK("rwdt0", -1, R_CLK, HWBLK_RWDT, 0),
 	SH_HWBLK_CLK("rwdt0", -1, R_CLK, HWBLK_RWDT, 0),
 	SH_HWBLK_CLK("flctl0", -1, P_CLK, HWBLK_FLCTL, 0),
 	SH_HWBLK_CLK("flctl0", -1, P_CLK, HWBLK_FLCTL, 0),
 	SH_HWBLK_CLK("sci_fck", 0, P_CLK, HWBLK_SCIF0, 0),
 	SH_HWBLK_CLK("sci_fck", 0, P_CLK, HWBLK_SCIF0, 0),

+ 0 - 4
arch/sh/kernel/cpu/sh4a/setup-sh7722.c

@@ -400,7 +400,6 @@ static struct platform_device jpu_device = {
 static struct sh_timer_config cmt_platform_data = {
 static struct sh_timer_config cmt_platform_data = {
 	.channel_offset = 0x60,
 	.channel_offset = 0x60,
 	.timer_bit = 5,
 	.timer_bit = 5,
-	.clk = "cmt0",
 	.clockevent_rating = 125,
 	.clockevent_rating = 125,
 	.clocksource_rating = 125,
 	.clocksource_rating = 125,
 };
 };
@@ -433,7 +432,6 @@ static struct platform_device cmt_device = {
 static struct sh_timer_config tmu0_platform_data = {
 static struct sh_timer_config tmu0_platform_data = {
 	.channel_offset = 0x04,
 	.channel_offset = 0x04,
 	.timer_bit = 0,
 	.timer_bit = 0,
-	.clk = "tmu0",
 	.clockevent_rating = 200,
 	.clockevent_rating = 200,
 };
 };
 
 
@@ -465,7 +463,6 @@ static struct platform_device tmu0_device = {
 static struct sh_timer_config tmu1_platform_data = {
 static struct sh_timer_config tmu1_platform_data = {
 	.channel_offset = 0x10,
 	.channel_offset = 0x10,
 	.timer_bit = 1,
 	.timer_bit = 1,
-	.clk = "tmu0",
 	.clocksource_rating = 200,
 	.clocksource_rating = 200,
 };
 };
 
 
@@ -497,7 +494,6 @@ static struct platform_device tmu1_device = {
 static struct sh_timer_config tmu2_platform_data = {
 static struct sh_timer_config tmu2_platform_data = {
 	.channel_offset = 0x1c,
 	.channel_offset = 0x1c,
 	.timer_bit = 2,
 	.timer_bit = 2,
-	.clk = "tmu0",
 };
 };
 
 
 static struct resource tmu2_resources[] = {
 static struct resource tmu2_resources[] = {