Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c4a9129 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Stephen Boyd
Browse files

clk/samsung: Use CLK_OF_DECLARE_DRIVER initialization method for CLKOUT 



The Exynos PMU node is an interrupt, clock and PMU (Power Management Unit)
controller, and these functionalities are supported by different drivers
that matches the same compatible strings.

Since commit 989eafd0 ("clk: core: Avoid double initialization of
clocks") the OF core flags clock controllers registered with the
CLK_OF_DECLARE() macro as OF_POPULATED, so platform devices with the same
compatible string will not be registered.

This prevents the PMU platform device to be created, so the Exynos PMU
driver is never probed. This breaks (among other things) Suspend-to-RAM.

Fix this by changing CLKOUT driver initialization method to
CLK_OF_DECLARE_DRIVER(), which doesn't clear the OF_POPULATED flag, so
later a platform device is created and the Exynos PMU platform driver
can be be probed properly.

Fixes: 989eafd0 ("clk: core: Avoid double initialization of clocks")
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 91bbc174

drivers/clk/samsung/clk-exynos-clkout.c

+14 −8
Original line number Diff line number Diff line
@@ -132,28 +132,34 @@ static void __init exynos_clkout_init(struct device_node *node, u32 mux_mask) 
	pr_err("%s: failed to register clkout clock\n", __func__);

}



/*

 * We use CLK_OF_DECLARE_DRIVER initialization method to avoid setting

 * the OF_POPULATED flag on the pmu device tree node, so later the

 * Exynos PMU platform device can be properly probed with PMU driver.

 */



static void __init exynos4_clkout_init(struct device_node *node)

{

	exynos_clkout_init(node, EXYNOS4_CLKOUT_MUX_MASK);

}

CLK_OF_DECLARE(exynos4210_clkout, "samsung,exynos4210-pmu",

CLK_OF_DECLARE_DRIVER(exynos4210_clkout, "samsung,exynos4210-pmu",

		exynos4_clkout_init);

CLK_OF_DECLARE(exynos4212_clkout, "samsung,exynos4212-pmu",

CLK_OF_DECLARE_DRIVER(exynos4212_clkout, "samsung,exynos4212-pmu",

		exynos4_clkout_init);

CLK_OF_DECLARE(exynos4412_clkout, "samsung,exynos4412-pmu",

CLK_OF_DECLARE_DRIVER(exynos4412_clkout, "samsung,exynos4412-pmu",

		exynos4_clkout_init);

CLK_OF_DECLARE(exynos3250_clkout, "samsung,exynos3250-pmu",

CLK_OF_DECLARE_DRIVER(exynos3250_clkout, "samsung,exynos3250-pmu",

		exynos4_clkout_init);



static void __init exynos5_clkout_init(struct device_node *node)

{

	exynos_clkout_init(node, EXYNOS5_CLKOUT_MUX_MASK);

}

CLK_OF_DECLARE(exynos5250_clkout, "samsung,exynos5250-pmu",

CLK_OF_DECLARE_DRIVER(exynos5250_clkout, "samsung,exynos5250-pmu",

		exynos5_clkout_init);

CLK_OF_DECLARE(exynos5410_clkout, "samsung,exynos5410-pmu",

CLK_OF_DECLARE_DRIVER(exynos5410_clkout, "samsung,exynos5410-pmu",

		exynos5_clkout_init);

CLK_OF_DECLARE(exynos5420_clkout, "samsung,exynos5420-pmu",

CLK_OF_DECLARE_DRIVER(exynos5420_clkout, "samsung,exynos5420-pmu",

		exynos5_clkout_init);

CLK_OF_DECLARE(exynos5433_clkout, "samsung,exynos5433-pmu",

CLK_OF_DECLARE_DRIVER(exynos5433_clkout, "samsung,exynos5433-pmu",

		exynos5_clkout_init);