From: Chen-Yu Tsai <wens@csie.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Rob Herring <robh+dt@kernel.org>,
Mike Turquette <mturquette@linaro.org>,
Emilio Lopez <emilio@elopez.com.ar>,
Linus Walleij <linus.walleij@linaro.org>
Cc: Chen-Yu Tsai <wens@csie.org>,
linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@googlegroups.com, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Boris BREZILLON <boris.brezillon@free-electrons.com>,
Luc Verhaegen <libv@skynet.be>
Subject: [PATCH v2 03/20] clk: sunxi: move "ahb_sdram" to protected clock list
Date: Tue, 17 Jun 2014 22:52:40 +0800 [thread overview]
Message-ID: <1403016777-15121-4-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1403016777-15121-1-git-send-email-wens@csie.org>
With sunxi_gates clocks registered with clkdev, we can use the
protected clocks list to enable the "ahb_sdram" clock, instead
of looking for it and adding CLK_IGNORE_UNUSED inline in the
clock setup code.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
drivers/clk/sunxi/clk-sunxi.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index e43ed6a..a38c799 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -870,7 +870,6 @@ static void __init sunxi_gates_clk_setup(struct device_node *node,
int qty;
int i = 0;
int j = 0;
- int ignore;
reg = of_iomap(node, 0);
@@ -891,11 +890,8 @@ static void __init sunxi_gates_clk_setup(struct device_node *node,
of_property_read_string_index(node, "clock-output-names",
j, &clk_name);
- /* No driver claims this clock, but it should remain gated */
- ignore = !strcmp("ahb_sdram", clk_name) ? CLK_IGNORE_UNUSED : 0;
-
clk_data->clks[i] = clk_register_gate(NULL, clk_name,
- clk_parent, ignore,
+ clk_parent, 0,
reg + 4 * (i/32), i % 32,
0, &clk_lock);
WARN_ON(IS_ERR(clk_data->clks[i]));
@@ -1203,6 +1199,7 @@ static void __init sunxi_init_clocks(const char *clocks[], int nclocks)
static const char *sun4i_a10_critical_clocks[] __initdata = {
"pll5_ddr",
+ "ahb_sdram",
};
static void __init sun4i_a10_init_clocks(struct device_node *node)
@@ -1215,6 +1212,7 @@ CLK_OF_DECLARE(sun4i_a10_clk_init, "allwinner,sun4i-a10", sun4i_a10_init_clocks)
static const char *sun5i_critical_clocks[] __initdata = {
"mbus",
"pll5_ddr",
+ "ahb_sdram",
};
static void __init sun5i_init_clocks(struct device_node *node)
--
2.0.0
next prev parent reply other threads:[~2014-06-17 14:54 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 14:52 [PATCH v2 00/20] ARM: sunxi: Introduce Allwinner A23 (sun8i) support Chen-Yu Tsai
2014-06-17 14:52 ` [PATCH v2 01/20] serial: 8250_dw: Add optional reset control support Chen-Yu Tsai
2014-06-18 9:08 ` Maxime Ripard
2014-06-17 14:52 ` [PATCH v2 02/20] clk: sunxi: register clock gates with clkdev Chen-Yu Tsai
2014-06-17 14:52 ` Chen-Yu Tsai [this message]
2014-06-18 9:10 ` [PATCH v2 03/20] clk: sunxi: move "ahb_sdram" to protected clock list Maxime Ripard
2014-06-17 14:52 ` [PATCH v2 04/20] clk: sunxi: Fix gate indexing for sun6i-a31-apb0-gates Chen-Yu Tsai
2014-06-18 9:38 ` Maxime Ripard
2014-06-17 14:52 ` [PATCH v2 05/20] clk: sunxi: Support factor clocks with N multiplier factor starting from 1 Chen-Yu Tsai
2014-06-17 21:23 ` Rob Herring
2014-06-18 9:42 ` Maxime Ripard
2014-06-17 14:52 ` [PATCH v2 06/20] clk: sunxi: Fix rate_recalc for sun6i PLL1 Chen-Yu Tsai
2014-06-17 14:52 ` [PATCH v2 07/20] clk: sunxi: Fix PLL6 calculation on sun6i Chen-Yu Tsai
2014-06-17 14:52 ` [PATCH v2 08/20] ARM: sun6i: DT: Rename PLL6 to PLL6x2 and add fixed-factor-clock for PLL6 Chen-Yu Tsai
2014-06-18 9:57 ` Maxime Ripard
2014-06-17 14:52 ` [PATCH v2 09/20] clk: sunxi: Add sun6i MBUS clock support Chen-Yu Tsai
2014-06-18 10:04 ` Maxime Ripard
2014-06-23 4:44 ` Chen-Yu Tsai
2014-06-17 14:52 ` [PATCH v2 10/20] clk: sunxi: Add support for table-based divider clocks Chen-Yu Tsai
2014-06-18 10:06 ` Maxime Ripard
2014-06-17 14:52 ` [PATCH v2 11/20] clk: sunxi: Add A23 clocks support Chen-Yu Tsai
2014-06-18 10:16 ` Maxime Ripard
2014-06-19 4:07 ` Chen-Yu Tsai
2014-06-17 14:52 ` [PATCH v2 12/20] clk: sunxi: Add A23 APB0 support to sun6i-a31-apb0-clk Chen-Yu Tsai
2014-06-18 10:26 ` Maxime Ripard
2014-06-19 4:33 ` Chen-Yu Tsai
2014-06-19 9:28 ` Maxime Ripard
2014-06-20 6:13 ` [linux-sunxi] " Chen-Yu Tsai
2014-06-25 16:41 ` maxime.ripard
2014-06-17 14:52 ` [PATCH v2 13/20] clk: sunxi: Add A23 specific compatible to sun6i-a31-apb0-gates-clk Chen-Yu Tsai
2014-06-18 10:17 ` Maxime Ripard
2014-06-17 14:52 ` [PATCH v2 14/20] pinctrl: sunxi: Add A23 PIO controller support Chen-Yu Tsai
2014-07-07 13:00 ` Linus Walleij
2014-06-17 14:52 ` [PATCH v2 15/20] pinctrl: sunxi: Add A23 R_PIO " Chen-Yu Tsai
2014-07-07 13:17 ` Linus Walleij
2014-06-17 14:52 ` [PATCH v2 16/20] mfd: sun6i-prcm: Add support for Allwinner A23 PRCM Chen-Yu Tsai
2014-06-18 8:29 ` Lee Jones
2014-06-18 12:24 ` Maxime Ripard
2014-06-20 7:38 ` Chen-Yu Tsai
2014-06-17 14:52 ` [PATCH v2 17/20] ARM: sunxi: Introduce Allwinner A23 support Chen-Yu Tsai
2014-06-18 12:26 ` Maxime Ripard
2014-06-20 5:56 ` [linux-sunxi] " Chen-Yu Tsai
2014-06-20 5:59 ` Fwd: " Chen-Yu Tsai
2014-06-17 14:52 ` [PATCH v2 18/20] ARM: sunxi: Add earlyprintk support using R_UART (sun6i/sun8i) Chen-Yu Tsai
2014-06-18 12:29 ` Maxime Ripard
2014-06-17 14:52 ` [PATCH v2 19/20] ARM: sunxi: Add Allwinner A23 dtsi Chen-Yu Tsai
2014-06-17 14:52 ` [PATCH v2 20/20] ARM: sun8i: dt: Add Ippo-q8h v5 support Chen-Yu Tsai
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=1403016777-15121-4-git-send-email-wens@csie.org \
--to=wens@csie.org \
--cc=boris.brezillon@free-electrons.com \
--cc=devicetree@vger.kernel.org \
--cc=emilio@elopez.com.ar \
--cc=gregkh@linuxfoundation.org \
--cc=lee.jones@linaro.org \
--cc=libv@skynet.be \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@linaro.org \
--cc=robh+dt@kernel.org \
--cc=sameo@linux.intel.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).