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

Commit 6f8a444a authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Michael Turquette
Browse files

clk: pxa: keep clocks initialization separated per variant 



Have each pxa variant (pxa25x, pxa27x, pxa3xx) have its own device-tree
clock initializing function, to be able to register its own specific
core clocks.

Apply that change specifically to pxa27x.

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarMichael Turquette <mturquette@linaro.org>
parent 14dd5b01

drivers/clk/pxa/clk-pxa.c

+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ int __init clk_pxa_cken_init(const struct desc_clk_cken *clks, int nb_clks) 
	return 0;

}



static void __init pxa_dt_clocks_init(struct device_node *np)

void __init clk_pxa_dt_common_init(struct device_node *np)

{

	of_clk_add_provider(np, of_clk_src_onecell_get, &onecell_data);

}
 
CLK_OF_DECLARE(pxa_clks, "marvell,pxa-clocks", pxa_dt_clocks_init);

drivers/clk/pxa/clk-pxa.h

+1 −0
Original line number Diff line number Diff line
@@ -103,5 +103,6 @@ static int dummy_clk_set_parent(struct clk_hw *hw, u8 index) 
extern void clkdev_pxa_register(int ckid, const char *con_id,

				const char *dev_id, struct clk *clk);

extern int clk_pxa_cken_init(const struct desc_clk_cken *clks, int nb_clks);

void clk_pxa_dt_common_init(struct device_node *np);



#endif

drivers/clk/pxa/clk-pxa27x.c

+7 −0
Original line number Diff line number Diff line
@@ -368,3 +368,10 @@ static int __init pxa27x_clocks_init(void) 
	return clk_pxa_cken_init(pxa27x_clocks, ARRAY_SIZE(pxa27x_clocks));

}

postcore_initcall(pxa27x_clocks_init);



static void __init pxa27x_dt_clocks_init(struct device_node *np)

{

	pxa27x_clocks_init();

	clk_pxa_dt_common_init(np);

}

CLK_OF_DECLARE(pxa_clks, "marvell,pxa270-clocks", pxa27x_dt_clocks_init);