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-8960.c b/arch/arm/mach-msm/clock-8960.c
index 60bd42d..a3f1d77 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -431,7 +431,7 @@
return branch_reset(&to_rcg_clk(clk)->b, action);
}
-static struct clk_ops soc_clk_ops_8960 = {
+static struct clk_ops clk_ops_rcg_8960 = {
.enable = rcg_clk_enable,
.disable = rcg_clk_disable,
.auto_off = rcg_clk_auto_off,
@@ -986,10 +986,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_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -1050,10 +1050,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_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -1120,10 +1120,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(pdm_clk.c),
},
};
@@ -1163,10 +1163,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(prng_clk.c),
},
};
@@ -1187,10 +1187,10 @@
.ns_mask = (BM(23, 16) | BM(6, 0)), \
.set_rate = set_rate_mnd, \
.freq_tbl = f_table, \
- .current_freq = &local_dummy_freq, \
+ .current_freq = &rcg_dummy_freq, \
.c = { \
.dbg_name = #name, \
- .ops = &soc_clk_ops_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(name.c), \
}, \
}
@@ -1281,10 +1281,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(tsif_ref_clk.c),
},
};
@@ -1313,10 +1313,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(tssc_clk.c),
},
};
@@ -1351,10 +1351,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(usb_hs1_xcvr_clk.c),
},
};
@@ -1383,10 +1383,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_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -1919,10 +1919,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 = #i "_clk", \
- .ops = &soc_clk_ops_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -1984,10 +1984,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_csi,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "csi0_src_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(csi0_src_clk.c),
},
};
@@ -2038,10 +2038,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd,
.freq_tbl = clk_tbl_csi,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "csi1_src_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(csi1_src_clk.c),
},
};
@@ -2116,10 +2116,10 @@
.ns_mask = BIT(25),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_csi_pix,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "csi_pix_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(csi_pix_clk.c),
},
};
@@ -2136,10 +2136,10 @@
.ns_mask = BIT(12),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_csi_rdi,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "csi_rdi_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(csi_rdi_clk.c),
},
};
@@ -2173,10 +2173,10 @@
.ctl_mask = BM(7, 6),
.set_rate = set_rate_mnd_8,
.freq_tbl = clk_tbl_csi_phytimer,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "csiphy_timer_src_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(csiphy_timer_src_clk.c),
},
};
@@ -2243,10 +2243,10 @@
.ns_mask = BM(15, 12),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_dsi_byte,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "dsi1_byte_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(dsi1_byte_clk.c),
},
};
@@ -2265,10 +2265,10 @@
.ns_mask = BM(15, 12),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_dsi_byte,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "dsi2_byte_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(dsi2_byte_clk.c),
},
};
@@ -2286,10 +2286,10 @@
.ns_mask = BM(15, 12),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_dsi_byte,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "dsi1_esc_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(dsi1_esc_clk.c),
},
};
@@ -2306,10 +2306,10 @@
.ns_mask = BM(15, 12),
.set_rate = set_rate_nop,
.freq_tbl = clk_tbl_dsi_byte,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "dsi2_esc_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(dsi2_esc_clk.c),
},
};
@@ -2373,10 +2373,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(gfx2d0_clk.c),
},
};
@@ -2413,10 +2413,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(gfx2d1_clk.c),
},
};
@@ -2482,10 +2482,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(gfx3d_clk.c),
.depends = &gmem_axi_clk.c,
},
@@ -2531,10 +2531,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(ijpeg_clk.c),
.depends = &ijpeg_axi_clk.c,
},
@@ -2571,10 +2571,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(jpegd_clk.c),
.depends = &jpegd_axi_clk.c,
},
@@ -2641,10 +2641,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(mdp_clk.c),
.depends = &mdp_axi_clk.c,
},
@@ -2690,10 +2690,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(mdp_vsync_clk.c),
},
};
@@ -2748,10 +2748,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(rot_clk.c),
.depends = &rot_axi_clk.c,
},
@@ -2849,10 +2849,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(tv_src_clk.c),
},
};
@@ -2993,10 +2993,10 @@
.set_rate = set_rate_mnd_banked,
.bank_masks = &bmnd_info_vcodec,
.freq_tbl = clk_tbl_vcodec,
- .current_freq = &local_dummy_freq,
+ .current_freq = &rcg_dummy_freq,
.c = {
.dbg_name = "vcodec_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(vcodec_clk.c),
.depends = &vcodec_axi_clk.c,
},
@@ -3036,10 +3036,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(vpe_clk.c),
.depends = &vpe_axi_clk.c,
},
@@ -3093,10 +3093,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(vfe_clk.c),
.depends = &vfe_axi_clk.c,
},
@@ -3163,10 +3163,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_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -3187,10 +3187,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_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -3221,10 +3221,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_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -3257,10 +3257,10 @@
.ns_mask = BM(18, 10), \
.set_rate = set_rate_nop, \
.freq_tbl = clk_tbl_aif_bit_div, \
- .current_freq = &local_dummy_freq, \
+ .current_freq = &rcg_dummy_freq, \
.c = { \
.dbg_name = #i "_clk", \
- .ops = &soc_clk_ops_8960, \
+ .ops = &clk_ops_rcg_8960, \
CLK_INIT(i##_clk.c), \
}, \
}
@@ -3330,10 +3330,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_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(pcm_clk.c),
},
};
@@ -3354,10 +3354,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 = "audio_slimbus_clk",
- .ops = &soc_clk_ops_8960,
+ .ops = &clk_ops_rcg_8960,
CLK_INIT(audio_slimbus_clk.c),
},
};