| Message ID | 1375609657-15434-3-git-send-email-maxime.ripard@free-electrons.com |
|---|---|
| State | New |
| Headers | show |
Hi Mike, On Sun, Aug 04, 2013 at 11:47:29AM +0200, Maxime Ripard wrote: > From: Emilio López <emilio@elopez.com.ar> > > 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. I'd like this patch to go in 3.12, and I need it to merge quite a few other patches. Could you either review or merge it? Thanks, Maxime
Quoting Maxime Ripard (2013-08-04 02:47:29) > From: Emilio López <emilio@elopez.com.ar> > > 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: Emilio López <emilio@elopez.com.ar> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > Cc: Mike Turquette <mturquette@linaro.org> Taken into clk-next. Regards, Mike > --- > drivers/clk/sunxi/clk-sunxi.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c > index db1c45b..567963f 100644 > --- a/drivers/clk/sunxi/clk-sunxi.c > +++ b/drivers/clk/sunxi/clk-sunxi.c > @@ -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); > > > > @@ -422,12 +423,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,}, > @@ -482,8 +477,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); > -- > 1.8.3.4
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index db1c45b..567963f 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -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); @@ -422,12 +423,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,}, @@ -482,8 +477,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);