linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <sean.wang@mediatek.com>
To: <robh+dt@kernel.org>, <matthias.bgg@gmail.com>,
	<mark.rutland@arm.com>, <lgirdwood@gmail.com>,
	<broonie@kernel.org>, <jamesjj.liao@mediatek.com>,
	<henryc.chen@mediatek.com>, <devicetree@vger.kernel.org>,
	<linux-mediatek@lists.infradead.org>
Cc: <chen.zhong@mediatek.com>, <chenglin.xu@mediatek.com>,
	<linux-kernel@vger.kernel.org>,
	Sean Wang <sean.wang@mediatek.com>
Subject: [PATCH 6/9] soc: mediatek: pwrap: add pwrap_init pointer decided by the actual PMIC
Date: Sat, 3 Jun 2017 01:55:47 +0800	[thread overview]
Message-ID: <4f690b20599fb107a64d6fecd438ab77682419b9.1496425268.git.sean.wang@mediatek.com> (raw)
In-Reply-To: <cover.1496425268.git.sean.wang@mediatek.com>

From: Sean Wang <sean.wang@mediatek.com>

pwrap initialization is highly associated with the PMIC types, so
one additional function pointer in struct pwrap_slv_type is introduced for
increasing flexibility and selecting the proper way when the slave device
is detected.

Signed-off-by: Chenglin Xu <chenglin.xu@mediatek.com>
Signed-off-by: Chen Zhong <chen.zhong@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
 drivers/soc/mediatek/mtk-pmic-wrap.c | 46 +++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index 03c0520..d9b4a63 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -505,6 +505,7 @@ struct pwrap_slv_type {
 	 * so the pointers added increases flexibility allowing determination
 	 * which type is used by the detection through device tree.
 	 */
+	int (*pwrap_init)(struct pmic_wrapper *wrp);
 	int (*pwrap_read)(struct pmic_wrapper *wrp, u32 adr, u32 *rdata);
 	int (*pwrap_write)(struct pmic_wrapper *wrp, u32 adr, u32 wdata);
 };
@@ -983,7 +984,7 @@ static int pwrap_mt2701_init_soc_specific(struct pmic_wrapper *wrp)
 	return 0;
 }
 
-static int pwrap_init(struct pmic_wrapper *wrp)
+static int pwrap_init_mt6397(struct pmic_wrapper *wrp)
 {
 	int ret;
 	u32 rdata;
@@ -1081,6 +1082,43 @@ static int pwrap_init(struct pmic_wrapper *wrp)
 	return 0;
 }
 
+static int pwrap_init_mt6380(struct pmic_wrapper *wrp)
+{
+	int ret;
+
+	reset_control_reset(wrp->rstc);
+
+	pwrap_writel(wrp, 1, PWRAP_WRAP_EN);
+	pwrap_writel(wrp, wrp->master->arb_en_all, PWRAP_HIPRIO_ARB_EN);
+	pwrap_writel(wrp, 1, PWRAP_WACS2_EN);
+
+	ret = wrp->master->init_reg_clock(wrp);
+	if (ret)
+		return ret;
+
+	pwrap_writel(wrp, 0x1, PWRAP_WACS0_EN);
+	pwrap_writel(wrp, 0x1, PWRAP_WACS1_EN);
+	pwrap_writel(wrp, 0x1, PWRAP_WACS2_EN);
+
+	if (wrp->master->init_soc_specific) {
+		ret = wrp->master->init_soc_specific(wrp);
+		if (ret)
+			return ret;
+	}
+
+	/* Setup the init done registers */
+	pwrap_writel(wrp, 1, PWRAP_INIT_DONE2);
+	pwrap_writel(wrp, 1, PWRAP_INIT_DONE0);
+	pwrap_writel(wrp, 1, PWRAP_INIT_DONE1);
+
+	return 0;
+}
+
+static int pwrap_init(struct pmic_wrapper *wrp)
+{
+	return wrp->slave->pwrap_init(wrp);
+}
+
 static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
 {
 	u32 rdata;
@@ -1107,6 +1145,8 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
 static const struct pwrap_slv_type pmic_mt6323 = {
 	.dew_regs = mt6323_regs,
 	.type = PMIC_MT6323,
+
+	.pwrap_init = pwrap_init_mt6397,
 	.pwrap_read = pwrap_read16,
 	.pwrap_write = pwrap_write16,
 };
@@ -1114,6 +1154,8 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
 static const struct pwrap_slv_type pmic_mt6380 = {
 	.dew_regs = NULL,
 	.type = PMIC_MT6380,
+
+	.pwrap_init = pwrap_init_mt6380,
 	.pwrap_read = pwrap_read32,
 	.pwrap_write = pwrap_write32,
 };
@@ -1121,6 +1163,8 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
 static const struct pwrap_slv_type pmic_mt6397 = {
 	.dew_regs = mt6397_regs,
 	.type = PMIC_MT6397,
+
+	.pwrap_init = pwrap_init_mt6397,
 	.pwrap_read = pwrap_read16,
 	.pwrap_write = pwrap_write16,
 };
-- 
1.9.1

  parent reply	other threads:[~2017-06-02 17:56 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-02 17:55 [PATCH 0/9] Add PMIC support to MediaTek MT7622 SoC sean.wang
2017-06-02 17:55 ` [PATCH 1/9] dt-bindings: arm: mediatek: add MT7622 string to the PMIC wrapper doc sean.wang
2017-06-08 21:58   ` Rob Herring
2017-06-02 17:55 ` [PATCH 2/9] dt-bindings: regulator: Add document for MediaTek MT6380 regulator sean.wang
2017-06-08 22:01   ` Rob Herring
2017-06-02 17:55 ` [PATCH 3/9] regulator: mt6380: Add support for MT6380 sean.wang
2017-06-06 18:22   ` Mark Brown
2017-06-23 15:56     ` Sean Wang
2017-06-23 16:14       ` Mark Brown
2017-06-23 16:43         ` Sean Wang
2017-07-14 15:06           ` Sean Wang
2017-07-14 15:14             ` Mark Brown
2017-06-02 17:55 ` [PATCH 4/9] soc: mediatek: pwrap: add pwrap_read32 for reading in 32-bit mode sean.wang
2017-06-02 17:55 ` [PATCH 5/9] soc: mediatek: pwrap: add pwrap_write32 for writing " sean.wang
2017-06-02 17:55 ` sean.wang [this message]
2017-06-02 17:55 ` [PATCH 7/9] soc: mediatek: pwrap: add MediaTek MT6380 as one slave of pwrap sean.wang
2017-06-02 17:55 ` [PATCH 8/9] soc: mediatek: pwrap: add support for MT7622 SoC sean.wang
2017-06-02 17:55 ` [PATCH 9/9] soc: mediatek: pwrap: fixup warnings from coding style sean.wang

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=4f690b20599fb107a64d6fecd438ab77682419b9.1496425268.git.sean.wang@mediatek.com \
    --to=sean.wang@mediatek.com \
    --cc=broonie@kernel.org \
    --cc=chen.zhong@mediatek.com \
    --cc=chenglin.xu@mediatek.com \
    --cc=devicetree@vger.kernel.org \
    --cc=henryc.chen@mediatek.com \
    --cc=jamesjj.liao@mediatek.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=matthias.bgg@gmail.com \
    --cc=robh+dt@kernel.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;
as well as URLs for NNTP newsgroup(s).