g12 clock controller used __clk_lookup() to get struct clk from a
struct clk_hw. This type of hack is no longer required as CCF now provides
the necessary functions to get this.
Signed-off-by: Jerome Brunet
---
drivers/clk/meson/g12a.c | 68 +++-
1 file changed, 32 insertions(+), 36 deletions(-)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index 28f976dbdd24..bbb75541dad9 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -5156,10 +5156,11 @@ static const struct reg_sequence g12a_init_regs[] = {
{ .reg = HHI_MPLL_CNTL0,.def = 0x0543 },
};
-static int meson_g12a_dvfs_setup_common(struct platform_device *pdev,
+#define DVFS_CON_ID "dvfs"
+
+static int meson_g12a_dvfs_setup_common(struct device *dev,
struct clk_hw **hws)
{
- const char *notifier_clk_name;
struct clk *notifier_clk;
struct clk_hw *xtal;
int ret;
@@ -5168,21 +5169,21 @@ static int meson_g12a_dvfs_setup_common(struct
platform_device *pdev,
/* Setup clock notifier for cpu_clk_postmux0 */
g12a_cpu_clk_postmux0_nb_data.xtal = xtal;
- notifier_clk_name = clk_hw_get_name(_cpu_clk_postmux0.hw);
- notifier_clk = __clk_lookup(notifier_clk_name);
+ notifier_clk = devm_clk_hw_get_clk(dev, _cpu_clk_postmux0.hw,
+ DVFS_CON_ID);
ret = clk_notifier_register(notifier_clk,
_cpu_clk_postmux0_nb_data.nb);
if (ret) {
- dev_err(>dev, "failed to register the cpu_clk_postmux0
notifier\n");
+ dev_err(dev, "failed to register the cpu_clk_postmux0
notifier\n");
return ret;
}
/* Setup clock notifier for cpu_clk_dyn mux */
- notifier_clk_name = clk_hw_get_name(_cpu_clk_dyn.hw);
- notifier_clk = __clk_lookup(notifier_clk_name);
+ notifier_clk = devm_clk_hw_get_clk(dev, _cpu_clk_dyn.hw,
+ DVFS_CON_ID);
ret = clk_notifier_register(notifier_clk, _cpu_clk_mux_nb);
if (ret) {
- dev_err(>dev, "failed to register the cpu_clk_dyn
notifier\n");
+ dev_err(dev, "failed to register the cpu_clk_dyn notifier\n");
return ret;
}
@@ -5192,33 +5193,33 @@ static int meson_g12a_dvfs_setup_common(struct
platform_device *pdev,
static int meson_g12b_dvfs_setup(struct platform_device *pdev)
{
struct clk_hw **hws = g12b_hw_onecell_data.hws;
- const char *notifier_clk_name;
+ struct device *dev = >dev;
struct clk *notifier_clk;
struct clk_hw *xtal;
int ret;
- ret = meson_g12a_dvfs_setup_common(pdev, hws);
+ ret = meson_g12a_dvfs_setup_common(dev, hws);
if (ret)
return ret;
xtal = clk_hw_get_parent_by_index(hws[CLKID_CPU_CLK_DYN1_SEL], 0);
/* Setup clock notifier for cpu_clk mux */
- notifier_clk_name = clk_hw_get_name(_cpu_clk.hw);
- notifier_clk = __clk_lookup(notifier_clk_name);
+ notifier_clk = devm_clk_hw_get_clk(dev, _cpu_clk.hw,
+ DVFS_CON_ID);
ret = clk_notifier_register(notifier_clk, _cpu_clk_mux_nb);
if (ret) {
- dev_err(>dev, "failed to register the cpu_clk
notifier\n");
+ dev_err(dev, "failed to register the cpu_clk notifier\n");
return ret;
}
/* Setup clock notifier for sys1_pll */
- notifier_clk_name = clk_hw_get_name(_sys1_pll.hw);
- notifier_clk = __clk_lookup(notifier_clk_name);
+ notifier_clk = devm_clk_hw_get_clk(dev, _sys1_pll.hw,
+ DVFS_CON_ID);
ret = clk_notifier_register(notifier_clk,
_cpu_clk_sys1_pll_nb_data.nb);
if (ret) {
- dev_err(>dev, "failed to register the sys1_pll
notifier\n");
+ dev_err(dev, "failed to register the sys1_pll notifier\n");
return ret;
}
@@ -5226,40 +5227,37 @@ static int meson_g12b_dvfs_setup(struct platform_device
*pdev)
/* Setup clock notifier for cpub_clk_postmux0 */
g12b_cpub_clk_postmux0_nb_data.xtal = xtal;
- notifier_clk_name = clk_hw_get_name(_cpub_clk_postmux0.hw);
- notifier_clk = __clk_lookup(notifier_clk_name);
+ notifier_clk = devm_clk_hw_get_clk(dev, _cpub_clk_postmux0.hw,
+ DVFS_CON_ID);
ret = clk_notifier_register(notifier_clk,
_cpub_clk_postmux0_nb_data.nb);
if (ret) {
- dev_err(>dev, "failed to register the cpub_clk_postmux0
notifier\n");
+ dev_err(dev, "failed to register the cpub_clk_postmux0
notifier\n");
return ret;
}
/* Setup clock notifier for
