Commit 8e677e7f authored by Jerome Brunet's avatar Jerome Brunet Committed by Stephen Boyd
Browse files

clk: meson: g12: drop use of __clk_lookup() 



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: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20201021162147.563655-4-jbrunet@baylibre.com


Tested-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 30d6f8c1

drivers/clk/meson/g12a.c

+32 −36
Original line number Diff line number Diff line
@@ -5156,10 +5156,11 @@ static const struct reg_sequence g12a_init_regs[] = { 
	{ .reg = HHI_MPLL_CNTL0,	.def = 0x00000543 },

};



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(&g12a_cpu_clk_postmux0.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12a_cpu_clk_postmux0.hw,

					   DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk,

				    &g12a_cpu_clk_postmux0_nb_data.nb);

	if (ret) {

		dev_err(&pdev->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(&g12a_cpu_clk_dyn.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12a_cpu_clk_dyn.hw,

					   DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk, &g12a_cpu_clk_mux_nb);

	if (ret) {

		dev_err(&pdev->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 = &pdev->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(&g12b_cpu_clk.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12b_cpu_clk.hw,

					   DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk, &g12a_cpu_clk_mux_nb);

	if (ret) {

		dev_err(&pdev->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(&g12b_sys1_pll.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12b_sys1_pll.hw,

					   DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk,

				    &g12b_cpu_clk_sys1_pll_nb_data.nb);

	if (ret) {

		dev_err(&pdev->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(&g12b_cpub_clk_postmux0.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12b_cpub_clk_postmux0.hw,

					   DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk,

				    &g12b_cpub_clk_postmux0_nb_data.nb);

	if (ret) {

		dev_err(&pdev->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 cpub_clk_dyn mux */

	notifier_clk_name = clk_hw_get_name(&g12b_cpub_clk_dyn.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12b_cpub_clk_dyn.hw, "dvfs");

	ret = clk_notifier_register(notifier_clk, &g12a_cpu_clk_mux_nb);

	if (ret) {

		dev_err(&pdev->dev, "failed to register the cpub_clk_dyn notifier\n");

		dev_err(dev, "failed to register the cpub_clk_dyn notifier\n");

		return ret;

	}



	/* Setup clock notifier for cpub_clk mux */

	notifier_clk_name = clk_hw_get_name(&g12b_cpub_clk.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12b_cpub_clk.hw, DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk, &g12a_cpu_clk_mux_nb);

	if (ret) {

		dev_err(&pdev->dev, "failed to register the cpub_clk notifier\n");

		dev_err(dev, "failed to register the cpub_clk notifier\n");

		return ret;

	}



	/* Setup clock notifier for sys_pll */

	notifier_clk_name = clk_hw_get_name(&g12a_sys_pll.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12a_sys_pll.hw, DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk,

				    &g12b_cpub_clk_sys_pll_nb_data.nb);

	if (ret) {

		dev_err(&pdev->dev, "failed to register the sys_pll notifier\n");

		dev_err(dev, "failed to register the sys_pll notifier\n");

		return ret;

	}
@@ -5269,29 +5267,27 @@ static int meson_g12b_dvfs_setup(struct platform_device *pdev) 
static int meson_g12a_dvfs_setup(struct platform_device *pdev)

{

	struct clk_hw **hws = g12a_hw_onecell_data.hws;

	const char *notifier_clk_name;

	struct device *dev = &pdev->dev;

	struct clk *notifier_clk;

	int ret;



	ret = meson_g12a_dvfs_setup_common(pdev, hws);

	ret = meson_g12a_dvfs_setup_common(dev, hws);

	if (ret)

		return ret;



	/* Setup clock notifier for cpu_clk mux */

	notifier_clk_name = clk_hw_get_name(&g12a_cpu_clk.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12a_cpu_clk.hw, DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk, &g12a_cpu_clk_mux_nb);

	if (ret) {

		dev_err(&pdev->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 sys_pll */

	notifier_clk_name = clk_hw_get_name(&g12a_sys_pll.hw);

	notifier_clk = __clk_lookup(notifier_clk_name);

	notifier_clk = devm_clk_hw_get_clk(dev, &g12a_sys_pll.hw, DVFS_CON_ID);

	ret = clk_notifier_register(notifier_clk, &g12a_sys_pll_nb_data.nb);

	if (ret) {

		dev_err(&pdev->dev, "failed to register the sys_pll notifier\n");

		dev_err(dev, "failed to register the sys_pll notifier\n");

		return ret;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE