From: Vishnu Patekar <vishnupatekar0510@gmail.com>
To: robh+dt@kernel.org, corbet@lwn.net, pawel.moll@arm.com,
mark.rutland@arm.com, ijc+devicetree@hellion.org.uk,
galak@codeaurora.org, maxime.ripard@free-electrons.com,
linux@arm.linux.org.uk, emilio@elopez.com.ar
Cc: jenskuske@gmail.com, hdegoede@redhat.com, wens@csie.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
linux-gpio@vger.kernel.org, linus.walleij@linaro.org,
mturquette@baylibre.com, sboyd@codeaurora.org,
patchesrdh@mveas.com, linux-clk@vger.kernel.org
Subject: [PATCH 04/14] clk: sunxi: add ahb1 clock for A83T
Date: Sun, 31 Jan 2016 09:20:56 +0800 [thread overview]
Message-ID: <1454203266-4450-5-git-send-email-vishnupatekar0510@gmail.com> (raw)
In-Reply-To: <1454203266-4450-1-git-send-email-vishnupatekar0510@gmail.com>
AHB1 on A83T is similar to ahb1 on A31, except parents are different.
clock index 0b1x is PLL6.
Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
---
Documentation/devicetree/bindings/clock/sunxi.txt | 1 +
drivers/clk/sunxi/clk-sunxi.c | 75 +++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt
index 4514d77..bfd82f1 100644
--- a/Documentation/devicetree/bindings/clock/sunxi.txt
+++ b/Documentation/devicetree/bindings/clock/sunxi.txt
@@ -29,6 +29,7 @@ Required properties:
"allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31
"allwinner,sun9i-a80-cpus-clk" - for the CPUS on A80
"allwinner,sun6i-a31-ahb1-clk" - for the AHB1 clock on A31
+ "allwinner,sun8i-a83t-ahb1-clk" - for the AHB1 clock on A83T
"allwinner,sun8i-h3-ahb2-clk" - for the AHB2 clock on H3
"allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31
"allwinner,sun8i-a23-ahb1-gates-clk" - for the AHB1 gates on A23
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index e460a6b..02bbdf6 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -344,6 +344,67 @@ static void sun6i_ahb1_recalc(struct factors_request *req)
req->rate >>= req->p;
}
+
+#define SUN8I_A83T_AHB1_PARENT_PLL6 2
+/**
+ * sun8i_a83t_get_ahb_factors() - calculates m, p factors for AHB
+ * AHB rate is calculated as follows
+ * rate = parent_rate >> p
+ *
+ * if parent is pll6, then
+ * parent_rate = pll6 rate / (m + 1)
+ */
+
+static void sun8i_a83t_get_ahb1_factors(struct factors_request *req)
+{
+ u8 div, calcp, calcm = 1;
+
+ /*
+ * clock can only divide, so we will never be able to achieve
+ * frequencies higher than the parent frequency
+ */
+ if (req->parent_rate && req->rate > req->parent_rate)
+ req->rate = req->parent_rate;
+
+ div = DIV_ROUND_UP(req->parent_rate, req->rate);
+
+ /* calculate pre-divider if parent is pll6 */
+ if (req->parent_index >= SUN8I_A83T_AHB1_PARENT_PLL6) {
+ if (div < 4)
+ calcp = 0;
+ else if (div / 2 < 4)
+ calcp = 1;
+ else if (div / 4 < 4)
+ calcp = 2;
+ else
+ calcp = 3;
+
+ calcm = DIV_ROUND_UP(div, 1 << calcp);
+ } else {
+ calcp = __roundup_pow_of_two(div);
+ calcp = calcp > 3 ? 3 : calcp;
+ }
+
+ req->rate = (req->parent_rate / calcm) >> calcp;
+ req->p = calcp;
+ req->m = calcm - 1;
+}
+
+/**
+ * sun8i_a83t_ahb1_recalc() - calculates AHB clock rate from m, p factors and
+ * parent index
+ */
+static void sun8i_a83t_ahb1_recalc(struct factors_request *req)
+{
+ req->rate = req->parent_rate;
+
+ /* apply pre-divider first if parent is pll6 */
+ if (req->parent_index >= SUN6I_AHB1_PARENT_PLL6)
+ req->rate /= req->m + 1;
+
+ /* clk divider */
+ req->rate >>= req->p;
+}
/**
* sun4i_get_apb1_factors() - calculates m, p factors for APB1
* APB1 rate is calculated as follows
@@ -555,6 +616,14 @@ static const struct factors_data sun6i_ahb1_data __initconst = {
.recalc = sun6i_ahb1_recalc,
};
+static const struct factors_data sun8i_a83t_ahb1_data __initconst = {
+ .mux = 12,
+ .muxmask = BIT(1) | BIT(0),
+ .table = &sun6i_ahb1_config,
+ .getter = sun8i_a83t_get_ahb1_factors,
+ .recalc = sun8i_a83t_ahb1_recalc,
+};
+
static const struct factors_data sun4i_apb1_data __initconst = {
.mux = 24,
.muxmask = BIT(1) | BIT(0),
@@ -592,6 +661,12 @@ static void __init sun6i_ahb1_clk_setup(struct device_node *node)
CLK_OF_DECLARE(sun6i_a31_ahb1, "allwinner,sun6i-a31-ahb1-clk",
sun6i_ahb1_clk_setup);
+static void __init sun8i_a83t_ahb1_clk_setup(struct device_node *node)
+{
+ sunxi_factors_clk_setup(node, &sun8i_a83t_ahb1_data);
+}
+CLK_OF_DECLARE(sun8i_a83t_ahb1, "allwinner,sun8i-a83t-ahb1-clk",
+ sun8i_a83t_ahb1_clk_setup);
/**
* sunxi_mux_clk_setup() - Setup function for muxes
--
1.9.1
next prev parent reply other threads:[~2016-01-31 1:21 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-31 1:20 [PATCH 00/14] Add A83T clk, r_pio, mmc rsb support Vishnu Patekar
2016-01-31 1:20 ` [PATCH 01/14] pinctrl: sunxi: Add A83T R_PIO controller support Vishnu Patekar
2016-01-31 3:28 ` Chen-Yu Tsai
2016-02-01 15:00 ` Rob Herring
2016-02-11 11:59 ` Linus Walleij
2016-02-11 12:36 ` Maxime Ripard
2016-02-11 13:47 ` Linus Walleij
2016-02-11 15:12 ` Maxime Ripard
2016-02-15 23:23 ` Linus Walleij
2016-02-25 0:56 ` Maxime Ripard
2016-02-25 14:49 ` Linus Walleij
2016-01-31 1:20 ` [PATCH 02/14] clk: sunxi: Add apb0 gates for A83T Vishnu Patekar
2016-02-01 15:02 ` Rob Herring
2016-02-01 15:11 ` Chen-Yu Tsai
2016-02-02 13:12 ` Maxime Ripard
2016-01-31 1:20 ` [PATCH 03/14] clk: sunxi: add bus " Vishnu Patekar
2016-02-01 15:03 ` Rob Herring
2016-02-01 15:13 ` Chen-Yu Tsai
2016-02-02 13:13 ` Maxime Ripard
2016-01-31 1:20 ` Vishnu Patekar [this message]
2016-02-01 14:49 ` [PATCH 04/14] clk: sunxi: add ahb1 clock " Rob Herring
2016-02-01 14:54 ` Chen-Yu Tsai
2016-02-02 13:17 ` Maxime Ripard
2016-02-04 6:06 ` Vishnu Patekar
2016-02-04 8:01 ` Maxime Ripard
2016-02-12 5:24 ` Vishnu Patekar
2016-01-31 1:20 ` [PATCH 05/14] clk: sunxi: Add APB1 " Vishnu Patekar
2016-01-31 3:33 ` Chen-Yu Tsai
2016-02-01 14:50 ` Rob Herring
2016-01-31 1:20 ` [PATCH 06/14] ARM: dts: sun8i-a83t: Correct low speed oscillator clocks Vishnu Patekar
2016-02-02 13:18 ` Maxime Ripard
2016-02-02 13:19 ` Maxime Ripard
2016-02-04 8:51 ` Vishnu Patekar
2016-02-04 12:04 ` Maxime Ripard
2016-01-31 1:20 ` [PATCH 07/14] ARM: dts: sun8i-a83t: Add basic clocks and resets Vishnu Patekar
2016-01-31 6:06 ` Chen-Yu Tsai
2016-01-31 1:21 ` [PATCH 08/14] ARM: dts: sun8i-a83t: add mmc clock nodes Vishnu Patekar
2016-01-31 6:10 ` Chen-Yu Tsai
2016-01-31 1:21 ` [PATCH 09/14] ARM: dts: sun8i-a83t: Add mmc controller nodes Vishnu Patekar
2016-02-02 6:35 ` Chen-Yu Tsai
2016-01-31 1:21 ` [PATCH 10/14] ARM: dts: sun8i-a83t: Add PRCM related clocks and resets Vishnu Patekar
2016-02-02 6:44 ` Chen-Yu Tsai
2016-02-12 16:06 ` Vishnu Patekar
2016-02-12 16:43 ` Chen-Yu Tsai
2016-02-15 9:34 ` Chen-Yu Tsai
2016-02-15 9:55 ` Chen-Yu Tsai
2016-01-31 1:21 ` [PATCH 11/14] ARM: dts: sun8i-a83t: Add R_PIO controller node to the dtsi Vishnu Patekar
2016-01-31 3:46 ` Chen-Yu Tsai
2016-01-31 1:21 ` [PATCH 12/14] ARM: dts: sun8i-a83t: Add RSB nodes to dtsi Vishnu Patekar
2016-01-31 3:50 ` Chen-Yu Tsai
2016-01-31 1:21 ` [PATCH 13/14] ARM: dts: sun8i: enable mmc for H8Homlet Board Vishnu Patekar
2016-02-02 7:31 ` Chen-Yu Tsai
2016-01-31 1:21 ` [PATCH 14/14] ARM: dts: sun8i: Add A83T based Sinovoip Bpi-M3 Board Vishnu Patekar
2016-02-02 7:37 ` Chen-Yu Tsai
2016-02-04 4:25 ` Vishnu Patekar
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=1454203266-4450-5-git-send-email-vishnupatekar0510@gmail.com \
--to=vishnupatekar0510@gmail.com \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=emilio@elopez.com.ar \
--cc=galak@codeaurora.org \
--cc=hdegoede@redhat.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jenskuske@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@baylibre.com \
--cc=patchesrdh@mveas.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=wens@csie.org \
/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®