Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ab8500...

diff --combined drivers/regulator/as3722-regulator.c
index ad9e0c9,8558521,8558521,8558521,51c6bf9,8558521..b68f05f
--- 1/drivers/regulator/as3722-regulator.c
--- 2/drivers/regulator/as3722-regulator.c
--- 3/drivers/regulator/as3722-regulator.c
--- 4/drivers/regulator/as3722-regulator.c
--- 5/drivers/regulator/as3722-regulator.c
--- 6/drivers/regulator/as3722-regulator.c
+++ b/drivers/regulator/as3722-regulator.c
@@@@@@@ -219,7 -219,7 -219,7 -219,7 -219,7 -219,7 +219,7 @@@@@@@ static const struct as3722_register_map
        {
                .regulator_id = AS3722_REGULATOR_ID_LDO3,
                .name = "as3722-ldo3",
---- -          .name = "vin-ldo3-4",
++++ +          .sname = "vin-ldo3-4",
                .vsel_reg = AS3722_LDO3_VOLTAGE_REG,
                .vsel_mask = AS3722_LDO3_VSEL_MASK,
                .enable_reg = AS3722_LDOCONTROL0_REG,
@@@@@@@ -231,7 -231,7 -231,7 -231,7 -231,7 -231,7 +231,7 @@@@@@@
        {
                .regulator_id = AS3722_REGULATOR_ID_LDO4,
                .name = "as3722-ldo4",
---- -          .name = "vin-ldo3-4",
++++ +          .sname = "vin-ldo3-4",
                .vsel_reg = AS3722_LDO4_VOLTAGE_REG,
                .vsel_mask = AS3722_LDO_VSEL_MASK,
                .enable_reg = AS3722_LDOCONTROL0_REG,
@@@@@@@ -433,7 -433,6 -433,6 -433,6 -433,6 -433,6 +433,7 @@@@@@@ static struct regulator_ops as3722_ldo3
      };
      
      static const struct regulator_linear_range as3722_ldo_ranges[] = {
 +++++  REGULATOR_LINEAR_RANGE(0, 0x00, 0x00, 0),
        REGULATOR_LINEAR_RANGE(825000, 0x01, 0x24, 25000),
        REGULATOR_LINEAR_RANGE(1725000, 0x40, 0x7F, 25000),
      };
@@@@@@@ -610,7 -609,6 -609,6 -609,6 -609,6 -609,6 +610,7 @@@@@@@ static bool as3722_sd0_is_low_voltage(s
      }
      
      static const struct regulator_linear_range as3722_sd2345_ranges[] = {
 +++++  REGULATOR_LINEAR_RANGE(0, 0x00, 0x00, 0),
        REGULATOR_LINEAR_RANGE(612500, 0x01, 0x40, 12500),
        REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),
        REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7F, 50000),

diff --combined drivers/regulator/bcm590xx-regulator.c
index 58ece59,57544e2,57544e2,57544e2,57544e2,6ac2770..5d1fd6f
--- 1/drivers/regulator/bcm590xx-regulator.c
--- 2/drivers/regulator/bcm590xx-regulator.c
--- 3/drivers/regulator/bcm590xx-regulator.c
--- 4/drivers/regulator/bcm590xx-regulator.c
--- 5/drivers/regulator/bcm590xx-regulator.c
--- 6/drivers/regulator/bcm590xx-regulator.c
+++ b/drivers/regulator/bcm590xx-regulator.c
@@@@@@@ -22,7 -22,7 -22,7 -22,7 -22,7 -22,7 +22,7 @@@@@@@
      #include <linux/regulator/of_regulator.h>
      #include <linux/slab.h>
      
     -/* Register defs */
     +/* I2C slave 0 registers */
      #define BCM590XX_RFLDOPMCTRL1     0x60
      #define BCM590XX_IOSR1PMCTRL1     0x7a
      #define BCM590XX_IOSR2PMCTRL1     0x7c
@@@@@@@ -31,34 -31,34 -31,34 -31,34 -31,34 -31,13 +31,34 @@@@@@@
      #define BCM590XX_SDSR2PMCTRL1     0x86
      #define BCM590XX_MSRPMCTRL1       0x8a
      #define BCM590XX_VSRPMCTRL1       0x8e
     -#define BCM590XX_REG_ENABLE       BIT(7)
     -
      #define BCM590XX_RFLDOCTRL        0x96
      #define BCM590XX_CSRVOUT1 0xc0
     +
     +/* I2C slave 1 registers */
     +#define BCM590XX_GPLDO5PMCTRL1    0x16
     +#define BCM590XX_GPLDO6PMCTRL1    0x18
     +#define BCM590XX_GPLDO1CTRL       0x1a
     +#define BCM590XX_GPLDO2CTRL       0x1b
     +#define BCM590XX_GPLDO3CTRL       0x1c
     +#define BCM590XX_GPLDO4CTRL       0x1d
     +#define BCM590XX_GPLDO5CTRL       0x1e
     +#define BCM590XX_GPLDO6CTRL       0x1f
     +#define BCM590XX_OTG_CTRL 0x40
     +#define BCM590XX_GPLDO1PMCTRL1    0x57
     +#define BCM590XX_GPLDO2PMCTRL1    0x59
     +#define BCM590XX_GPLDO3PMCTRL1    0x5b
     +#define BCM590XX_GPLDO4PMCTRL1    0x5d
     +
     +#define BCM590XX_REG_ENABLE       BIT(7)
     +#define BCM590XX_VBUS_ENABLE      BIT(2)
      #define BCM590XX_LDO_VSEL_MASK    GENMASK(5, 3)
      #define BCM590XX_SR_VSEL_MASK     GENMASK(5, 0)
      
     +/*
     + * RFLDO to VSR regulators are
     + * accessed via I2C slave 0
     + */
     +
      /* LDO regulator IDs */
      #define BCM590XX_REG_RFLDO        0
      #define BCM590XX_REG_CAMLDO1      1
@@@@@@@ -83,25 -83,25 -83,25 -83,25 -83,25 -62,9 +83,25 @@@@@@@
      #define BCM590XX_REG_SDSR2        18
      #define BCM590XX_REG_VSR  19
      
     -#define BCM590XX_NUM_REGS 20
     +/*
     + * GPLDO1 to VBUS regulators are
     + * accessed via I2C slave 1
     + */
     +
     +#define BCM590XX_REG_GPLDO1       20
     +#define BCM590XX_REG_GPLDO2       21
     +#define BCM590XX_REG_GPLDO3       22
     +#define BCM590XX_REG_GPLDO4       23
     +#define BCM590XX_REG_GPLDO5       24
     +#define BCM590XX_REG_GPLDO6       25
     +#define BCM590XX_REG_VBUS 26
     +
     +#define BCM590XX_NUM_REGS 27
      
      #define BCM590XX_REG_IS_LDO(n)    (n < BCM590XX_REG_CSR)
     +#define BCM590XX_REG_IS_GPLDO(n) \
     +  ((n > BCM590XX_REG_VSR) && (n < BCM590XX_REG_VBUS))
     +#define BCM590XX_REG_IS_VBUS(n)   (n == BCM590XX_REG_VBUS)
      
      struct bcm590xx_board {
        struct regulator_init_data *bcm590xx_pmu_init_data[BCM590XX_NUM_REGS];
@@@@@@@ -119,10 -119,6 -119,6 -119,6 -119,6 -82,6 +119,10 @@@@@@@ static const unsigned int ldo_c_table[
        2900000, 3000000, 3300000,
      };
      
 +++++static const unsigned int ldo_vbus[] = {
 +++++  5000000,
 +++++};
 +++++
      /* DCDC group CSR: supported voltages in microvolts */
      static const struct regulator_linear_range dcdc_csr_ranges[] = {
        REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000),
@@@@@@@ -190,13 -186,12 -186,12 -186,12 -186,12 -149,6 +190,13 @@@@@@@ static struct bcm590xx_info bcm590xx_re
        BCM590XX_REG_RANGES(sdsr1, dcdc_sdsr1_ranges),
        BCM590XX_REG_RANGES(sdsr2, dcdc_iosr1_ranges),
        BCM590XX_REG_RANGES(vsr, dcdc_iosr1_ranges),
     +  BCM590XX_REG_TABLE(gpldo1, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo2, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo3, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo4, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo5, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo6, ldo_a_table),
 +++++  BCM590XX_REG_TABLE(vbus, ldo_vbus),
      };
      
      struct bcm590xx_reg {
@@@@@@@ -209,8 -204,8 -204,8 -204,8 -204,8 -161,6 +209,8 @@@@@@@ static int bcm590xx_get_vsel_register(i
      {
        if (BCM590XX_REG_IS_LDO(id))
                return BCM590XX_RFLDOCTRL + id;
     +  else if (BCM590XX_REG_IS_GPLDO(id))
     +          return BCM590XX_GPLDO1CTRL + id;
        else
                return BCM590XX_CSRVOUT1 + (id - BCM590XX_REG_CSR) * 3;
      }
@@@@@@@ -221,8 -216,8 -216,8 -216,8 -216,8 -171,6 +221,8 @@@@@@@ static int bcm590xx_get_enable_register
      
        if (BCM590XX_REG_IS_LDO(id))
                reg = BCM590XX_RFLDOPMCTRL1 + id * 2;
     +  else if (BCM590XX_REG_IS_GPLDO(id))
     +          reg = BCM590XX_GPLDO1PMCTRL1 + id * 2;
        else
                switch (id) {
                case BCM590XX_REG_CSR:
@@@@@@@ -243,11 -238,11 -238,11 -238,11 -238,11 -191,8 +243,11 @@@@@@@
                case BCM590XX_REG_SDSR2:
                        reg = BCM590XX_SDSR2PMCTRL1;
                        break;
     +          case BCM590XX_REG_VBUS:
     +                  reg = BCM590XX_OTG_CTRL;
                };
      
     +
        return reg;
      }
      
@@@@@@@ -271,12 -266,12 -266,12 -266,12 -266,12 -216,6 +271,12 @@@@@@@ static struct regulator_ops bcm590xx_op
        .map_voltage            = regulator_map_voltage_linear_range,
      };
      
     +static struct regulator_ops bcm590xx_ops_vbus = {
     +  .is_enabled             = regulator_is_enabled_regmap,
     +  .enable                 = regulator_enable_regmap,
     +  .disable                = regulator_disable_regmap,
     +};
     +
      #define BCM590XX_MATCH(_name, _id) \
        { \
                .name = #_name, \
@@@@@@@ -304,13 -299,13 -299,13 -299,13 -299,13 -243,6 +304,13 @@@@@@@ static struct of_regulator_match bcm590
        BCM590XX_MATCH(sdsr1, SDSR1),
        BCM590XX_MATCH(sdsr2, SDSR2),
        BCM590XX_MATCH(vsr, VSR),
     +  BCM590XX_MATCH(gpldo1, GPLDO1),
     +  BCM590XX_MATCH(gpldo2, GPLDO2),
     +  BCM590XX_MATCH(gpldo3, GPLDO3),
     +  BCM590XX_MATCH(gpldo4, GPLDO4),
     +  BCM590XX_MATCH(gpldo5, GPLDO5),
     +  BCM590XX_MATCH(gpldo6, GPLDO6),
     +  BCM590XX_MATCH(vbus, VBUS),
      };
      
      static struct bcm590xx_board *bcm590xx_parse_dt_reg_data(
@@@@@@@ -331,10 -326,10 -326,10 -326,10 -326,10 -263,8 +331,8 @@@@@@@
        }
      
        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
-----   if (!data) {
-----           dev_err(&pdev->dev, "failed to allocate regulator board data\n");
+++++   if (!data)
                return NULL;
-----   }
      
        np = of_node_get(np);
        regulators = of_get_child_by_name(np, "regulators");
@@@@@@@ -379,10 -374,10 -374,10 -374,10 -374,10 -309,8 +377,8 @@@@@@@ static int bcm590xx_probe(struct platfo
                                              &bcm590xx_reg_matches);
      
        pmu = devm_kzalloc(&pdev->dev, sizeof(*pmu), GFP_KERNEL);
-----   if (!pmu) {
-----           dev_err(&pdev->dev, "Memory allocation failed for pmu\n");
+++++   if (!pmu)
                return -ENOMEM;
-----   }
      
        pmu->mfd = bcm590xx;
      
@@@@@@@ -390,17 -385,17 -385,17 -385,17 -385,17 -318,13 +386,13 @@@@@@@
      
        pmu->desc = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
                        sizeof(struct regulator_desc), GFP_KERNEL);
-----   if (!pmu->desc) {
-----           dev_err(&pdev->dev, "Memory alloc fails for desc\n");
+++++   if (!pmu->desc)
                return -ENOMEM;
-----   }
      
        pmu->info = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
                        sizeof(struct bcm590xx_info *), GFP_KERNEL);
-----   if (!pmu->info) {
-----           dev_err(&pdev->dev, "Memory alloc fails for info\n");
+++++   if (!pmu->info)
                return -ENOMEM;
-----   }
      
        info = bcm590xx_regs;
      
@@@@@@@ -421,23 -416,23 -416,23 -416,23 -416,23 -345,17 +413,23 @@@@@@@
                pmu->desc[i].linear_ranges = info->linear_ranges;
                pmu->desc[i].n_linear_ranges = info->n_linear_ranges;
      
     -          if (BCM590XX_REG_IS_LDO(i)) {
     +          if ((BCM590XX_REG_IS_LDO(i)) || (BCM590XX_REG_IS_GPLDO(i))) {
                        pmu->desc[i].ops = &bcm590xx_ops_ldo;
                        pmu->desc[i].vsel_mask = BCM590XX_LDO_VSEL_MASK;
     -          } else {
     +          } else if (BCM590XX_REG_IS_VBUS(i))
     +                  pmu->desc[i].ops = &bcm590xx_ops_vbus;
     +          else {
                        pmu->desc[i].ops = &bcm590xx_ops_dcdc;
                        pmu->desc[i].vsel_mask = BCM590XX_SR_VSEL_MASK;
                }
      
     -          pmu->desc[i].vsel_reg = bcm590xx_get_vsel_register(i);
     -          pmu->desc[i].enable_is_inverted = true;
     -          pmu->desc[i].enable_mask = BCM590XX_REG_ENABLE;
     +          if (BCM590XX_REG_IS_VBUS(i))
     +                  pmu->desc[i].enable_mask = BCM590XX_VBUS_ENABLE;
     +          else {
     +                  pmu->desc[i].vsel_reg = bcm590xx_get_vsel_register(i);
     +                  pmu->desc[i].enable_is_inverted = true;
     +                  pmu->desc[i].enable_mask = BCM590XX_REG_ENABLE;
     +          }
                pmu->desc[i].enable_reg = bcm590xx_get_enable_register(i);
                pmu->desc[i].type = REGULATOR_VOLTAGE;
                pmu->desc[i].owner = THIS_MODULE;
@@@@@@@ -445,10 -440,10 -440,10 -440,10 -440,10 -363,7 +437,10 @@@@@@@
                config.dev = bcm590xx->dev;
                config.init_data = reg_data;
                config.driver_data = pmu;
     -          config.regmap = bcm590xx->regmap;
     +          if (BCM590XX_REG_IS_GPLDO(i) || BCM590XX_REG_IS_VBUS(i))
     +                  config.regmap = bcm590xx->regmap_sec;
     +          else
     +                  config.regmap = bcm590xx->regmap_pri;
      
                if (bcm590xx_reg_matches)
                        config.of_node = bcm590xx_reg_matches[i].of_node;