All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chao Xie <chao.xie@marvell.com>
To: <haojian.zhuang@gmail.com>, <haojian.zhuang@linaro.org>,
	<mturquette@linaro.org>, <chao.xie@marvell.com>,
	<xiechao_mail@163.com>, <linux-arm-kernel@lists.infradead.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 03/12] clk: mmp: add init callback for clk-frac
Date: Tue, 26 Aug 2014 12:38:15 +0800	[thread overview]
Message-ID: <1409027904-21859-4-git-send-email-chao.xie@marvell.com> (raw)
In-Reply-To: <1409027904-21859-1-git-send-email-chao.xie@marvell.com>

From: Chao Xie <chao.xie@marvell.com>

For the clk-frac, we need to make sure that the initial
clock rate is one item of the table.
If it is not, we use the first item in the table by default.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
 drivers/clk/mmp/clk-frac.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/drivers/clk/mmp/clk-frac.c b/drivers/clk/mmp/clk-frac.c
index e29d006..1876d2c 100644
--- a/drivers/clk/mmp/clk-frac.c
+++ b/drivers/clk/mmp/clk-frac.c
@@ -118,10 +118,50 @@ static int clk_factor_set_rate(struct clk_hw *hw, unsigned long drate,
 	return 0;
 }
 
+void clk_factor_init(struct clk_hw *hw)
+{
+	struct mmp_clk_factor *factor = to_clk_factor(hw);
+	struct mmp_clk_factor_masks *masks = factor->masks;
+	u32 val, num, den;
+	int i;
+	unsigned long flags = 0;
+
+	if (factor->lock)
+		spin_lock_irqsave(factor->lock, flags);
+
+	val = readl(factor->base);
+
+	/* calculate numerator */
+	num = (val >> masks->num_shift) & masks->num_mask;
+
+	/* calculate denominator */
+	den = (val >> masks->den_shift) & masks->den_mask;
+
+	for (i = 0; i < factor->ftbl_cnt; i++)
+		if (den == factor->ftbl[i].den && num == factor->ftbl[i].num)
+			break;
+
+	if (i >= factor->ftbl_cnt) {
+		val &= ~(masks->num_mask << masks->num_shift);
+		val |= (factor->ftbl[0].num & masks->num_mask) <<
+			masks->num_shift;
+
+		val &= ~(masks->den_mask << masks->den_shift);
+		val |= (factor->ftbl[0].den & masks->den_mask) <<
+			masks->den_shift;
+
+		writel(val, factor->base);
+	}
+
+	if (factor->lock)
+		spin_unlock_irqrestore(factor->lock, flags);
+}
+
 static struct clk_ops clk_factor_ops = {
 	.recalc_rate = clk_factor_recalc_rate,
 	.round_rate = clk_factor_round_rate,
 	.set_rate = clk_factor_set_rate,
+	.init = clk_factor_init,
 };
 
 struct clk *mmp_clk_register_factor(const char *name, const char *parent_name,
-- 
1.8.3.2


WARNING: multiple messages have this Message-ID (diff)
From: Chao Xie <chao.xie@marvell.com>
To: haojian.zhuang@gmail.com, haojian.zhuang@linaro.org,
	mturquette@linaro.org, chao.xie@marvell.com,
	xiechao_mail@163.com, linux-arm-kernel@lists.infradead.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 03/12] clk: mmp: add init callback for clk-frac
Date: Tue, 26 Aug 2014 12:38:15 +0800	[thread overview]
Message-ID: <1409027904-21859-4-git-send-email-chao.xie@marvell.com> (raw)
In-Reply-To: <1409027904-21859-1-git-send-email-chao.xie@marvell.com>

From: Chao Xie <chao.xie@marvell.com>

For the clk-frac, we need to make sure that the initial
clock rate is one item of the table.
If it is not, we use the first item in the table by default.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
 drivers/clk/mmp/clk-frac.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/drivers/clk/mmp/clk-frac.c b/drivers/clk/mmp/clk-frac.c
index e29d006..1876d2c 100644
--- a/drivers/clk/mmp/clk-frac.c
+++ b/drivers/clk/mmp/clk-frac.c
@@ -118,10 +118,50 @@ static int clk_factor_set_rate(struct clk_hw *hw, unsigned long drate,
 	return 0;
 }
 
+void clk_factor_init(struct clk_hw *hw)
+{
+	struct mmp_clk_factor *factor = to_clk_factor(hw);
+	struct mmp_clk_factor_masks *masks = factor->masks;
+	u32 val, num, den;
+	int i;
+	unsigned long flags = 0;
+
+	if (factor->lock)
+		spin_lock_irqsave(factor->lock, flags);
+
+	val = readl(factor->base);
+
+	/* calculate numerator */
+	num = (val >> masks->num_shift) & masks->num_mask;
+
+	/* calculate denominator */
+	den = (val >> masks->den_shift) & masks->den_mask;
+
+	for (i = 0; i < factor->ftbl_cnt; i++)
+		if (den == factor->ftbl[i].den && num == factor->ftbl[i].num)
+			break;
+
+	if (i >= factor->ftbl_cnt) {
+		val &= ~(masks->num_mask << masks->num_shift);
+		val |= (factor->ftbl[0].num & masks->num_mask) <<
+			masks->num_shift;
+
+		val &= ~(masks->den_mask << masks->den_shift);
+		val |= (factor->ftbl[0].den & masks->den_mask) <<
+			masks->den_shift;
+
+		writel(val, factor->base);
+	}
+
+	if (factor->lock)
+		spin_unlock_irqrestore(factor->lock, flags);
+}
+
 static struct clk_ops clk_factor_ops = {
 	.recalc_rate = clk_factor_recalc_rate,
 	.round_rate = clk_factor_round_rate,
 	.set_rate = clk_factor_set_rate,
+	.init = clk_factor_init,
 };
 
 struct clk *mmp_clk_register_factor(const char *name, const char *parent_name,
-- 
1.8.3.2

WARNING: multiple messages have this Message-ID (diff)
From: chao.xie@marvell.com (Chao Xie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/12] clk: mmp: add init callback for clk-frac
Date: Tue, 26 Aug 2014 12:38:15 +0800	[thread overview]
Message-ID: <1409027904-21859-4-git-send-email-chao.xie@marvell.com> (raw)
In-Reply-To: <1409027904-21859-1-git-send-email-chao.xie@marvell.com>

From: Chao Xie <chao.xie@marvell.com>

For the clk-frac, we need to make sure that the initial
clock rate is one item of the table.
If it is not, we use the first item in the table by default.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
 drivers/clk/mmp/clk-frac.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/drivers/clk/mmp/clk-frac.c b/drivers/clk/mmp/clk-frac.c
index e29d006..1876d2c 100644
--- a/drivers/clk/mmp/clk-frac.c
+++ b/drivers/clk/mmp/clk-frac.c
@@ -118,10 +118,50 @@ static int clk_factor_set_rate(struct clk_hw *hw, unsigned long drate,
 	return 0;
 }
 
+void clk_factor_init(struct clk_hw *hw)
+{
+	struct mmp_clk_factor *factor = to_clk_factor(hw);
+	struct mmp_clk_factor_masks *masks = factor->masks;
+	u32 val, num, den;
+	int i;
+	unsigned long flags = 0;
+
+	if (factor->lock)
+		spin_lock_irqsave(factor->lock, flags);
+
+	val = readl(factor->base);
+
+	/* calculate numerator */
+	num = (val >> masks->num_shift) & masks->num_mask;
+
+	/* calculate denominator */
+	den = (val >> masks->den_shift) & masks->den_mask;
+
+	for (i = 0; i < factor->ftbl_cnt; i++)
+		if (den == factor->ftbl[i].den && num == factor->ftbl[i].num)
+			break;
+
+	if (i >= factor->ftbl_cnt) {
+		val &= ~(masks->num_mask << masks->num_shift);
+		val |= (factor->ftbl[0].num & masks->num_mask) <<
+			masks->num_shift;
+
+		val &= ~(masks->den_mask << masks->den_shift);
+		val |= (factor->ftbl[0].den & masks->den_mask) <<
+			masks->den_shift;
+
+		writel(val, factor->base);
+	}
+
+	if (factor->lock)
+		spin_unlock_irqrestore(factor->lock, flags);
+}
+
 static struct clk_ops clk_factor_ops = {
 	.recalc_rate = clk_factor_recalc_rate,
 	.round_rate = clk_factor_round_rate,
 	.set_rate = clk_factor_set_rate,
+	.init = clk_factor_init,
 };
 
 struct clk *mmp_clk_register_factor(const char *name, const char *parent_name,
-- 
1.8.3.2

  parent reply	other threads:[~2014-08-26  4:37 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-26  4:38 [PATCH 00/12] clk: mmp: clock device tree support Chao Xie
2014-08-26  4:38 ` Chao Xie
2014-08-26  4:38 ` Chao Xie
2014-08-26  4:38 ` [PATCH 01/12] clk: mmp: add prefix "mmp" for structures defined for clk-frac Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 02/12] clk: mmp: add spin lock " Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-09-03 18:04   ` Mike Turquette
2014-09-03 18:04     ` Mike Turquette
2014-09-03 18:04     ` Mike Turquette
2014-09-10  1:30     ` Chao Xie
2014-09-10  1:30       ` Chao Xie
2014-09-10  1:30       ` Chao Xie
2014-08-26  4:38 ` Chao Xie [this message]
2014-08-26  4:38   ` [PATCH 03/12] clk: mmp: add init callback " Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 04/12] clk: mmp: move definiton of mmp_clk_frac to clk.h Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 05/12] clk: mmp: add clock type mix Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 06/12] clk: mmp: add mmp private gate clock Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-09-03 17:55   ` Mike Turquette
2014-09-03 17:55     ` Mike Turquette
2014-09-03 17:55     ` Mike Turquette
2014-09-04  4:02     ` Chao Xie
2014-09-04  4:02       ` Chao Xie
2014-09-04  4:02       ` Chao Xie
2014-09-04  4:16       ` Chen-Yu Tsai
2014-09-04  4:16         ` Chen-Yu Tsai
2014-09-04  4:16         ` Chen-Yu Tsai
2014-08-26  4:38 ` [PATCH 07/12] clk: mmp: add basic support functions for DT support Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 08/12] clk: mmp: add pxa168 DT support for clock driver Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 09/12] clk: mmp: add pxa910 " Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 10/12] clk: mmp: add mmp2 " Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 11/12] arm: mmp: Make all the dts file to be compiled by Makefile Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38 ` [PATCH 12/12] arm: mmp: Make use of the DT supported clock Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:38   ` Chao Xie
2014-08-26  4:55 ` [PATCH 00/12] clk: mmp: clock device tree support Haojian Zhuang
2014-08-26  4:55   ` Haojian Zhuang
2014-08-26  4:55   ` Haojian Zhuang
  -- strict thread matches above, loose matches on Subject: below --
2014-06-10  1:27 Chao Xie
2014-06-10  1:27 ` [PATCH 03/12] clk: mmp: add init callback for clk-frac Chao Xie
2014-06-10  1:27   ` Chao Xie
2014-06-10  1:27   ` Chao Xie

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=1409027904-21859-4-git-send-email-chao.xie@marvell.com \
    --to=chao.xie@marvell.com \
    --cc=devicetree@vger.kernel.org \
    --cc=haojian.zhuang@gmail.com \
    --cc=haojian.zhuang@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mturquette@linaro.org \
    --cc=xiechao_mail@163.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.