From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Mike Turquette <mturquette@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>
Cc: Olof Johansson <olof@lixom.net>,
albert.u.boot@aribaud.net, Emilio Lopez <emilio@elopez.com.ar>,
kevin.z.m.zh@gmail.com, sunny@allwinnertech.com,
shuge@allwinnertech.com, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH 02/10] clk: sunxi: fix initialization of basic clocks
Date: Wed, 24 Jul 2013 00:25:04 +0200 [thread overview]
Message-ID: <1374618312-19001-3-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1374618312-19001-1-git-send-email-maxime.ripard@free-electrons.com>
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>
---
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 412912b..fe1528e 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -409,12 +409,7 @@ 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,},
- {}
-};
+CLK_OF_DECLARE(sunxi_osc, "allwinner,sun4i-osc-clk", sunxi_osc_clk_setup);
/* Matches for factors clocks */
static const __initconst struct of_device_id clk_factors_match[] = {
@@ -467,8 +462,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.2
next prev parent reply other threads:[~2013-07-23 22:25 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 22:25 [PATCH 00/10] ARM: sunxi: Add support for the Allwinner A31 SoC Maxime Ripard
2013-07-23 22:25 ` [PATCH 01/10] irqchip: GIC: Add Cortex-A7 compatible string Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard [this message]
2013-07-23 22:25 ` [PATCH 03/10] ARM: sunxi: Add the Allwinner A31 compatible to the machine definition Maxime Ripard
2013-07-26 10:35 ` Thomas Petazzoni
2013-07-26 12:22 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 04/10] ARM: sun6i: Add restart code for the A31 Maxime Ripard
2013-07-26 10:35 ` Thomas Petazzoni
2013-07-26 12:23 ` Maxime Ripard
2013-07-29 14:04 ` Mark Rutland
2013-07-30 12:44 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 05/10] ARM: sunxi: Add Allwinner A31 DTSI Maxime Ripard
2013-07-26 10:37 ` Thomas Petazzoni
2013-07-26 12:48 ` Maxime Ripard
2013-07-29 14:11 ` Mark Rutland
2013-07-30 8:59 ` Marc Zyngier
2013-07-30 13:18 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 06/10] ARM: sun6i: Add WITS Colombus A31 evaluation kit support Maxime Ripard
2013-07-23 22:25 ` [PATCH 07/10] pinctrl: sunxi: Add Allwinner A31 pins set Maxime Ripard
2013-07-29 16:20 ` Linus Walleij
2013-07-30 9:00 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 08/10] ARM: sunxi: dt: Add PIO controller to A31 DTSI Maxime Ripard
2013-07-26 10:39 ` Thomas Petazzoni
2013-07-23 22:25 ` [PATCH 09/10] ARM: sun6i: Add UART0 muxing options Maxime Ripard
2013-07-23 22:25 ` [PATCH 10/10] ARM: sun6i: colombus: Add uart0 muxing Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374618312-19001-3-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=albert.u.boot@aribaud.net \
--cc=emilio@elopez.com.ar \
--cc=kevin.z.m.zh@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mturquette@linaro.org \
--cc=olof@lixom.net \
--cc=shuge@allwinnertech.com \
--cc=sunny@allwinnertech.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®