mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 09/20] clk: sunxi: Add sun6i MBUS clock support
Date: Tue, 17 Jun 2014 22:52:46 +0800	[thread overview]
Message-ID: <1403016777-15121-10-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1403016777-15121-1-git-send-email-wens@csie.org>

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 Documentation/devicetree/bindings/clock/sunxi.txt |  1 +
 drivers/clk/sunxi/clk-sunxi.c                     | 44 +++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt
index b9ec668..7b2ba41 100644
--- a/Documentation/devicetree/bindings/clock/sunxi.txt
+++ b/Documentation/devicetree/bindings/clock/sunxi.txt
@@ -40,6 +40,7 @@ Required properties:
 	"allwinner,sun6i-a31-apb2-div-clk" - for the APB2 gates on A31
 	"allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31
 	"allwinner,sun4i-a10-mod0-clk" - for the module 0 family of clocks
+	"allwinner,sun6i-a31-mbus-clk" - for the MBUS clocks on A31 / A23
 	"allwinner,sun7i-a20-out-clk" - for the external output clocks
 	"allwinner,sun7i-a20-gmac-clk" - for the GMAC clock module on A20/A31
 	"allwinner,sun4i-a10-usb-clk" - for usb gates + resets on A10 / A20
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index eca3c6e..a086b5b 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -307,6 +307,37 @@ static void sun4i_get_mod0_factors(u32 *freq, u32 parent_rate,
 
 
 /**
+ * sun6i_a31_get_mbus_factors() - calculates m factor for MBUS clocks
+ * MBUS rate is calculated as follows
+ * rate = parent_rate / (m + 1);
+ */
+
+static void sun6i_a31_get_mbus_factors(u32 *freq, u32 parent_rate,
+				       u8 *n, u8 *k, u8 *m, u8 *p)
+{
+	u8 div;
+
+	/* These clocks can only divide, so we will never be able to achieve
+	 * frequencies higher than the parent frequency */
+	if (*freq > parent_rate)
+		*freq = parent_rate;
+
+	div = DIV_ROUND_UP(parent_rate, *freq);
+
+	if (div > 8)
+		div = 8;
+
+	*freq = parent_rate / div;
+
+	/* we were called to round the frequency, we can now return */
+	if (n == NULL)
+		return;
+
+	*m = div - 1;
+}
+
+
+/**
  * sun7i_a20_get_out_factors() - calculates m, p factors for CLK_OUT_A/B
  * CLK_OUT rate is calculated as follows
  * rate = (parent_rate >> p) / (m + 1);
@@ -447,6 +478,11 @@ static struct clk_factors_config sun4i_mod0_config = {
 	.pwidth = 2,
 };
 
+static struct clk_factors_config sun6i_a31_mbus_config = {
+	.mshift = 0,
+	.mwidth = 3,
+};
+
 /* user manual says "n" but it's really "p" */
 static struct clk_factors_config sun7i_a20_out_config = {
 	.mshift = 8,
@@ -505,6 +541,13 @@ static const struct factors_data sun4i_mod0_data __initconst = {
 	.getter = sun4i_get_mod0_factors,
 };
 
+static const struct factors_data sun6i_a31_mbus_data __initconst = {
+	.enable = 31,
+	.mux = 24,
+	.table = &sun6i_a31_mbus_config,
+	.getter = sun6i_a31_get_mbus_factors,
+};
+
 static const struct factors_data sun7i_a20_out_data __initconst = {
 	.enable = 31,
 	.mux = 24,
@@ -1099,6 +1142,7 @@ static const struct of_device_id clk_factors_match[] __initconst = {
 	{.compatible = "allwinner,sun6i-a31-pll6-clk", .data = &sun6i_a31_pll6_data,},
 	{.compatible = "allwinner,sun4i-a10-apb1-clk", .data = &sun4i_apb1_data,},
 	{.compatible = "allwinner,sun4i-a10-mod0-clk", .data = &sun4i_mod0_data,},
+	{.compatible = "allwinner,sun6i-a31-mbus-clk", .data = &sun6i_a31_mbus_data,},
 	{.compatible = "allwinner,sun7i-a20-out-clk", .data = &sun7i_a20_out_data,},
 	{}
 };
-- 
2.0.0


  parent reply	other threads:[~2014-06-17 14:58 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 ` [PATCH v2 03/20] clk: sunxi: move "ahb_sdram" to protected clock list Chen-Yu Tsai
2014-06-18  9:10   ` 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 ` Chen-Yu Tsai [this message]
2014-06-18 10:04   ` [PATCH v2 09/20] clk: sunxi: Add sun6i MBUS clock support 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-10-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

all inboxes | Powered by JetHome®