msm: clock-local: Cleanup RCG clock dummy_freq and ops names
Rename 'soc_clk_ops_xxxx' to 'clk_ops_rcg_xxxx' and
'local_dummy_freq' to 'rcg_dummy_freq' to better match naming
conventions used elsewhere in these drivers.
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index a1bf439..8f5ee70 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -518,7 +518,7 @@
return branch_reset(&to_rcg_clk(clk)->b, action);
}
-static struct clk_ops soc_clk_ops_8x60 = {
+static struct clk_ops clk_ops_rcg_8x60 = {
.enable = rcg_clk_enable,
.disable = rcg_clk_disable,
.auto_off = rcg_clk_auto_off,
@@ -1031,10 +1031,10 @@
.ns_mask = (BM(31, 16) | BM(6, 0)), \
.set_rate = set_rate_mnd, \
.freq_tbl = clk_tbl_gsbi_uart, \
- .current_freq = &local_dummy_freq, \
+ .current_freq = &rcg_dummy_freq, \
.c = { \
.dbg_name = #i "_clk", \
- .ops = &soc_clk_ops_8x60, \
+ .ops = &clk_ops_rcg_8x60, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -1095,10 +1095,10 @@
.ns_mask = (BM(23, 16) | BM(6, 0)), \
.set_rate = set_rate_mnd, \
.freq_tbl = clk_tbl_gsbi_qup, \
- .current_freq = &local_dummy_freq, \
+ .current_freq = &rcg_dummy_freq, \
.c = { \
.dbg_name = #i "_clk", \
- .ops = &soc_clk_ops_8x60, \
+ .ops = &clk_ops_rcg_8x60, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -1165,10 +1165,10 @@
.ns_mask = BM(1, 0),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_pdm,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "pdm_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(pdm_clk.c),
},
};
@@ -1208,10 +1208,10 @@
},
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_prng,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "prng_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(prng_clk.c),
},
};
@@ -1232,10 +1232,10 @@
.ns_mask = (BM(23, 16) | BM(6, 0)), \
.set_rate = set_rate_mnd, \
.freq_tbl = clk_tbl_sdc, \
- .current_freq = &local_dummy_freq, \
+ .current_freq = &rcg_dummy_freq, \
.c = { \
.dbg_name = #i "_clk", \
- .ops = &soc_clk_ops_8x60, \
+ .ops = &clk_ops_rcg_8x60, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -1294,10 +1294,10 @@
.ns_mask = (BM(31, 16) | BM(6, 0)),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_tsif_ref,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "tsif_ref_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(tsif_ref_clk.c),
},
};
@@ -1326,10 +1326,10 @@
.ns_mask = BM(1, 0),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_tssc,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "tssc_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(tssc_clk.c),
},
};
@@ -1364,10 +1364,10 @@
.ns_mask = (BM(23, 16) | BM(6, 0)),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_usb,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "usb_hs1_xcvr_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(usb_hs1_xcvr_clk.c),
},
};
@@ -1396,10 +1396,10 @@
.ns_mask = (BM(23, 16) | BM(6, 0)), \
.set_rate = set_rate_mnd, \
.freq_tbl = clk_tbl_usb, \
- .current_freq = &local_dummy_freq, \
+ .current_freq = &rcg_dummy_freq, \
.c = { \
.dbg_name = #i "_clk", \
- .ops = &soc_clk_ops_8x60, \
+ .ops = &clk_ops_rcg_8x60, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -2006,10 +2006,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd_8,
.freq_tbl = clk_tbl_cam,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "cam_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(cam_clk.c),
},
};
@@ -2038,10 +2038,10 @@
.ns_mask = (BM(15, 12) | BM(2, 0)),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_csi,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "csi_src_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(csi_src_clk.c),
},
};
@@ -2109,10 +2109,10 @@
.ns_mask = BM(27, 24),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_dsi_byte,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "dsi_byte_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(dsi_byte_clk.c),
},
};
@@ -2190,10 +2190,10 @@
.set_rate = set_rate_mnd_banked,
.freq_tbl = clk_tbl_gfx2d,
.bank_masks = &bmnd_info_gfx2d0,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "gfx2d0_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(gfx2d0_clk.c),
},
};
@@ -2230,10 +2230,10 @@
.set_rate = set_rate_mnd_banked,
.freq_tbl = clk_tbl_gfx2d,
.bank_masks = &bmnd_info_gfx2d1,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "gfx2d1_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(gfx2d1_clk.c),
},
};
@@ -2299,10 +2299,10 @@
.set_rate = set_rate_mnd_banked,
.freq_tbl = clk_tbl_gfx3d,
.bank_masks = &bmnd_info_gfx3d,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "gfx3d_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(gfx3d_clk.c),
.depends = &gmem_axi_clk.c,
},
@@ -2348,10 +2348,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_ijpeg,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "ijpeg_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(ijpeg_clk.c),
.depends = &ijpeg_axi_clk.c,
},
@@ -2388,10 +2388,10 @@
.ns_mask = (BM(15, 12) | BM(2, 0)),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_jpegd,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "jpegd_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(jpegd_clk.c),
.depends = &jpegd_axi_clk.c,
},
@@ -2458,10 +2458,10 @@
.set_rate = set_rate_mnd_banked,
.freq_tbl = clk_tbl_mdp,
.bank_masks = &bmnd_info_mdp,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "mdp_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(mdp_clk.c),
.depends = &mdp_axi_clk.c,
},
@@ -2492,10 +2492,10 @@
.ns_mask = BIT(13),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_mdp_vsync,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "mdp_vsync_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(mdp_vsync_clk.c),
},
};
@@ -2542,10 +2542,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_pixel_mdp,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "pixel_mdp_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(pixel_mdp_clk.c),
},
};
@@ -2615,10 +2615,10 @@
.set_rate = set_rate_div_banked,
.freq_tbl = clk_tbl_rot,
.bank_masks = &bdiv_info_rot,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "rot_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(rot_clk.c),
.depends = &rot_axi_clk.c,
},
@@ -2665,10 +2665,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_tv,
.freq_tbl = clk_tbl_tv,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "tv_src_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(tv_src_clk.c),
},
};
@@ -2794,10 +2794,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_vcodec,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "vcodec_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(vcodec_clk.c),
.depends = &vcodec_axi_clk.c,
},
@@ -2838,10 +2838,10 @@
.ns_mask = (BM(15, 12) | BM(2, 0)),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_vpe,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "vpe_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(vpe_clk.c),
.depends = &vpe_axi_clk.c,
},
@@ -2894,10 +2894,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_vfe,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "vfe_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(vfe_clk.c),
.depends = &vfe_axi_clk.c,
},
@@ -2981,10 +2981,10 @@
.ns_mask = (BM(31, 24) | BM(6, 0)), \
.set_rate = set_rate_mnd, \
.freq_tbl = clk_tbl_aif_osr, \
- .current_freq = &local_dummy_freq, \
+ .current_freq = &rcg_dummy_freq, \
.c = { \
.dbg_name = #i "_clk", \
- .ops = &soc_clk_ops_8x60, \
+ .ops = &clk_ops_rcg_8x60, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -3015,10 +3015,10 @@
.ns_mask = BM(14, 10), \
.set_rate = set_rate_nop, \
.freq_tbl = clk_tbl_aif_bit, \
- .current_freq = &local_dummy_freq, \
+ .current_freq = &rcg_dummy_freq, \
.c = { \
.dbg_name = #i "_clk", \
- .ops = &soc_clk_ops_8x60, \
+ .ops = &clk_ops_rcg_8x60, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -3088,10 +3088,10 @@
.ns_mask = (BM(31, 16) | BM(6, 0)),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_pcm,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "pcm_clk",
- .ops = &soc_clk_ops_8x60,
+ .ops = &clk_ops_rcg_8x60,
CLK_INIT(pcm_clk.c),
},
};