target/linux/generic/backport-6.1/886-v6.5-regulator-axp20x-Add-AXP15060-support.patch

   1 From 9e72869d0fe12aba8cd489e485d93912b3f5c248 Mon Sep 17 00:00:00 2001
   2 From: Shengyu Qu <wiagn233@outlook.com>
   3 Date: Wed, 24 May 2023 01:00:12 +0100
   4 Subject: [PATCH] regulator: axp20x: Add AXP15060 support
   5
   6 The AXP15060 is a typical I2C-controlled PMIC, seen on multiple boards
   7 with different default register value. Current driver is tested on
   8 Starfive Visionfive 2.
   9
  10 The RTCLDO is fixed, and cannot even be turned on or off. On top of
  11 that, its voltage is customisable (either 1.8V or 3.3V). We pretend it's
  12 a fixed 1.8V regulator since other AXP driver also do like this. Also,
  13 BSP code ignores this regulator and it's not used according to VF2
  14 schematic.
  15
  16 Describe the AXP15060's voltage settings and switch registers, how the
  17 voltages are encoded, and connect this to the MFD device via its
  18 regulator ID.
  19
  20 Signed-off-by: Shengyu Qu <wiagn233@outlook.com>
  21 Signed-off-by: Andre Przywara <andre.przywara@arm.com>
  22 Reviewed-by: Mark Brown <broonie@kernel.org>
  23 Tested-by: Shengyu Qu <wiagn233@outlook.com>
  24 Link: https://lore.kernel.org/r/20230524000012.15028-4-andre.przywara@arm.com
  25 Signed-off-by: Mark Brown <broonie@kernel.org>
  26 ---
  27  drivers/regulator/axp20x-regulator.c | 232 +++++++++++++++++++++++++--
  28  1 file changed, 223 insertions(+), 9 deletions(-)
  29
  30 --- a/drivers/regulator/axp20x-regulator.c
  31 +++ b/drivers/regulator/axp20x-regulator.c
  32 @@ -275,6 +275,74 @@
  33
  34  #define AXP813_PWR_OUT_DCDC7_MASK      BIT_MASK(6)
  35
  36 +#define AXP15060_DCDC1_V_CTRL_MASK             GENMASK(4, 0)
  37 +#define AXP15060_DCDC2_V_CTRL_MASK             GENMASK(6, 0)
  38 +#define AXP15060_DCDC3_V_CTRL_MASK             GENMASK(6, 0)
  39 +#define AXP15060_DCDC4_V_CTRL_MASK             GENMASK(6, 0)
  40 +#define AXP15060_DCDC5_V_CTRL_MASK             GENMASK(6, 0)
  41 +#define AXP15060_DCDC6_V_CTRL_MASK             GENMASK(4, 0)
  42 +#define AXP15060_ALDO1_V_CTRL_MASK             GENMASK(4, 0)
  43 +#define AXP15060_ALDO2_V_CTRL_MASK             GENMASK(4, 0)
  44 +#define AXP15060_ALDO3_V_CTRL_MASK             GENMASK(4, 0)
  45 +#define AXP15060_ALDO4_V_CTRL_MASK             GENMASK(4, 0)
  46 +#define AXP15060_ALDO5_V_CTRL_MASK             GENMASK(4, 0)
  47 +#define AXP15060_BLDO1_V_CTRL_MASK             GENMASK(4, 0)
  48 +#define AXP15060_BLDO2_V_CTRL_MASK             GENMASK(4, 0)
  49 +#define AXP15060_BLDO3_V_CTRL_MASK             GENMASK(4, 0)
  50 +#define AXP15060_BLDO4_V_CTRL_MASK             GENMASK(4, 0)
  51 +#define AXP15060_BLDO5_V_CTRL_MASK             GENMASK(4, 0)
  52 +#define AXP15060_CLDO1_V_CTRL_MASK             GENMASK(4, 0)
  53 +#define AXP15060_CLDO2_V_CTRL_MASK             GENMASK(4, 0)
  54 +#define AXP15060_CLDO3_V_CTRL_MASK             GENMASK(4, 0)
  55 +#define AXP15060_CLDO4_V_CTRL_MASK             GENMASK(5, 0)
  56 +#define AXP15060_CPUSLDO_V_CTRL_MASK           GENMASK(3, 0)
  57 +
  58 +#define AXP15060_PWR_OUT_DCDC1_MASK    BIT_MASK(0)
  59 +#define AXP15060_PWR_OUT_DCDC2_MASK    BIT_MASK(1)
  60 +#define AXP15060_PWR_OUT_DCDC3_MASK    BIT_MASK(2)
  61 +#define AXP15060_PWR_OUT_DCDC4_MASK    BIT_MASK(3)
  62 +#define AXP15060_PWR_OUT_DCDC5_MASK    BIT_MASK(4)
  63 +#define AXP15060_PWR_OUT_DCDC6_MASK    BIT_MASK(5)
  64 +#define AXP15060_PWR_OUT_ALDO1_MASK    BIT_MASK(0)
  65 +#define AXP15060_PWR_OUT_ALDO2_MASK    BIT_MASK(1)
  66 +#define AXP15060_PWR_OUT_ALDO3_MASK    BIT_MASK(2)
  67 +#define AXP15060_PWR_OUT_ALDO4_MASK    BIT_MASK(3)
  68 +#define AXP15060_PWR_OUT_ALDO5_MASK    BIT_MASK(4)
  69 +#define AXP15060_PWR_OUT_BLDO1_MASK    BIT_MASK(5)
  70 +#define AXP15060_PWR_OUT_BLDO2_MASK    BIT_MASK(6)
  71 +#define AXP15060_PWR_OUT_BLDO3_MASK    BIT_MASK(7)
  72 +#define AXP15060_PWR_OUT_BLDO4_MASK    BIT_MASK(0)
  73 +#define AXP15060_PWR_OUT_BLDO5_MASK    BIT_MASK(1)
  74 +#define AXP15060_PWR_OUT_CLDO1_MASK    BIT_MASK(2)
  75 +#define AXP15060_PWR_OUT_CLDO2_MASK    BIT_MASK(3)
  76 +#define AXP15060_PWR_OUT_CLDO3_MASK    BIT_MASK(4)
  77 +#define AXP15060_PWR_OUT_CLDO4_MASK    BIT_MASK(5)
  78 +#define AXP15060_PWR_OUT_CPUSLDO_MASK  BIT_MASK(6)
  79 +#define AXP15060_PWR_OUT_SW_MASK               BIT_MASK(7)
  80 +
  81 +#define AXP15060_DCDC23_POLYPHASE_DUAL_MASK            BIT_MASK(6)
  82 +#define AXP15060_DCDC46_POLYPHASE_DUAL_MASK            BIT_MASK(7)
  83 +
  84 +#define AXP15060_DCDC234_500mV_START   0x00
  85 +#define AXP15060_DCDC234_500mV_STEPS   70
  86 +#define AXP15060_DCDC234_500mV_END             \
  87 +       (AXP15060_DCDC234_500mV_START + AXP15060_DCDC234_500mV_STEPS)
  88 +#define AXP15060_DCDC234_1220mV_START  0x47
  89 +#define AXP15060_DCDC234_1220mV_STEPS  16
  90 +#define AXP15060_DCDC234_1220mV_END            \
  91 +       (AXP15060_DCDC234_1220mV_START + AXP15060_DCDC234_1220mV_STEPS)
  92 +#define AXP15060_DCDC234_NUM_VOLTAGES  88
  93 +
  94 +#define AXP15060_DCDC5_800mV_START     0x00
  95 +#define AXP15060_DCDC5_800mV_STEPS     32
  96 +#define AXP15060_DCDC5_800mV_END               \
  97 +       (AXP15060_DCDC5_800mV_START + AXP15060_DCDC5_800mV_STEPS)
  98 +#define AXP15060_DCDC5_1140mV_START    0x21
  99 +#define AXP15060_DCDC5_1140mV_STEPS    35
 100 +#define AXP15060_DCDC5_1140mV_END              \
 101 +       (AXP15060_DCDC5_1140mV_START + AXP15060_DCDC5_1140mV_STEPS)
 102 +#define AXP15060_DCDC5_NUM_VOLTAGES    69
 103 +
 104  #define AXP_DESC_IO(_family, _id, _match, _supply, _min, _max, _step, _vreg,   \
 105                     _vmask, _ereg, _emask, _enable_val, _disable_val)           \
 106         [_family##_##_id] = {                                                   \
 107 @@ -1048,6 +1116,104 @@ static const struct regulator_desc axp81
 108                     AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_DC1SW_MASK),
 109  };
 110
 111 +static const struct linear_range axp15060_dcdc234_ranges[] = {
 112 +       REGULATOR_LINEAR_RANGE(500000,
 113 +                              AXP15060_DCDC234_500mV_START,
 114 +                              AXP15060_DCDC234_500mV_END,
 115 +                              10000),
 116 +       REGULATOR_LINEAR_RANGE(1220000,
 117 +                              AXP15060_DCDC234_1220mV_START,
 118 +                              AXP15060_DCDC234_1220mV_END,
 119 +                              20000),
 120 +};
 121 +
 122 +static const struct linear_range axp15060_dcdc5_ranges[] = {
 123 +       REGULATOR_LINEAR_RANGE(800000,
 124 +                              AXP15060_DCDC5_800mV_START,
 125 +                              AXP15060_DCDC5_800mV_END,
 126 +                              10000),
 127 +       REGULATOR_LINEAR_RANGE(1140000,
 128 +                              AXP15060_DCDC5_1140mV_START,
 129 +                              AXP15060_DCDC5_1140mV_END,
 130 +                              20000),
 131 +};
 132 +
 133 +static const struct regulator_desc axp15060_regulators[] = {
 134 +       AXP_DESC(AXP15060, DCDC1, "dcdc1", "vin1", 1500, 3400, 100,
 135 +                AXP15060_DCDC1_V_CTRL, AXP15060_DCDC1_V_CTRL_MASK,
 136 +                AXP15060_PWR_OUT_CTRL1, AXP15060_PWR_OUT_DCDC1_MASK),
 137 +       AXP_DESC_RANGES(AXP15060, DCDC2, "dcdc2", "vin2",
 138 +                       axp15060_dcdc234_ranges, AXP15060_DCDC234_NUM_VOLTAGES,
 139 +                       AXP15060_DCDC2_V_CTRL, AXP15060_DCDC2_V_CTRL_MASK,
 140 +                       AXP15060_PWR_OUT_CTRL1, AXP15060_PWR_OUT_DCDC2_MASK),
 141 +       AXP_DESC_RANGES(AXP15060, DCDC3, "dcdc3", "vin3",
 142 +                       axp15060_dcdc234_ranges, AXP15060_DCDC234_NUM_VOLTAGES,
 143 +                       AXP15060_DCDC3_V_CTRL, AXP15060_DCDC3_V_CTRL_MASK,
 144 +                       AXP15060_PWR_OUT_CTRL1, AXP15060_PWR_OUT_DCDC3_MASK),
 145 +       AXP_DESC_RANGES(AXP15060, DCDC4, "dcdc4", "vin4",
 146 +                       axp15060_dcdc234_ranges, AXP15060_DCDC234_NUM_VOLTAGES,
 147 +                       AXP15060_DCDC4_V_CTRL, AXP15060_DCDC4_V_CTRL_MASK,
 148 +                       AXP15060_PWR_OUT_CTRL1, AXP15060_PWR_OUT_DCDC4_MASK),
 149 +       AXP_DESC_RANGES(AXP15060, DCDC5, "dcdc5", "vin5",
 150 +                       axp15060_dcdc5_ranges, AXP15060_DCDC5_NUM_VOLTAGES,
 151 +                       AXP15060_DCDC5_V_CTRL, AXP15060_DCDC5_V_CTRL_MASK,
 152 +                       AXP15060_PWR_OUT_CTRL1, AXP15060_PWR_OUT_DCDC5_MASK),
 153 +       AXP_DESC(AXP15060, DCDC6, "dcdc6", "vin6", 500, 3400, 100,
 154 +                AXP15060_DCDC6_V_CTRL, AXP15060_DCDC6_V_CTRL_MASK,
 155 +                AXP15060_PWR_OUT_CTRL1, AXP15060_PWR_OUT_DCDC6_MASK),
 156 +       AXP_DESC(AXP15060, ALDO1, "aldo1", "aldoin", 700, 3300, 100,
 157 +                AXP15060_ALDO1_V_CTRL, AXP15060_ALDO1_V_CTRL_MASK,
 158 +                AXP15060_PWR_OUT_CTRL2, AXP15060_PWR_OUT_ALDO1_MASK),
 159 +       AXP_DESC(AXP15060, ALDO2, "aldo2", "aldoin", 700, 3300, 100,
 160 +                AXP15060_ALDO2_V_CTRL, AXP15060_ALDO2_V_CTRL_MASK,
 161 +                AXP15060_PWR_OUT_CTRL2, AXP15060_PWR_OUT_ALDO2_MASK),
 162 +       AXP_DESC(AXP15060, ALDO3, "aldo3", "aldoin", 700, 3300, 100,
 163 +                AXP15060_ALDO3_V_CTRL, AXP15060_ALDO3_V_CTRL_MASK,
 164 +                AXP15060_PWR_OUT_CTRL2, AXP15060_PWR_OUT_ALDO3_MASK),
 165 +       AXP_DESC(AXP15060, ALDO4, "aldo4", "aldoin", 700, 3300, 100,
 166 +                AXP15060_ALDO4_V_CTRL, AXP15060_ALDO4_V_CTRL_MASK,
 167 +                AXP15060_PWR_OUT_CTRL2, AXP15060_PWR_OUT_ALDO4_MASK),
 168 +       AXP_DESC(AXP15060, ALDO5, "aldo5", "aldoin", 700, 3300, 100,
 169 +                AXP15060_ALDO5_V_CTRL, AXP15060_ALDO5_V_CTRL_MASK,
 170 +                AXP15060_PWR_OUT_CTRL2, AXP15060_PWR_OUT_ALDO5_MASK),
 171 +       AXP_DESC(AXP15060, BLDO1, "bldo1", "bldoin", 700, 3300, 100,
 172 +                AXP15060_BLDO1_V_CTRL, AXP15060_BLDO1_V_CTRL_MASK,
 173 +                AXP15060_PWR_OUT_CTRL2, AXP15060_PWR_OUT_BLDO1_MASK),
 174 +       AXP_DESC(AXP15060, BLDO2, "bldo2", "bldoin", 700, 3300, 100,
 175 +                AXP15060_BLDO2_V_CTRL, AXP15060_BLDO2_V_CTRL_MASK,
 176 +                AXP15060_PWR_OUT_CTRL2, AXP15060_PWR_OUT_BLDO2_MASK),
 177 +       AXP_DESC(AXP15060, BLDO3, "bldo3", "bldoin", 700, 3300, 100,
 178 +                AXP15060_BLDO3_V_CTRL, AXP15060_BLDO3_V_CTRL_MASK,
 179 +                AXP15060_PWR_OUT_CTRL2, AXP15060_PWR_OUT_BLDO3_MASK),
 180 +       AXP_DESC(AXP15060, BLDO4, "bldo4", "bldoin", 700, 3300, 100,
 181 +                AXP15060_BLDO4_V_CTRL, AXP15060_BLDO4_V_CTRL_MASK,
 182 +                AXP15060_PWR_OUT_CTRL3, AXP15060_PWR_OUT_BLDO4_MASK),
 183 +       AXP_DESC(AXP15060, BLDO5, "bldo5", "bldoin", 700, 3300, 100,
 184 +                AXP15060_BLDO5_V_CTRL, AXP15060_BLDO5_V_CTRL_MASK,
 185 +                AXP15060_PWR_OUT_CTRL3, AXP15060_PWR_OUT_BLDO5_MASK),
 186 +       AXP_DESC(AXP15060, CLDO1, "cldo1", "cldoin", 700, 3300, 100,
 187 +                AXP15060_CLDO1_V_CTRL, AXP15060_CLDO1_V_CTRL_MASK,
 188 +                AXP15060_PWR_OUT_CTRL3, AXP15060_PWR_OUT_CLDO1_MASK),
 189 +       AXP_DESC(AXP15060, CLDO2, "cldo2", "cldoin", 700, 3300, 100,
 190 +                AXP15060_CLDO2_V_CTRL, AXP15060_CLDO2_V_CTRL_MASK,
 191 +                AXP15060_PWR_OUT_CTRL3, AXP15060_PWR_OUT_CLDO2_MASK),
 192 +       AXP_DESC(AXP15060, CLDO3, "cldo3", "cldoin", 700, 3300, 100,
 193 +                AXP15060_CLDO3_V_CTRL, AXP15060_CLDO3_V_CTRL_MASK,
 194 +                AXP15060_PWR_OUT_CTRL3, AXP15060_PWR_OUT_CLDO3_MASK),
 195 +       AXP_DESC(AXP15060, CLDO4, "cldo4", "cldoin", 700, 4200, 100,
 196 +                AXP15060_CLDO4_V_CTRL, AXP15060_CLDO4_V_CTRL_MASK,
 197 +                AXP15060_PWR_OUT_CTRL3, AXP15060_PWR_OUT_CLDO4_MASK),
 198 +       /* Supply comes from DCDC5 */
 199 +       AXP_DESC(AXP15060, CPUSLDO, "cpusldo", NULL, 700, 1400, 50,
 200 +                AXP15060_CPUSLDO_V_CTRL, AXP15060_CPUSLDO_V_CTRL_MASK,
 201 +                AXP15060_PWR_OUT_CTRL3, AXP15060_PWR_OUT_CPUSLDO_MASK),
 202 +       /* Supply comes from DCDC1 */
 203 +       AXP_DESC_SW(AXP15060, SW, "sw", NULL,
 204 +                   AXP15060_PWR_OUT_CTRL3, AXP15060_PWR_OUT_SW_MASK),
 205 +       /* Supply comes from ALDO1 */
 206 +       AXP_DESC_FIXED(AXP15060, RTC_LDO, "rtc-ldo", NULL, 1800),
 207 +};
 208 +
 209  static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
 210  {
 211         struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
 212 @@ -1088,10 +1254,11 @@ static int axp20x_set_dcdc_freq(struct p
 213                 step = 150;
 214                 break;
 215         case AXP313A_ID:
 216 +       case AXP15060_ID:
 217                 /* The DCDC PWM frequency seems to be fixed to 3 MHz. */
 218                 if (dcdcfreq != 0) {
 219                         dev_err(&pdev->dev,
 220 -                               "DCDC frequency on AXP313a is fixed to 3 MHz.\n");
 221 +                               "DCDC frequency on this PMIC is fixed to 3 MHz.\n");
 222                         return -EINVAL;
 223                 }
 224
 225 @@ -1201,6 +1368,15 @@ static int axp20x_set_dcdc_workmode(stru
 226                 workmode <<= id - AXP813_DCDC1;
 227                 break;
 228
 229 +       case AXP15060_ID:
 230 +               reg = AXP15060_DCDC_MODE_CTRL2;
 231 +               if (id < AXP15060_DCDC1 || id > AXP15060_DCDC6)
 232 +                       return -EINVAL;
 233 +
 234 +               mask = AXP22X_WORKMODE_DCDCX_MASK(id - AXP15060_DCDC1);
 235 +               workmode <<= id - AXP15060_DCDC1;
 236 +               break;
 237 +
 238         default:
 239                 /* should not happen */
 240                 WARN_ON(1);
 241 @@ -1220,7 +1396,7 @@ static bool axp20x_is_polyphase_slave(st
 242
 243         /*
 244          * Currently in our supported AXP variants, only AXP803, AXP806,
 245 -        * and AXP813 have polyphase regulators.
 246 +        * AXP813 and AXP15060 have polyphase regulators.
 247          */
 248         switch (axp20x->variant) {
 249         case AXP803_ID:
 250 @@ -1252,6 +1428,17 @@ static bool axp20x_is_polyphase_slave(st
 251                 }
 252                 break;
 253
 254 +       case AXP15060_ID:
 255 +               regmap_read(axp20x->regmap, AXP15060_DCDC_MODE_CTRL1, &reg);
 256 +
 257 +               switch (id) {
 258 +               case AXP15060_DCDC3:
 259 +                       return !!(reg & AXP15060_DCDC23_POLYPHASE_DUAL_MASK);
 260 +               case AXP15060_DCDC6:
 261 +                       return !!(reg & AXP15060_DCDC46_POLYPHASE_DUAL_MASK);
 262 +               }
 263 +               break;
 264 +
 265         default:
 266                 return false;
 267         }
 268 @@ -1273,6 +1460,7 @@ static int axp20x_regulator_probe(struct
 269         u32 workmode;
 270         const char *dcdc1_name = axp22x_regulators[AXP22X_DCDC1].name;
 271         const char *dcdc5_name = axp22x_regulators[AXP22X_DCDC5].name;
 272 +       const char *aldo1_name = axp15060_regulators[AXP15060_ALDO1].name;
 273         bool drivevbus = false;
 274
 275         switch (axp20x->variant) {
 276 @@ -1312,6 +1500,10 @@ static int axp20x_regulator_probe(struct
 277                 drivevbus = of_property_read_bool(pdev->dev.parent->of_node,
 278                                                   "x-powers,drive-vbus-en");
 279                 break;
 280 +       case AXP15060_ID:
 281 +               regulators = axp15060_regulators;
 282 +               nregulators = AXP15060_REG_ID_MAX;
 283 +               break;
 284         default:
 285                 dev_err(&pdev->dev, "Unsupported AXP variant: %ld\n",
 286                         axp20x->variant);
 287 @@ -1338,8 +1530,9 @@ static int axp20x_regulator_probe(struct
 288                         continue;
 289
 290                 /*
 291 -                * Regulators DC1SW and DC5LDO are connected internally,
 292 -                * so we have to handle their supply names separately.
 293 +                * Regulators DC1SW, DC5LDO and RTCLDO on AXP15060 are
 294 +                * connected internally, so we have to handle their supply
 295 +                * names separately.
 296                  *
 297                  * We always register the regulators in proper sequence,
 298                  * so the supply names are correctly read. See the last
 299 @@ -1348,7 +1541,8 @@ static int axp20x_regulator_probe(struct
 300                  */
 301                 if ((regulators == axp22x_regulators && i == AXP22X_DC1SW) ||
 302                     (regulators == axp803_regulators && i == AXP803_DC1SW) ||
 303 -                   (regulators == axp809_regulators && i == AXP809_DC1SW)) {
 304 +                   (regulators == axp809_regulators && i == AXP809_DC1SW) ||
 305 +                   (regulators == axp15060_regulators && i == AXP15060_SW)) {
 306                         new_desc = devm_kzalloc(&pdev->dev, sizeof(*desc),
 307                                                 GFP_KERNEL);
 308                         if (!new_desc)
 309 @@ -1360,7 +1554,8 @@ static int axp20x_regulator_probe(struct
 310                 }
 311
 312                 if ((regulators == axp22x_regulators && i == AXP22X_DC5LDO) ||
 313 -                   (regulators == axp809_regulators && i == AXP809_DC5LDO)) {
 314 +                   (regulators == axp809_regulators && i == AXP809_DC5LDO) ||
 315 +                   (regulators == axp15060_regulators && i == AXP15060_CPUSLDO)) {
 316                         new_desc = devm_kzalloc(&pdev->dev, sizeof(*desc),
 317                                                 GFP_KERNEL);
 318                         if (!new_desc)
 319 @@ -1371,6 +1566,18 @@ static int axp20x_regulator_probe(struct
 320                         desc = new_desc;
 321                 }
 322
 323 +
 324 +               if (regulators == axp15060_regulators && i == AXP15060_RTC_LDO) {
 325 +                       new_desc = devm_kzalloc(&pdev->dev, sizeof(*desc),
 326 +                                               GFP_KERNEL);
 327 +                       if (!new_desc)
 328 +                               return -ENOMEM;
 329 +
 330 +                       *new_desc = regulators[i];
 331 +                       new_desc->supply_name = aldo1_name;
 332 +                       desc = new_desc;
 333 +               }
 334 +
 335                 rdev = devm_regulator_register(&pdev->dev, desc, &config);
 336                 if (IS_ERR(rdev)) {
 337                         dev_err(&pdev->dev, "Failed to register %s\n",
 338 @@ -1389,19 +1596,26 @@ static int axp20x_regulator_probe(struct
 339                 }
 340
 341                 /*
 342 -                * Save AXP22X DCDC1 / DCDC5 regulator names for later.
 343 +                * Save AXP22X DCDC1 / DCDC5 / AXP15060 ALDO1 regulator names for later.
 344                  */
 345                 if ((regulators == axp22x_regulators && i == AXP22X_DCDC1) ||
 346 -                   (regulators == axp809_regulators && i == AXP809_DCDC1))
 347 +                   (regulators == axp809_regulators && i == AXP809_DCDC1) ||
 348 +                   (regulators == axp15060_regulators && i == AXP15060_DCDC1))
 349                         of_property_read_string(rdev->dev.of_node,
 350                                                 "regulator-name",
 351                                                 &dcdc1_name);
 352
 353                 if ((regulators == axp22x_regulators && i == AXP22X_DCDC5) ||
 354 -                   (regulators == axp809_regulators && i == AXP809_DCDC5))
 355 +                   (regulators == axp809_regulators && i == AXP809_DCDC5) ||
 356 +                   (regulators == axp15060_regulators && i == AXP15060_DCDC5))
 357                         of_property_read_string(rdev->dev.of_node,
 358                                                 "regulator-name",
 359                                                 &dcdc5_name);
 360 +
 361 +               if (regulators == axp15060_regulators && i == AXP15060_ALDO1)
 362 +                       of_property_read_string(rdev->dev.of_node,
 363 +                                               "regulator-name",
 364 +                                               &aldo1_name);
 365         }
 366
 367         if (drivevbus) {