From: Chen-Yu Tsai <wens@csie.org>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
Mike Turquette <mturquette@linaro.org>,
Emilio Lopez <emilio@elopez.com.ar>
Cc: Chen-Yu Tsai <wens@csie.org>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com
Subject: [PATCH v4 3/6] clk: sunxi: Support factor clocks with N factor starting not from 0
Date: Thu, 26 Jun 2014 23:55:41 +0800 [thread overview]
Message-ID: <1403798144-32188-4-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1403798144-32188-1-git-send-email-wens@csie.org>
The PLLs on newer Allwinner SoC's, such as the A31 and A23, have a
N multiplier factor that starts from 1, not 0.
This patch adds an option to the factor clk driver's config data
structures to specify the base value of N.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/clk/sunxi/clk-factors.c | 2 +-
drivers/clk/sunxi/clk-factors.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/sunxi/clk-factors.c b/drivers/clk/sunxi/clk-factors.c
index 3806d97..2057c8a 100644
--- a/drivers/clk/sunxi/clk-factors.c
+++ b/drivers/clk/sunxi/clk-factors.c
@@ -62,7 +62,7 @@ static unsigned long clk_factors_recalc_rate(struct clk_hw *hw,
p = FACTOR_GET(config->pshift, config->pwidth, reg);
/* Calculate the rate */
- rate = (parent_rate * n * (k + 1) >> p) / (m + 1);
+ rate = (parent_rate * (n + config->n_start) * (k + 1) >> p) / (m + 1);
return rate;
}
diff --git a/drivers/clk/sunxi/clk-factors.h b/drivers/clk/sunxi/clk-factors.h
index 02e1a43..d2d0efa 100644
--- a/drivers/clk/sunxi/clk-factors.h
+++ b/drivers/clk/sunxi/clk-factors.h
@@ -15,6 +15,7 @@ struct clk_factors_config {
u8 mwidth;
u8 pshift;
u8 pwidth;
+ u8 n_start;
};
struct clk_factors {
--
2.0.0
next prev parent reply other threads:[~2014-06-26 15:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-26 15:55 [PATCH v4 0/6] clk: sunxi: fixes, cleanups and A23 basic clocks Chen-Yu Tsai
2014-06-26 15:55 ` [PATCH v4 1/6] clk: sunxi: register clock gates with clkdev Chen-Yu Tsai
2014-06-26 15:55 ` [PATCH v4 2/6] clk: sunxi: move "ahb_sdram" to protected clock list Chen-Yu Tsai
2014-06-26 15:55 ` Chen-Yu Tsai [this message]
2014-06-26 15:55 ` [PATCH v4 4/6] clk: sunxi: Add support for table-based divider clocks Chen-Yu Tsai
2014-06-26 15:55 ` [PATCH v4 5/6] clk: sunxi: Add A23 clocks support Chen-Yu Tsai
2014-06-26 15:55 ` [PATCH v4 6/6] ARM: sun8i: Add basic clock nodes to the DTSI Chen-Yu Tsai
2014-07-02 22:35 ` [PATCH v4 0/6] clk: sunxi: fixes, cleanups and A23 basic clocks Mike Turquette
2014-07-03 7:26 ` Maxime Ripard
2014-07-03 7:37 ` Chen-Yu Tsai
2014-07-04 10:07 ` 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=1403798144-32188-4-git-send-email-wens@csie.org \
--to=wens@csie.org \
--cc=devicetree@vger.kernel.org \
--cc=emilio@elopez.com.ar \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@linaro.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®