target/linux/at91/patches-5.15/124-regulator-mcp16502-adapt-for-get-set-on-other-regist.patch

   1 From 5295f4c122258a11fb6012b7e043248e681db5a2 Mon Sep 17 00:00:00 2001
   2 From: Claudiu Beznea <claudiu.beznea@microchip.com>
   3 Date: Fri, 13 Nov 2020 17:21:08 +0200
   4 Subject: [PATCH 124/247] regulator: mcp16502: adapt for get/set on other
   5  registers
   6
   7 MCP16502 have multiple registers for each regulator (as described
   8 in enum mcp16502_reg). Adapt the code to be able to get/set all these
   9 registers. This is necessary for the following commits.
  10
  11 Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
  12 Link: https://lore.kernel.org/r/1605280870-32432-5-git-send-email-claudiu.beznea@microchip.com
  13 Signed-off-by: Mark Brown <broonie@kernel.org>
  14 ---
  15  drivers/regulator/mcp16502.c | 43 ++++++++++++++++++++++--------------
  16  1 file changed, 27 insertions(+), 16 deletions(-)
  17
  18 --- a/drivers/regulator/mcp16502.c
  19 +++ b/drivers/regulator/mcp16502.c
  20 @@ -54,13 +54,9 @@
  21   * This function is useful for iterating over all regulators and accessing their
  22   * registers in a generic way or accessing a regulator device by its id.
  23   */
  24 -#define MCP16502_BASE(i) (((i) + 1) << 4)
  25 +#define MCP16502_REG_BASE(i, r) ((((i) + 1) << 4) + MCP16502_REG_##r)
  26  #define MCP16502_STAT_BASE(i) ((i) + 5)
  27
  28 -#define MCP16502_OFFSET_MODE_A 0
  29 -#define MCP16502_OFFSET_MODE_LPM 1
  30 -#define MCP16502_OFFSET_MODE_HIB 2
  31 -
  32  #define MCP16502_OPMODE_ACTIVE REGULATOR_MODE_NORMAL
  33  #define MCP16502_OPMODE_LPM REGULATOR_MODE_IDLE
  34  #define MCP16502_OPMODE_HIB REGULATOR_MODE_STANDBY
  35 @@ -75,6 +71,23 @@
  36  #define MCP16502_MIN_REG 0x0
  37  #define MCP16502_MAX_REG 0x65
  38
  39 +/**
  40 + * enum mcp16502_reg - MCP16502 regulators's registers
  41 + * @MCP16502_REG_A: active state register
  42 + * @MCP16502_REG_LPM: low power mode state register
  43 + * @MCP16502_REG_HIB: hibernate state register
  44 + * @MCP16502_REG_SEQ: startup sequence register
  45 + * @MCP16502_REG_CFG: configuration register
  46 + */
  47 +enum mcp16502_reg {
  48 +       MCP16502_REG_A,
  49 +       MCP16502_REG_LPM,
  50 +       MCP16502_REG_HIB,
  51 +       MCP16502_REG_HPM,
  52 +       MCP16502_REG_SEQ,
  53 +       MCP16502_REG_CFG,
  54 +};
  55 +
  56  static unsigned int mcp16502_of_map_mode(unsigned int mode)
  57  {
  58         if (mode == REGULATOR_MODE_NORMAL || mode == REGULATOR_MODE_IDLE)
  59 @@ -144,22 +157,20 @@ static void mcp16502_gpio_set_mode(struc
  60  }
  61
  62  /*
  63 - * mcp16502_get_reg() - get the PMIC's configuration register for opmode
  64 + * mcp16502_get_reg() - get the PMIC's state configuration register for opmode
  65   *
  66   * @rdev: the regulator whose register we are searching
  67   * @opmode: the PMIC's operating mode ACTIVE, Low-power, Hibernate
  68   */
  69 -static int mcp16502_get_reg(struct regulator_dev *rdev, int opmode)
  70 +static int mcp16502_get_state_reg(struct regulator_dev *rdev, int opmode)
  71  {
  72 -       int reg = MCP16502_BASE(rdev_get_id(rdev));
  73 -
  74         switch (opmode) {
  75         case MCP16502_OPMODE_ACTIVE:
  76 -               return reg + MCP16502_OFFSET_MODE_A;
  77 +               return MCP16502_REG_BASE(rdev_get_id(rdev), A);
  78         case MCP16502_OPMODE_LPM:
  79 -               return reg + MCP16502_OFFSET_MODE_LPM;
  80 +               return MCP16502_REG_BASE(rdev_get_id(rdev), LPM);
  81         case MCP16502_OPMODE_HIB:
  82 -               return reg + MCP16502_OFFSET_MODE_HIB;
  83 +               return MCP16502_REG_BASE(rdev_get_id(rdev), HIB);
  84         default:
  85                 return -EINVAL;
  86         }
  87 @@ -179,7 +190,7 @@ static unsigned int mcp16502_get_mode(st
  88         unsigned int val;
  89         int ret, reg;
  90
  91 -       reg = mcp16502_get_reg(rdev, MCP16502_OPMODE_ACTIVE);
  92 +       reg = mcp16502_get_state_reg(rdev, MCP16502_OPMODE_ACTIVE);
  93         if (reg < 0)
  94                 return reg;
  95
  96 @@ -210,7 +221,7 @@ static int _mcp16502_set_mode(struct reg
  97         int val;
  98         int reg;
  99
 100 -       reg = mcp16502_get_reg(rdev, op_mode);
 101 +       reg = mcp16502_get_state_reg(rdev, op_mode);
 102         if (reg < 0)
 103                 return reg;
 104
 105 @@ -269,10 +280,10 @@ static int mcp16502_suspend_get_target_r
 106  {
 107         switch (pm_suspend_target_state) {
 108         case PM_SUSPEND_STANDBY:
 109 -               return mcp16502_get_reg(rdev, MCP16502_OPMODE_LPM);
 110 +               return mcp16502_get_state_reg(rdev, MCP16502_OPMODE_LPM);
 111         case PM_SUSPEND_ON:
 112         case PM_SUSPEND_MEM:
 113 -               return mcp16502_get_reg(rdev, MCP16502_OPMODE_HIB);
 114 +               return mcp16502_get_state_reg(rdev, MCP16502_OPMODE_HIB);
 115         default:
 116                 dev_err(&rdev->dev, "invalid suspend target: %d\n",
 117                         pm_suspend_target_state);