1 From 9c37953bd08daa3ca227098d763e980d1898add3 Mon Sep 17 00:00:00 2001
2 From: Sean Wang <sean.wang@mediatek.com>
3 Date: Wed, 18 Oct 2017 16:28:43 +0800
4 Subject: [PATCH 117/224] soc: mediatek: pwrap: add pwrap_read32 for reading in
7 Some regulators such as MediaTek MT6380 has to be read in 32-bit mode.
8 So the patch adds pwrap_read32, rename old pwrap_read into pwrap_read16
9 and one function pointer is introduced for increasing flexibility allowing
10 the determination which mode is used by the pwrap slave detection through
13 Signed-off-by: Chenglin Xu <chenglin.xu@mediatek.com>
14 Signed-off-by: Chen Zhong <chen.zhong@mediatek.com>
15 Signed-off-by: Sean Wang <sean.wang@mediatek.com>
16 Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
18 drivers/soc/mediatek/mtk-pmic-wrap.c | 55 +++++++++++++++++++++++++++++++++++-
19 1 file changed, 54 insertions(+), 1 deletion(-)
21 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
22 +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
23 @@ -487,6 +487,7 @@ static int mt8135_regs[] = {
31 @@ -496,9 +497,16 @@ enum pwrap_type {
36 struct pwrap_slv_type {
40 + * pwrap operations are highly associated with the PMIC types,
41 + * so the pointers added increases flexibility allowing determination
42 + * which type is used by the detection through device tree.
44 + int (*pwrap_read)(struct pmic_wrapper *wrp, u32 adr, u32 *rdata);
48 @@ -609,7 +617,7 @@ static int pwrap_write(struct pmic_wrapp
52 -static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
53 +static int pwrap_read16(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
57 @@ -632,6 +640,39 @@ static int pwrap_read(struct pmic_wrappe
61 +static int pwrap_read32(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
66 + for (msb = 0; msb < 2; msb++) {
67 + ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
69 + pwrap_leave_fsm_vldclr(wrp);
73 + pwrap_writel(wrp, ((msb << 30) | (adr << 16)),
76 + ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_vldclr);
80 + *rdata += (PWRAP_GET_WACS_RDATA(pwrap_readl(wrp,
81 + PWRAP_WACS2_RDATA)) << (16 * msb));
83 + pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
89 +static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
91 + return wrp->slave->pwrap_read(wrp, adr, rdata);
94 static int pwrap_regmap_read(void *context, u32 adr, u32 *rdata)
96 return pwrap_read(context, adr, rdata);
97 @@ -752,6 +793,8 @@ static int pwrap_mt2701_init_reg_clock(s
98 pwrap_writel(wrp, 0x2, PWRAP_CSLEXT_START);
99 pwrap_writel(wrp, 0x2, PWRAP_CSLEXT_END);
106 @@ -815,6 +858,8 @@ static int pwrap_init_cipher(struct pmic
107 pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_EN],
114 /* wait for cipher data ready@AP */
115 @@ -1036,11 +1081,19 @@ static const struct regmap_config pwrap_
116 static const struct pwrap_slv_type pmic_mt6323 = {
117 .dew_regs = mt6323_regs,
119 + .pwrap_read = pwrap_read16,
122 +static const struct pwrap_slv_type pmic_mt6380 = {
124 + .type = PMIC_MT6380,
125 + .pwrap_read = pwrap_read32,
128 static const struct pwrap_slv_type pmic_mt6397 = {
129 .dew_regs = mt6397_regs,
131 + .pwrap_read = pwrap_read16,
134 static const struct of_device_id of_slave_match_tbl[] = {