commit 7fa2674e0f53e35bdf55dea6af080589b9132249
author Stephen Boyd <sboyd@codeaurora.org> Thu Aug 11 23:22:29 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:15:00 2011 -0700
tree 2598cbc7a3de2df62eb5f4541d95b8782c52cc95
parent 6619d165ccab07bb8c5a4848dcd3fffdc3db1c2f

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>

arch/arm/mach-msm/clock-8x60.c

diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 44276d8..fe56dd9 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -2299,12 +2299,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_8x60,
 		CLK_INIT(gfx3d_clk.c),
+		.depends = &gmem_axi_clk.c,
 	},
 };
 
@@ -2348,12 +2348,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_8x60,
 		CLK_INIT(ijpeg_clk.c),
+		.depends = &ijpeg_axi_clk.c,
 	},
 };
 
@@ -2388,12 +2388,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_8x60,
 		CLK_INIT(jpegd_clk.c),
+		.depends = &jpegd_axi_clk.c,
 	},
 };
 
@@ -2458,12 +2458,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_8x60,
 		CLK_INIT(mdp_clk.c),
+		.depends = &mdp_axi_clk.c,
 	},
 };
 
@@ -2615,12 +2615,12 @@
 	.set_rate = set_rate_div_banked,
 	.freq_tbl = clk_tbl_rot,
 	.bank_masks = &bdiv_info_rot,
-	.depends = &rot_axi_clk.c,
 	.current_freq = &local_dummy_freq,
 	.c = {
 		.dbg_name = "rot_clk",
 		.ops = &soc_clk_ops_8x60,
 		CLK_INIT(rot_clk.c),
+		.depends = &rot_axi_clk.c,
 	},
 };
 
@@ -2794,12 +2794,12 @@
 	.ctl_mask = BM(7, 6),
 	.set_rate = set_rate_mnd,
 	.freq_tbl = clk_tbl_vcodec,
-	.depends = &vcodec_axi_clk.c,
 	.current_freq = &local_dummy_freq,
 	.c = {
 		.dbg_name = "vcodec_clk",
 		.ops = &soc_clk_ops_8x60,
 		CLK_INIT(vcodec_clk.c),
+		.depends = &vcodec_axi_clk.c,
 	},
 };
 
@@ -2838,12 +2838,12 @@
 	.ns_mask = (BM(15, 12) | BM(2, 0)),
 	.set_rate = set_rate_nop,
 	.freq_tbl = clk_tbl_vpe,
-	.depends = &vpe_axi_clk.c,
 	.current_freq = &local_dummy_freq,
 	.c = {
 		.dbg_name = "vpe_clk",
 		.ops = &soc_clk_ops_8x60,
 		CLK_INIT(vpe_clk.c),
+		.depends = &vpe_axi_clk.c,
 	},
 };
 
@@ -2894,12 +2894,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_8x60,
 		CLK_INIT(vfe_clk.c),
+		.depends = &vfe_axi_clk.c,
 	},
 };