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

Commit 431807f0 authored by Emilio López's avatar Emilio López Committed by Maxime Ripard
Browse files

clk: sunxi: fix initialization of basic clocks 



With the recent move towards CLK_OF_DECLARE(...), the driver stopped
initializing osc32k, which is compatible "fixed-clock". This is because
we never called of_clk_init(NULL). Fix this by moving the only other
simple clock (osc24M) to use CLK_OF_DECLARE(...) and call of_clk_init(NULL)
to initialize both of them.

Signed-off-by: default avatarEmilio López <emilio@elopez.com.ar>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Cc: Mike Turquette <mturquette@linaro.org>
parent 2371dd88

drivers/clk/sunxi/clk-sunxi.c

+3 −8
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static void __init sunxi_osc_clk_setup(struct device_node *node) 
		clk_register_clkdev(clk, clk_name, NULL);

	}

}

CLK_OF_DECLARE(sunxi_osc, "allwinner,sun4i-osc-clk", sunxi_osc_clk_setup);
@@ -423,12 +424,6 @@ static void __init sunxi_gates_clk_setup(struct device_node *node, 
	of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

}



/* Matches for of_clk_init */

static const __initconst struct of_device_id clk_match[] = {

	{.compatible = "allwinner,sun4i-osc-clk", .data = sunxi_osc_clk_setup,},

	{}

};



/* Matches for factors clocks */

static const __initconst struct of_device_id clk_factors_match[] = {

	{.compatible = "allwinner,sun4i-pll1-clk", .data = &pll1_data,},
@@ -483,8 +478,8 @@ static void __init of_sunxi_table_clock_setup(const struct of_device_id *clk_mat 


void __init sunxi_init_clocks(void)

{

	/* Register all the simple sunxi clocks on DT */

	of_clk_init(clk_match);

	/* Register all the simple and basic clocks on DT */

	of_clk_init(NULL);



	/* Register factor clocks */

	of_sunxi_table_clock_setup(clk_factors_match, sunxi_factors_clk_setup);