From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Emilio Lopez <emilio@elopez.com.ar>,
Dan Williams <dan.j.williams@intel.com>,
Vinod Koul <vinod.koul@intel.com>
Cc: Mike Turquette <mturquette@linaro.org>,
linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-sunxi@googlegroups.com, kevin.z.m.zh@gmail.com,
sunny@allwinnertech.com, shuge@allwinnertech.com,
zhuzhenhua@allwinnertech.com, andriy.shevchenko@intel.com,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH v5 3/7] ARM: sunxi: Move the clock protection to machine hooks
Date: Thu, 13 Mar 2014 16:14:15 +0100 [thread overview]
Message-ID: <1394723659-4995-4-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1394723659-4995-1-git-send-email-maxime.ripard@free-electrons.com>
Since we start to have a lot of clocks to protect, some of them in a few boards
only, it becomes difficult to handle the clock protection without having to add
per machine exceptions.
Move these where they belong, in the machine definition code.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/mach-sunxi/sun4i.c | 9 +++++++++
arch/arm/mach-sunxi/sun5i.c | 14 ++++++++++++++
arch/arm/mach-sunxi/sun7i.c | 14 ++++++++++++++
drivers/clk/sunxi/clk-sunxi.c | 24 ------------------------
4 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/arch/arm/mach-sunxi/sun4i.c b/arch/arm/mach-sunxi/sun4i.c
index fc28b89b3378..3276e63587fb 100644
--- a/arch/arm/mach-sunxi/sun4i.c
+++ b/arch/arm/mach-sunxi/sun4i.c
@@ -10,6 +10,7 @@
* warranty of any kind, whether express or implied.
*/
+#include <linux/clk.h>
#include <linux/init.h>
#include <linux/of_platform.h>
@@ -19,9 +20,17 @@
static void __init sun4i_dt_init(void)
{
+ struct clk *clk;
+
sunxi_setup_restart();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+
+ /* Make sure the clocks we absolutely need are enabled */
+ /* DDR clock */
+ clk = clk_get(NULL, "pll5_ddr");
+ if (!IS_ERR(clk))
+ clk_prepare_enable(clk);
}
static const char * const sun4i_board_dt_compat[] = {
diff --git a/arch/arm/mach-sunxi/sun5i.c b/arch/arm/mach-sunxi/sun5i.c
index 623a95ad93b7..990dcfd42681 100644
--- a/arch/arm/mach-sunxi/sun5i.c
+++ b/arch/arm/mach-sunxi/sun5i.c
@@ -10,6 +10,7 @@
* warranty of any kind, whether express or implied.
*/
+#include <linux/clk.h>
#include <linux/init.h>
#include <linux/of_platform.h>
@@ -19,9 +20,22 @@
static void __init sun5i_dt_init(void)
{
+ struct clk *clk;
+
sunxi_setup_restart();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+
+ /* Make sure the clocks we absolutely need are enabled */
+ /* Memory bus clock */
+ clk = clk_get(NULL, "mbus");
+ if (!IS_ERR(clk))
+ clk_prepare_enable(clk);
+
+ /* DDR clock */
+ clk = clk_get(NULL, "pll5_ddr");
+ if (!IS_ERR(clk))
+ clk_prepare_enable(clk);
}
static const char * const sun5i_board_dt_compat[] = {
diff --git a/arch/arm/mach-sunxi/sun7i.c b/arch/arm/mach-sunxi/sun7i.c
index 2e6a8ee1966b..48a090b91a90 100644
--- a/arch/arm/mach-sunxi/sun7i.c
+++ b/arch/arm/mach-sunxi/sun7i.c
@@ -10,6 +10,7 @@
* warranty of any kind, whether express or implied.
*/
+#include <linux/clk.h>
#include <linux/init.h>
#include <linux/of_platform.h>
@@ -19,9 +20,22 @@
static void __init sun7i_dt_init(void)
{
+ struct clk *clk;
+
sunxi_setup_restart();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+
+ /* Make sure the clocks we absolutely need are enabled */
+ /* Memory bus clock */
+ clk = clk_get(NULL, "mbus");
+ if (!IS_ERR(clk))
+ clk_prepare_enable(clk);
+
+ /* DDR clock */
+ clk = clk_get(NULL, "pll5_ddr");
+ if (!IS_ERR(clk))
+ clk_prepare_enable(clk);
}
static const char * const sun7i_board_dt_compat[] = {
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 7119c02c9fa8..27290a0d2624 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -1278,27 +1278,6 @@ static void __init of_sunxi_table_clock_setup(const struct of_device_id *clk_mat
}
}
-/**
- * System clock protection
- *
- * By enabling these critical clocks, we prevent their accidental gating
- * by the framework
- */
-static void __init sunxi_clock_protect(void)
-{
- struct clk *clk;
-
- /* memory bus clock - sun5i+ */
- clk = clk_get(NULL, "mbus");
- if (!IS_ERR(clk))
- clk_prepare_enable(clk);
-
- /* DDR clock - sun4i+ */
- clk = clk_get(NULL, "pll5_ddr");
- if (!IS_ERR(clk))
- clk_prepare_enable(clk);
-}
-
static void __init sunxi_init_clocks(void)
{
/* Register factor clocks */
@@ -1315,9 +1294,6 @@ static void __init sunxi_init_clocks(void)
/* Register gate clocks */
of_sunxi_table_clock_setup(clk_gates_match, sunxi_gates_clk_setup);
-
- /* Enable core system clocks */
- sunxi_clock_protect();
}
CLK_OF_DECLARE(sun4i_a10_clk_init, "allwinner,sun4i-a10", sunxi_init_clocks);
CLK_OF_DECLARE(sun5i_a10s_clk_init, "allwinner,sun5i-a10s", sunxi_init_clocks);
--
1.9.0
next prev parent reply other threads:[~2014-03-13 15:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-13 15:14 [PATCH v5 0/7] Add support for the Allwinner A31 DMA Controller Maxime Ripard
2014-03-13 15:14 ` [PATCH v5 1/7] clk: sunxi: Remove calls to clk_put Maxime Ripard
2014-03-24 21:51 ` Mike Turquette
2014-03-25 7:50 ` Maxime Ripard
2014-03-13 15:14 ` [PATCH v5 2/7] ARM: sunxi: Split out the various machines into separate files Maxime Ripard
2014-03-13 15:14 ` Maxime Ripard [this message]
2014-03-13 15:14 ` [PATCH v5 4/7] ARM: sun6i: Protect CPU clock Maxime Ripard
2014-03-13 15:14 ` [PATCH v5 5/7] ARM: sun6i: Protect SDRAM gating bit Maxime Ripard
2014-03-13 15:14 ` [PATCH v5 6/7] DMA: sun6i: Add driver for the Allwinner A31 DMA controller Maxime Ripard
2014-03-21 16:51 ` Arnd Bergmann
2014-03-13 15:14 ` [PATCH v5 7/7] ARM: sun6i: dt: Add A31 DMA controller to DTSI Maxime Ripard
2014-04-23 12:35 ` Arnd Bergmann
2014-04-23 13:10 ` Maxime Ripard
2014-03-28 15:26 ` [PATCH v5 0/7] Add support for the Allwinner A31 DMA Controller Maxime Ripard
2014-04-08 8:28 ` 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=1394723659-4995-4-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=andriy.shevchenko@intel.com \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=emilio@elopez.com.ar \
--cc=kevin.z.m.zh@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mturquette@linaro.org \
--cc=shuge@allwinnertech.com \
--cc=sunny@allwinnertech.com \
--cc=vinod.koul@intel.com \
--cc=zhuzhenhua@allwinnertech.com \
/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;
as well as URLs for NNTP newsgroup(s).