msm: clock: Support depends in toplevel
Two types of clocks support depends (branches and rcgs) and soon
we'll be adding a third (rpm). Support depends in the core so as
to avoid duplicating that logic all over.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 23b34d2..187b331 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -544,11 +544,11 @@
.halt_reg = DBG_BUS_VEC_I_REG,
.halt_bit = 26,
},
- .depends = &vcodec_axi_b_clk.c,
.c = {
.dbg_name = "vcodec_axi_a_clk",
.ops = &clk_ops_branch,
CLK_INIT(vcodec_axi_a_clk.c),
+ .depends = &vcodec_axi_b_clk.c,
},
};
@@ -561,11 +561,11 @@
.halt_reg = DBG_BUS_VEC_E_REG,
.halt_bit = 3,
},
- .depends = &vcodec_axi_a_clk.c,
.c = {
.dbg_name = "vcodec_axi_clk",
.ops = &clk_ops_branch,
CLK_INIT(vcodec_axi_clk.c),
+ .depends = &vcodec_axi_a_clk.c,
},
};
@@ -2481,12 +2481,12 @@
.set_rate = set_rate_mnd_banked,
.freq_tbl = clk_tbl_gfx3d,
.bank_masks = &bmnd_info_gfx3d,
- .depends = &gmem_axi_clk.c,
.current_freq = &local_dummy_freq,
.c = {
.dbg_name = "gfx3d_clk",
.ops = &soc_clk_ops_8960,
CLK_INIT(gfx3d_clk.c),
+ .depends = &gmem_axi_clk.c,
},
};
@@ -2530,12 +2530,12 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_ijpeg,
- .depends = &ijpeg_axi_clk.c,
.current_freq = &local_dummy_freq,
.c = {
.dbg_name = "ijpeg_clk",
.ops = &soc_clk_ops_8960,
CLK_INIT(ijpeg_clk.c),
+ .depends = &ijpeg_axi_clk.c,
},
};
@@ -2570,12 +2570,12 @@
.ns_mask = (BM(15, 12) | BM(2, 0)),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_jpegd,
- .depends = &jpegd_axi_clk.c,
.current_freq = &local_dummy_freq,
.c = {
.dbg_name = "jpegd_clk",
.ops = &soc_clk_ops_8960,
CLK_INIT(jpegd_clk.c),
+ .depends = &jpegd_axi_clk.c,
},
};
@@ -2640,12 +2640,12 @@
.set_rate = set_rate_mnd_banked,
.freq_tbl = clk_tbl_mdp,
.bank_masks = &bmnd_info_mdp,
- .depends = &mdp_axi_clk.c,
.current_freq = &local_dummy_freq,
.c = {
.dbg_name = "mdp_clk",
.ops = &soc_clk_ops_8960,
CLK_INIT(mdp_clk.c),
+ .depends = &mdp_axi_clk.c,
},
};
@@ -2748,11 +2748,11 @@
.freq_tbl = clk_tbl_rot,
.bank_masks = &bdiv_info_rot,
.current_freq = &local_dummy_freq,
- .depends = &rot_axi_clk.c,
.c = {
.dbg_name = "rot_clk",
.ops = &soc_clk_ops_8960,
CLK_INIT(rot_clk.c),
+ .depends = &rot_axi_clk.c,
},
};
@@ -2992,12 +2992,12 @@
.set_rate = set_rate_mnd_banked,
.bank_masks = &bmnd_info_vcodec,
.freq_tbl = clk_tbl_vcodec,
- .depends = &vcodec_axi_clk.c,
.current_freq = &local_dummy_freq,
.c = {
.dbg_name = "vcodec_clk",
.ops = &soc_clk_ops_8960,
CLK_INIT(vcodec_clk.c),
+ .depends = &vcodec_axi_clk.c,
},
};
@@ -3036,11 +3036,11 @@
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_vpe,
.current_freq = &local_dummy_freq,
- .depends = &vpe_axi_clk.c,
.c = {
.dbg_name = "vpe_clk",
.ops = &soc_clk_ops_8960,
CLK_INIT(vpe_clk.c),
+ .depends = &vpe_axi_clk.c,
},
};
@@ -3092,12 +3092,12 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_vfe,
- .depends = &vfe_axi_clk.c,
.current_freq = &local_dummy_freq,
.c = {
.dbg_name = "vfe_clk",
.ops = &soc_clk_ops_8960,
CLK_INIT(vfe_clk.c),
+ .depends = &vfe_axi_clk.c,
},
};