Unverified Commit 6d8042ba authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'renesas-clk-fixes-for-v6.17-tag1' of... 

Merge tag 'renesas-clk-fixes-for-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-fixes

Pull a Renesas clk driver fix from Geert Uytterhoeven:

 - Fix a Clock Domain regression on R-Car M1A, R-Car H1, and RZ/A1

* tag 'renesas-clk-fixes-for-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
  clk: renesas: mstp: Add genpd OF provider at postcore_initcall()
parents 8f5ae30d f63aaf6e

drivers/clk/renesas/clk-mstp.c

+19 −1
Original line number Diff line number Diff line
@@ -303,6 +303,9 @@ void cpg_mstp_detach_dev(struct generic_pm_domain *unused, struct device *dev) 
		pm_clk_destroy(dev);

}



static struct device_node *cpg_mstp_pd_np __initdata = NULL;

static struct generic_pm_domain *cpg_mstp_pd_genpd __initdata = NULL;



void __init cpg_mstp_add_clk_domain(struct device_node *np)

{

	struct generic_pm_domain *pd;
@@ -324,5 +327,20 @@ void __init cpg_mstp_add_clk_domain(struct device_node *np) 
	pd->detach_dev = cpg_mstp_detach_dev;

	pm_genpd_init(pd, &pm_domain_always_on_gov, false);



	of_genpd_add_provider_simple(np, pd);

	cpg_mstp_pd_np = of_node_get(np);

	cpg_mstp_pd_genpd = pd;

}



static int __init cpg_mstp_pd_init_provider(void)

{

	int error;



	if (!cpg_mstp_pd_np)

		return -ENODEV;



	error = of_genpd_add_provider_simple(cpg_mstp_pd_np, cpg_mstp_pd_genpd);



	of_node_put(cpg_mstp_pd_np);

	return error;

}

postcore_initcall(cpg_mstp_pd_init_provider);