Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

clk: renesas: mstp: Add genpd OF provider at postcore_initcall()

Genpd OF providers must now be registered after genpd bus registration.
However, cpg_mstp_add_clk_domain() is only called from CLK_OF_DECLARE(),
which is too early. Hence on R-Car M1A, R-Car H1, and RZ/A1, the
CPG/MSTP Clock Domain fails to register, and any devices residing in
that clock domain fail to probe.

Fix this by splitting initialization into two steps:
- The first part keeps on registering the PM domain with genpd at
CLK_OF_DECLARE(),
- The second and new part moves the registration of the genpd OF
provider to a postcore_initcall().

See also commit c5ae5a0c61120d0c ("pmdomain: renesas: rcar-sysc: Add
genpd OF provider at postcore_initcall").

Fixes: 18a3a510ecfd0e50 ("pmdomain: core: Add the genpd->dev to the genpd provider bus")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/81ef5f8d5d31374b7852b05453c52d2f735062a2.1755073087.git.geert+renesas@glider.be

+19 -1
+19 -1
drivers/clk/renesas/clk-mstp.c
··· 303 303 pm_clk_destroy(dev); 304 304 } 305 305 306 + static struct device_node *cpg_mstp_pd_np __initdata = NULL; 307 + static struct generic_pm_domain *cpg_mstp_pd_genpd __initdata = NULL; 308 + 306 309 void __init cpg_mstp_add_clk_domain(struct device_node *np) 307 310 { 308 311 struct generic_pm_domain *pd; ··· 327 324 pd->detach_dev = cpg_mstp_detach_dev; 328 325 pm_genpd_init(pd, &pm_domain_always_on_gov, false); 329 326 330 - of_genpd_add_provider_simple(np, pd); 327 + cpg_mstp_pd_np = of_node_get(np); 328 + cpg_mstp_pd_genpd = pd; 331 329 } 330 + 331 + static int __init cpg_mstp_pd_init_provider(void) 332 + { 333 + int error; 334 + 335 + if (!cpg_mstp_pd_np) 336 + return -ENODEV; 337 + 338 + error = of_genpd_add_provider_simple(cpg_mstp_pd_np, cpg_mstp_pd_genpd); 339 + 340 + of_node_put(cpg_mstp_pd_np); 341 + return error; 342 + } 343 + postcore_initcall(cpg_mstp_pd_init_provider);