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 7/9] soc: mediatek: pwrap: add MediaTek MT6380 as one slave of pwrap
Date: Sat, 3 Jun 2017 01:55:48 +0800 [thread overview]
Message-ID: <1be52eb2f97dc9152a27befca73208c4bc1a550b.1496425268.git.sean.wang@mediatek.com> (raw)
In-Reply-To: <cover.1496425268.git.sean.wang@mediatek.com>
From: Sean Wang <sean.wang@mediatek.com>
Add MediaTek MT6380 regulator becoming one of PMIC wrapper slave
and also add extra new regmap_config of 32-bit mode for MT6380
since old regmap_config of 16-bit mode can't be fit into the need.
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 | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index d9b4a63..90b087f 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -501,6 +501,7 @@ enum pwrap_type {
struct pwrap_slv_type {
const u32 *dew_regs;
enum pmic_type type;
+ const struct regmap_config *regmap;
/* pwrap operations are highly associated with the PMIC types,
* so the pointers added increases flexibility allowing determination
* which type is used by the detection through device tree.
@@ -1133,7 +1134,7 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
return IRQ_HANDLED;
}
-static const struct regmap_config pwrap_regmap_config = {
+static const struct regmap_config pwrap_regmap_config16 = {
.reg_bits = 16,
.val_bits = 16,
.reg_stride = 2,
@@ -1142,10 +1143,19 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
.max_register = 0xffff,
};
+static const struct regmap_config pwrap_regmap_config32 = {
+ .reg_bits = 32,
+ .val_bits = 32,
+ .reg_stride = 4,
+ .reg_read = pwrap_regmap_read,
+ .reg_write = pwrap_regmap_write,
+ .max_register = 0xffff,
+};
+
static const struct pwrap_slv_type pmic_mt6323 = {
.dew_regs = mt6323_regs,
.type = PMIC_MT6323,
-
+ .regmap = &pwrap_regmap_config16,
.pwrap_init = pwrap_init_mt6397,
.pwrap_read = pwrap_read16,
.pwrap_write = pwrap_write16,
@@ -1154,7 +1164,7 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
static const struct pwrap_slv_type pmic_mt6380 = {
.dew_regs = NULL,
.type = PMIC_MT6380,
-
+ .regmap = &pwrap_regmap_config32,
.pwrap_init = pwrap_init_mt6380,
.pwrap_read = pwrap_read32,
.pwrap_write = pwrap_write32,
@@ -1163,7 +1173,7 @@ 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,
-
+ .regmap = &pwrap_regmap_config16,
.pwrap_init = pwrap_init_mt6397,
.pwrap_read = pwrap_read16,
.pwrap_write = pwrap_write16,
@@ -1177,6 +1187,13 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
.compatible = "mediatek,mt6397",
.data = &pmic_mt6397,
}, {
+ /* The MT6380 slave device is directly pointed to regulator
+ * device which is different from the cases MT6323 and MT6397
+ * since they're one kind of MFDs.
+ */
+ .compatible = "mediatek,mt6380-regulator",
+ .data = &pmic_mt6380,
+ }, {
/* sentinel */
}
};
@@ -1346,7 +1363,7 @@ static int pwrap_probe(struct platform_device *pdev)
if (ret)
goto err_out2;
- wrp->regmap = devm_regmap_init(wrp->dev, NULL, wrp, &pwrap_regmap_config);
+ wrp->regmap = devm_regmap_init(wrp->dev, NULL, wrp, wrp->slave->regmap);
if (IS_ERR(wrp->regmap))
return PTR_ERR(wrp->regmap);
--
1.9.1
next prev parent reply other threads:[~2017-06-02 17:57 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 ` [PATCH 6/9] soc: mediatek: pwrap: add pwrap_init pointer decided by the actual PMIC sean.wang
2017-06-02 17:55 ` sean.wang [this message]
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=1be52eb2f97dc9152a27befca73208c4bc1a550b.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
all inboxes | Powered by JetHome®