msm: clock: Migrate to clkdev

Migrating to clkdev has several advantages:

 * Less code in mach-msm/clock.c

 * A more robust clk_get() implementation

 * clk_add_alias() support

 * clk_get_sys() support

In general, this will help board authors setup clock aliases and
break the dependency on device pointers in the clock tables.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>

1 files changed, 17 insertions, 14 deletions

diff --git a/arch/arm/mach-msm/clock-7x30.h b/arch/arm/mach-msm/clock-7x30.h
index 53622b3992b7..14104453688b 100644
--- a/arch/arm/mach-msm/clock-7x30.h
+++ b/arch/arm/mach-msm/clock-7x30.h
@@ -130,23 +130,26 @@ void pll_disable(uint32_t pll);
 extern int internal_pwr_rail_ctl_auto(unsigned rail_id, bool enable);
 
 #define CLK_7X30(clk_name, clk_id, clk_dev, clk_flags) {        \
-        .name = clk_name, \
-        .id = L_7X30_##clk_id, \
-        .remote_id = P_##clk_id, \
-        .flags = clk_flags, \
-        .dev = clk_dev, \
-        .dbg_name = #clk_id, \
+        .con_id = clk_name, \
+        .dev_id = clk_dev, \
+        .clk = &(struct clk){ \
+                .id = L_7X30_##clk_id, \
+                .remote_id = P_##clk_id, \
+                .flags = clk_flags, \
+                .dbg_name = #clk_id, \
+        }, \
         }
 
 #define CLK_7X30S(clk_name, l_id, r_id, clk_dev, clk_flags) {   \
-        .name = clk_name, \
-        .id = L_7X30_##l_id, \
-        .remote_id = P_##r_id, \
-        .flags = clk_flags, \
-        .dev = clk_dev, \
-        .dbg_name = #l_id, \
-        .ops = &clk_ops_pcom, \
+        .con_id = clk_name, \
+        .dev_id = clk_dev, \
+        .clk = &(struct clk){ \
+                .id = L_7X30_##l_id, \
+                .remote_id = P_##r_id, \
+                .flags = clk_flags, \
+                .dbg_name = #l_id, \
+                .ops = &clk_ops_pcom, \
+        }, \
         }
 
 #endif
-