Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5afdd0d9 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: sh7343 clock string death. 



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

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4dc50a06

arch/sh/kernel/cpu/sh4a/clock-sh7343.c

+2 −2
Original line number Diff line number Diff line
@@ -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),

arch/sh/kernel/cpu/sh4a/setup-sh7343.c

+0 −4
Original line number Diff line number Diff line
@@ -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[] = {