sh: switch sh7723 to clkdev
PATCH 3/15 sh: switch sh7723 to clkdev
From: Magnus Damm <[email protected]>
This patch converts the remaining sh7723 clocks
to use clkdev for lookup. The now unused name
and id from struct clk are also removed.
Signed-off-by Magnus Damm <[email protected]>
---
arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
arch/sh/kernel/cpu/sh4a/clock-sh7723.c +6 -8
@@ -38,8 +38,6 @@/* Fixed 32 KHz root clock for RTC and Power Management purposes */ static struct clk r_clk = { - .name ="rclk" , - .id =-1 , .rate =32768 , };
@@ -48,8 +46,6 @@ static struct clk r_clk = {* from the platform code. */ struct clk extal_clk = { - .name ="extal" , - .id =-1 , .rate =33333333 , };
@@ -71,8 +67,6 @@ static struct clk_ops dll_clk_ops = { };static struct clk dll_clk = { - .name ="dll_clk" , - .id =-1 , .ops = &dll_clk_ops, .parent = &r_clk, .flags =CLK_ENABLE_ON_INIT ,
@@ -96,8 +90,6 @@ static struct clk_ops pll_clk_ops = { };static struct clk pll_clk = { - .name ="pll_clk" , - .id =-1 , .ops = &pll_clk_ops, .flags =CLK_ENABLE_ON_INIT , };
@@ -211,6 +203,12 @@ static struct clk mstp_clks[] = {#define CLKDEV_CON_ID (_id, _clk) { .con_id = _id, .clk = _clk }static struct clk_lookup lookups[] = { +/* main clocks */ +CLKDEV_CON_ID ("rclk" , &r_clk), +CLKDEV_CON_ID ("extal" , &extal_clk), +CLKDEV_CON_ID ("dll_clk" , &dll_clk), +CLKDEV_CON_ID ("pll_clk" , &pll_clk), +/* DIV4 clocks */ CLKDEV_CON_ID ("cpu_clk" , &div4_clks[DIV4_I ]),CLKDEV_CON_ID ("umem_clk" , &div4_clks[DIV4_U ]),