From: Antoine Tenart <antoine.tenart@free-electrons.com>
To: sebastian.hesselbarth@gmail.com, mturquette@baylibre.com,
sboyd@codeaurora.org
Cc: Antoine Tenart <antoine.tenart@free-electrons.com>,
zmxu@marvell.com, jszhang@marvell.com,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 2/6] clk: berlin: add cpuclk
Date: Thu, 17 Sep 2015 12:15:01 +0200 [thread overview]
Message-ID: <1442484905-15656-3-git-send-email-antoine.tenart@free-electrons.com> (raw)
In-Reply-To: <1442484905-15656-1-git-send-email-antoine.tenart@free-electrons.com>
Add cpuclk in the Berlin BG2Q clock driver. This clk has a divider
fixed to 1.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clk/berlin/bg2q.c | 12 ++++++------
include/dt-bindings/clock/berlin2q.h | 3 ++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c
index a27958efab92..c2f48f3773e8 100644
--- a/drivers/clk/berlin/bg2q.c
+++ b/drivers/clk/berlin/bg2q.c
@@ -355,13 +355,13 @@ static void __init berlin2q_clock_setup(struct device_node *np)
gd->bit_idx, 0, &lock);
}
- /*
- * twdclk is derived from cpu/3
- * TODO: use cpupll until cpuclk is not available
- */
+ /* cpuclk divider is fixed to 1 */
+ clks[CLKID_CPU] =
+ clk_register_fixed_factor(NULL, "cpu", clk_names[CPUPLL],
+ 0, 1, 1);
+ /* twdclk is derived from cpu/3 */
clks[CLKID_TWD] =
- clk_register_fixed_factor(NULL, "twd", clk_names[CPUPLL],
- 0, 1, 3);
+ clk_register_fixed_factor(NULL, "twd", "cpu", 0, 1, 3);
/* check for errors on leaf clocks */
for (n = 0; n < MAX_CLKS; n++) {
diff --git a/include/dt-bindings/clock/berlin2q.h b/include/dt-bindings/clock/berlin2q.h
index c79af928ae92..771d8739f67a 100644
--- a/include/dt-bindings/clock/berlin2q.h
+++ b/include/dt-bindings/clock/berlin2q.h
@@ -29,5 +29,6 @@
#define CLKID_SMEMC 24
#define CLKID_PCIE 25
#define CLKID_TWD 26
+#define CLKID_CPU 27
-#define MAX_CLKS 27
+#define MAX_CLKS 28
--
2.5.2
next prev parent reply other threads:[~2015-09-17 10:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 10:14 [PATCH v3 0/6] ARM: berlin: add cpufreq support Antoine Tenart
2015-09-17 10:15 ` [PATCH v3 1/6] clk: berlin: move MAX_CLKS out of drivers/clk/berlin Antoine Tenart
2015-09-17 10:15 ` Antoine Tenart [this message]
2015-09-17 10:15 ` [PATCH v3 3/6] ARM: berlin: dts: add the cpufreq-dt bindings on the BG2Q Antoine Tenart
2015-09-17 10:15 ` [PATCH v3 4/6] ARM: berlin: dts: add the cpufreq-dt bindings on the BG2 Antoine Tenart
2015-09-17 10:15 ` [PATCH v3 5/6] ARM: berlin: dts: add the cpufreq-dt bindings on the BG2CD Antoine Tenart
2015-09-17 10:15 ` [PATCH v3 6/6] ARM: berlin: register cpufreq-dt Antoine Tenart
2015-09-20 18:23 ` [PATCH v3 0/6] ARM: berlin: add cpufreq support Sebastian Hesselbarth
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=1442484905-15656-3-git-send-email-antoine.tenart@free-electrons.com \
--to=antoine.tenart@free-electrons.com \
--cc=jszhang@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=zmxu@marvell.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).