Skip to contentSkip to conversation

sh: switch sh7786 to clkdev

PATCH New Magnus Damm 1 participant 1 message May 11, 2010 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 8/15 sh: switch sh7786 to clkdev

From: Magnus Damm <[email protected]>

This patch converts the remaining sh7786 clocks
to use clkdev for lookup. The now unused name
and id from struct clk are also removed.

---

 arch/sh/kernel/cpu/sh4a/clock-sh7786.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/sh/kernel/cpu/sh4a/clock-sh7786.c +4 -4
@@ -23,8 +23,6 @@
  * from the platform code.
  */
 static struct clk extal_clk = {
-	.name		= "extal",
-	.id		= -1,
 	.rate		= 33333333,
 };
 
@@ -46,8 +44,6 @@ static struct clk_ops pll_clk_ops = {
 };
 
 static struct clk pll_clk = {
-	.name		= "pll_clk",
-	.id		= -1,
 	.ops		= &pll_clk_ops,
 	.parent		= &extal_clk,
 	.flags		= CLK_ENABLE_ON_INIT,
@@ -133,6 +129,10 @@ static struct clk mstp_clks[MSTP_NR] = {
 #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
 
 static struct clk_lookup lookups[] = {
+	/* main clocks */
+	CLKDEV_CON_ID("extal", &extal_clk),
+	CLKDEV_CON_ID("pll_clk", &pll_clk),
+
 	/* DIV4 clocks */
 	CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
 	CLKDEV_CON_ID("du_clk", &div4_clks[DIV4_DU]),