target/linux/mediatek/patches-4.14/0117-soc-mediatek-pwrap-add-pwrap_read32-for-reading-in-3.patch

   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
   5  32-bit mode
   6
   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
  11 device tree.
  12
  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>
  17 ---
  18  drivers/soc/mediatek/mtk-pmic-wrap.c | 55 +++++++++++++++++++++++++++++++++++-
  19  1 file changed, 54 insertions(+), 1 deletion(-)
  20
  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[] = {
  24
  25  enum pmic_type {
  26         PMIC_MT6323,
  27 +       PMIC_MT6380,
  28         PMIC_MT6397,
  29  };
  30
  31 @@ -496,9 +497,16 @@ enum pwrap_type {
  32         PWRAP_MT8173,
  33  };
  34
  35 +struct pmic_wrapper;
  36  struct pwrap_slv_type {
  37         const u32 *dew_regs;
  38         enum pmic_type type;
  39 +       /*
  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.
  43 +        */
  44 +       int (*pwrap_read)(struct pmic_wrapper *wrp, u32 adr, u32 *rdata);
  45  };
  46
  47  struct pmic_wrapper {
  48 @@ -609,7 +617,7 @@ static int pwrap_write(struct pmic_wrapp
  49         return 0;
  50  }
  51
  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)
  54  {
  55         int ret;
  56
  57 @@ -632,6 +640,39 @@ static int pwrap_read(struct pmic_wrappe
  58         return 0;
  59  }
  60
  61 +static int pwrap_read32(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
  62 +{
  63 +       int ret, msb;
  64 +
  65 +       *rdata = 0;
  66 +       for (msb = 0; msb < 2; msb++) {
  67 +               ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
  68 +               if (ret) {
  69 +                       pwrap_leave_fsm_vldclr(wrp);
  70 +                       return ret;
  71 +               }
  72 +
  73 +               pwrap_writel(wrp, ((msb << 30) | (adr << 16)),
  74 +                            PWRAP_WACS2_CMD);
  75 +
  76 +               ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_vldclr);
  77 +               if (ret)
  78 +                       return ret;
  79 +
  80 +               *rdata += (PWRAP_GET_WACS_RDATA(pwrap_readl(wrp,
  81 +                          PWRAP_WACS2_RDATA)) << (16 * msb));
  82 +
  83 +               pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
  84 +       }
  85 +
  86 +       return 0;
  87 +}
  88 +
  89 +static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
  90 +{
  91 +       return wrp->slave->pwrap_read(wrp, adr, rdata);
  92 +}
  93 +
  94  static int pwrap_regmap_read(void *context, u32 adr, u32 *rdata)
  95  {
  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);
 100                 break;
 101 +       default:
 102 +               break;
 103         }
 104
 105         return 0;
 106 @@ -815,6 +858,8 @@ static int pwrap_init_cipher(struct pmic
 107                 pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_EN],
 108                             0x1);
 109                 break;
 110 +       default:
 111 +               break;
 112         }
 113
 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,
 118         .type = PMIC_MT6323,
 119 +       .pwrap_read = pwrap_read16,
 120 +};
 121 +
 122 +static const struct pwrap_slv_type pmic_mt6380 = {
 123 +       .dew_regs = NULL,
 124 +       .type = PMIC_MT6380,
 125 +       .pwrap_read = pwrap_read32,
 126  };
 127
 128  static const struct pwrap_slv_type pmic_mt6397 = {
 129         .dew_regs = mt6397_regs,
 130         .type = PMIC_MT6397,
 131 +       .pwrap_read = pwrap_read16,
 132  };
 133
 134  static const struct of_device_id of_slave_match_tbl[] = {