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 v3 5/9] soc: mediatek: pwrap: add pwrap_write32 for writing in 32-bit mode
Date: Tue, 15 Aug 2017 17:09:17 +0800 [thread overview]
Message-ID: <236a04acb383fc655549bc345a16a2d015e5727d.1502779753.git.sean.wang@mediatek.com> (raw)
In-Reply-To: <cover.1502779753.git.sean.wang@mediatek.com>
From: Sean Wang <sean.wang@mediatek.com>
Some regulators such as MediaTek MT6380 also has to be written in
32-bit mode. So the patch adds pwrap_write32, rename old pwrap_write
into pwrap_write16 and one additional function pointer is introduced
for increasing flexibility allowing the determination which mode is
used by the pwrap slave detection through device tree.
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 | 63 +++++++++++++++++++++++++++---------
1 file changed, 47 insertions(+), 16 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index 7cd581b..9d1f4c6 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -506,6 +506,7 @@ struct pwrap_slv_type {
* which type is used by the detection through device tree.
*/
int (*pwrap_read)(struct pmic_wrapper *wrp, u32 adr, u32 *rdata);
+ int (*pwrap_write)(struct pmic_wrapper *wrp, u32 adr, u32 wdata);
};
struct pmic_wrapper {
@@ -600,22 +601,6 @@ static int pwrap_wait_for_state(struct pmic_wrapper *wrp,
} while (1);
}
-static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
-{
- int ret;
-
- ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
- if (ret) {
- pwrap_leave_fsm_vldclr(wrp);
- return ret;
- }
-
- pwrap_writel(wrp, (1 << 31) | ((adr >> 1) << 16) | wdata,
- PWRAP_WACS2_CMD);
-
- return 0;
-}
-
static int pwrap_read16(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
{
int ret;
@@ -672,6 +657,49 @@ static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
return wrp->slave->pwrap_read(wrp, adr, rdata);
}
+static int pwrap_write16(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
+{
+ int ret;
+
+ ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
+ if (ret) {
+ pwrap_leave_fsm_vldclr(wrp);
+ return ret;
+ }
+
+ pwrap_writel(wrp, (1 << 31) | ((adr >> 1) << 16) | wdata,
+ PWRAP_WACS2_CMD);
+
+ return 0;
+}
+
+static int pwrap_write32(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
+{
+ int ret, msb, rdata;
+
+ for (msb = 0; msb < 2; msb++) {
+ ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
+ if (ret) {
+ pwrap_leave_fsm_vldclr(wrp);
+ return ret;
+ }
+
+ pwrap_writel(wrp, (1 << 31) | (msb << 30) | (adr << 16) |
+ ((wdata >> (msb * 16)) & 0xffff),
+ PWRAP_WACS2_CMD);
+
+ if (!msb)
+ pwrap_read(wrp, adr, &rdata);
+ }
+
+ return 0;
+}
+
+static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
+{
+ return wrp->slave->pwrap_write(wrp, adr, wdata);
+}
+
static int pwrap_regmap_read(void *context, u32 adr, u32 *rdata)
{
return pwrap_read(context, adr, rdata);
@@ -1080,18 +1108,21 @@ static const struct pwrap_slv_type pmic_mt6323 = {
.dew_regs = mt6323_regs,
.type = PMIC_MT6323,
.pwrap_read = pwrap_read16,
+ .pwrap_write = pwrap_write16,
};
static const struct pwrap_slv_type pmic_mt6380 = {
.dew_regs = NULL,
.type = PMIC_MT6380,
.pwrap_read = pwrap_read32,
+ .pwrap_write = pwrap_write32,
};
static const struct pwrap_slv_type pmic_mt6397 = {
.dew_regs = mt6397_regs,
.type = PMIC_MT6397,
.pwrap_read = pwrap_read16,
+ .pwrap_write = pwrap_write16,
};
static const struct of_device_id of_slave_match_tbl[] = {
--
2.7.4
next prev parent reply other threads:[~2017-08-15 9:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-15 9:09 [PATCH v3 0/9] Add PMIC support to MediaTek MT7622 SoC sean.wang-NuS5LvNUpcJWk0Htik3J/w
2017-08-15 9:09 ` [PATCH v3 1/9] dt-bindings: arm: mediatek: add MT7622 string to the PMIC wrapper doc sean.wang
2017-08-15 9:09 ` [PATCH v3 4/9] soc: mediatek: pwrap: add pwrap_read32 for reading in 32-bit mode sean.wang
2017-08-15 9:09 ` sean.wang [this message]
[not found] ` <236a04acb383fc655549bc345a16a2d015e5727d.1502779753.git.sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2017-10-10 9:38 ` [PATCH v3 5/9] soc: mediatek: pwrap: add pwrap_write32 for writing " Matthias Brugger
[not found] ` <d34460e3-9233-3c31-578d-cf2fe91a4316-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-10-12 3:19 ` Sean Wang
[not found] ` <cover.1502779753.git.sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2017-08-15 9:09 ` [PATCH v3 2/9] dt-bindings: regulator: Add document for MediaTek MT6380 regulator sean.wang-NuS5LvNUpcJWk0Htik3J/w
2017-08-15 11:50 ` Mark Brown
[not found] ` <20170815115038.65wos2ega2akxet4-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2017-08-15 15:06 ` Sean Wang
2017-08-15 15:10 ` Mark Brown
2017-08-15 15:10 ` Applied "regulator: Add document for MediaTek MT6380 regulator" to the regulator tree Mark Brown
2017-08-15 9:09 ` [PATCH v3 3/9] regulator: mt6380: Add support for MT6380 sean.wang-NuS5LvNUpcJWk0Htik3J/w
2017-08-15 15:11 ` Applied "regulator: mt6380: Add support for MT6380" to the regulator tree Mark Brown
2017-08-15 9:09 ` [PATCH v3 6/9] soc: mediatek: pwrap: update pwrap_init without slave programming sean.wang-NuS5LvNUpcJWk0Htik3J/w
[not found] ` <23b1e9fa5d4d8932b36e08d2a6713d4f33c055d9.1502779753.git.sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2017-10-10 9:53 ` Matthias Brugger
2017-08-15 9:09 ` [PATCH v3 7/9] soc: mediatek: pwrap: add MediaTek MT6380 as one slave of pwrap sean.wang-NuS5LvNUpcJWk0Htik3J/w
[not found] ` <398d87c6ae2b414016fc0c0a9c6bada3ce746118.1502779753.git.sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2017-10-10 10:02 ` Matthias Brugger
[not found] ` <0491f3fc-0404-c775-70f3-8bc86b3cf6c8-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-10-12 3:44 ` Sean Wang
2017-08-15 9:09 ` [PATCH v3 8/9] soc: mediatek: pwrap: add support for MT7622 SoC sean.wang-NuS5LvNUpcJWk0Htik3J/w
2017-10-10 9:57 ` Matthias Brugger
2017-08-15 9:09 ` [PATCH v3 9/9] soc: mediatek: pwrap: fixup warnings from coding style sean.wang
2017-10-10 10:03 ` Matthias Brugger
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=236a04acb383fc655549bc345a16a2d015e5727d.1502779753.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).