Merge remote-tracking branches 'regulator/fix/pfuze100', 'regulator/fix/s5m8767'...

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index edbb8d8,edbb8d8,ce95ed1,ce95ed1,5354d1a,ce95ed1,ce95ed1,ce95ed1..519421f
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 3/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 4/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 5/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 6/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 7/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 8/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@@@@@@@ -3,6 -3,6 -3,6 -3,6 -3,7 -3,6 -3,6 -3,6 +3,7 @@@@@@@@@ Device tree binding vendor prefix regis
        This isn't an exhaustive list, but you should add new prefixes to it before
        using them to avoid name-space collisions.
        
++++ +++active-semi     Active-Semi International Inc
        ad      Avionic Design GmbH
        adi     Analog Devices, Inc.
        aeroflexgaisler Aeroflex Gaisler AB
@@@@@@@@@ -32,14 -32,14 -32,12 -32,12 -33,12 -32,12 -32,12 -32,12 +33,14 @@@@@@@@@ est  ESTeem Wireless Modem
        fsl     Freescale Semiconductor
        GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc.
        gef     GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  ++++++gmt     Global Mixed-mode Technology, Inc.
        hisilicon       Hisilicon Limited.
        hp      Hewlett Packard
        ibm     International Business Machines (IBM)
        idt     Integrated Device Technologies, Inc.
        img     Imagination Technologies Ltd.
        intercontrol    Inter Control Group
  ++++++lg      LG Corporation
        linux   Linux-specific binding
        lsi     LSI Corp. (LSI Logic)
        marvell Marvell Technology Group Ltd.

diff --combined drivers/regulator/arizona-micsupp.c
index fd3154d,fd3154d,724706a,724706a,724706a,724706a,3c75bf8,724706a..034ece7
--- 1/drivers/regulator/arizona-micsupp.c
--- 2/drivers/regulator/arizona-micsupp.c
--- 3/drivers/regulator/arizona-micsupp.c
--- 4/drivers/regulator/arizona-micsupp.c
--- 5/drivers/regulator/arizona-micsupp.c
--- 6/drivers/regulator/arizona-micsupp.c
--- 7/drivers/regulator/arizona-micsupp.c
--- 8/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@@@@@@@@ -28,8 -28,8 -28,8 -28,8 -28,8 -28,8 -28,6 -28,8 +28,6 @@@@@@@@@
        #include <linux/mfd/arizona/pdata.h>
        #include <linux/mfd/arizona/registers.h>
        
------ -#define ARIZONA_MICSUPP_MAX_SELECTOR 0x1f
------ -
        struct arizona_micsupp {
                struct regulator_dev *regulator;
                struct arizona *arizona;
@@@@@@@@@ -40,42 -40,42 -40,42 -40,42 -40,42 -40,42 -38,6 -40,42 +38,6 @@@@@@@@@
                struct work_struct check_cp_work;
        };
        
------ -static int arizona_micsupp_list_voltage(struct regulator_dev *rdev,
------ -                                        unsigned int selector)
------ -{
------ -        if (selector > ARIZONA_MICSUPP_MAX_SELECTOR)
------ -                return -EINVAL;
------ -
------ -        if (selector == ARIZONA_MICSUPP_MAX_SELECTOR)
------ -                return 3300000;
------ -        else
------ -                return (selector * 50000) + 1700000;
------ -}
------ -
------ -static int arizona_micsupp_map_voltage(struct regulator_dev *rdev,
------ -                                       int min_uV, int max_uV)
------ -{
------ -        unsigned int voltage;
------ -        int selector;
------ -
------ -        if (min_uV < 1700000)
------ -                min_uV = 1700000;
------ -
------ -        if (min_uV > 3200000)
------ -                selector = ARIZONA_MICSUPP_MAX_SELECTOR;
------ -        else
------ -                selector = DIV_ROUND_UP(min_uV - 1700000, 50000);
------ -
------ -        if (selector < 0)
------ -                return -EINVAL;
------ -
------ -        voltage = arizona_micsupp_list_voltage(rdev, selector);
------ -        if (voltage < min_uV || voltage > max_uV)
------ -                return -EINVAL;
------ -
------ -        return selector;
------ -}
------ -
        static void arizona_micsupp_check_cp(struct work_struct *work)
        {
                struct arizona_micsupp *micsupp =
@@@@@@@@@ -145,8 -145,8 -145,8 -145,8 -145,8 -145,8 -107,8 -145,8 +107,8 @@@@@@@@@ static struct regulator_ops arizona_mic
                .disable = arizona_micsupp_disable,
                .is_enabled = regulator_is_enabled_regmap,
        
------ -        .list_voltage = arizona_micsupp_list_voltage,
------ -        .map_voltage = arizona_micsupp_map_voltage,
++++++ +        .list_voltage = regulator_list_voltage_linear_range,
++++++ +        .map_voltage = regulator_map_voltage_linear_range,
        
                .get_voltage_sel = regulator_get_voltage_sel_regmap,
                .set_voltage_sel = regulator_set_voltage_sel_regmap,
@@@@@@@@@ -155,52 -155,52 -155,25 -155,25 -155,25 -155,25 -117,33 -155,25 +117,60 @@@@@@@@@
                .set_bypass = arizona_micsupp_set_bypass,
        };
        
++++++ +static const struct regulator_linear_range arizona_micsupp_ranges[] = {
++++++ +        REGULATOR_LINEAR_RANGE(1700000, 0,    0x1e, 50000),
++++++ +        REGULATOR_LINEAR_RANGE(3300000, 0x1f, 0x1f, 0),
++++++ +};
++++++ +
        static const struct regulator_desc arizona_micsupp = {
                .name = "MICVDD",
                .supply_name = "CPVDD",
                .type = REGULATOR_VOLTAGE,
------ -        .n_voltages = ARIZONA_MICSUPP_MAX_SELECTOR + 1,
++++++ +        .n_voltages = 32,
  ++++ +        .ops = &arizona_micsupp_ops,
  ++++ +
  ++++ +        .vsel_reg = ARIZONA_LDO2_CONTROL_1,
  ++++ +        .vsel_mask = ARIZONA_LDO2_VSEL_MASK,
  ++++ +        .enable_reg = ARIZONA_MIC_CHARGE_PUMP_1,
  ++++ +        .enable_mask = ARIZONA_CPMIC_ENA,
  ++++ +        .bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
  ++++ +        .bypass_mask = ARIZONA_CPMIC_BYPASS,
  ++++ +
++++++ +        .linear_ranges = arizona_micsupp_ranges,
++++++ +        .n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ranges),
++++++ +
  ++++ +        .enable_time = 3000,
  ++++ +
  ++++ +        .owner = THIS_MODULE,
  ++++ +};
  ++++ +
  ++++++static const struct regulator_linear_range arizona_micsupp_ext_ranges[] = {
  ++++++        REGULATOR_LINEAR_RANGE(900000,  0,    0x14, 25000),
  ++++++        REGULATOR_LINEAR_RANGE(1500000, 0x15, 0x27, 100000),
  ++++++};
  ++++++
  ++++++static const struct regulator_desc arizona_micsupp_ext = {
  ++++++        .name = "MICVDD",
  ++++++        .supply_name = "CPVDD",
  ++++++        .type = REGULATOR_VOLTAGE,
  ++++++        .n_voltages = 40,
      +         .ops = &arizona_micsupp_ops,
      + 
      +         .vsel_reg = ARIZONA_LDO2_CONTROL_1,
      +         .vsel_mask = ARIZONA_LDO2_VSEL_MASK,
      +         .enable_reg = ARIZONA_MIC_CHARGE_PUMP_1,
      +         .enable_mask = ARIZONA_CPMIC_ENA,
      +         .bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
      +         .bypass_mask = ARIZONA_CPMIC_BYPASS,
      + 
  ++++++        .linear_ranges = arizona_micsupp_ext_ranges,
  ++++++        .n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ext_ranges),
  ++++++
      +         .enable_time = 3000,
      + 
      +         .owner = THIS_MODULE,
      + };
      + 
        static const struct regulator_init_data arizona_micsupp_default = {
                .constraints = {
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS |
@@@@@@@@@ -213,22 -213,22 -186,9 -186,9 -186,9 -186,9 -156,9 -186,9 +183,22 @@@@@@@@@
                .num_consumer_supplies = 1,
        };
        
  ++++++static const struct regulator_init_data arizona_micsupp_ext_default = {
  ++++++        .constraints = {
  ++++++                .valid_ops_mask = REGULATOR_CHANGE_STATUS |
  ++++++                                REGULATOR_CHANGE_VOLTAGE |
  ++++++                                REGULATOR_CHANGE_BYPASS,
  ++++++                .min_uV = 900000,
  ++++++                .max_uV = 3300000,
  ++++++        },
  ++++++
  ++++++        .num_consumer_supplies = 1,
  ++++++};
  ++++++
        static int arizona_micsupp_probe(struct platform_device *pdev)
        {
                struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
  ++++++        const struct regulator_desc *desc;
                struct regulator_config config = { };
                struct arizona_micsupp *micsupp;
                int ret;
@@@@@@@@@ -247,17 -247,17 -207,7 -207,7 -207,7 -207,7 -177,7 -207,7 +217,17 @@@@@@@@@
                 * default init_data for it.  This will be overridden with
                 * platform data if provided.
                 */
  ------        micsupp->init_data = arizona_micsupp_default;
  ++++++        switch (arizona->type) {
  ++++++        case WM5110:
  ++++++                desc = &arizona_micsupp_ext;
  ++++++                micsupp->init_data = arizona_micsupp_ext_default;
  ++++++                break;
  ++++++        default:
  ++++++                desc = &arizona_micsupp;
  ++++++                micsupp->init_data = arizona_micsupp_default;
  ++++++                break;
  ++++++        }
  ++++++
                micsupp->init_data.consumer_supplies = &micsupp->supply;
                micsupp->supply.supply = "MICVDD";
                micsupp->supply.dev_name = dev_name(arizona->dev);
@@@@@@@@@ -276,7 -276,7 -226,7 -226,7 -226,7 -226,7 -196,7 -226,7 +246,7 @@@@@@@@@
                                   ARIZONA_CPMIC_BYPASS, 0);
        
                micsupp->regulator = devm_regulator_register(&pdev->dev,
  ------                                                     &arizona_micsupp,
  ++++++                                                     desc,
                                                             &config);
                if (IS_ERR(micsupp->regulator)) {
                        ret = PTR_ERR(micsupp->regulator);

diff --combined drivers/regulator/as3722-regulator.c
index b9f1d24,b9f1d24,5917fe3,5917fe3,5917fe3,5917fe3,5917fe3,5c84ff4..8b17d78
--- 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
--- 7/drivers/regulator/as3722-regulator.c
--- 8/drivers/regulator/as3722-regulator.c
+++ b/drivers/regulator/as3722-regulator.c
@@@@@@@@@ -99,7 -99,7 -99,7 -99,7 -99,7 -99,7 -99,7 -99,6 +99,6 @@@@@@@@@ static const struct as3722_register_map
                        .sleep_ctrl_mask = AS3722_SD0_EXT_ENABLE_MASK,
                        .control_reg = AS3722_SD0_CONTROL_REG,
                        .mode_mask = AS3722_SD0_MODE_FAST,
-------                 .n_voltages = AS3722_SD0_VSEL_MAX + 1,
                },
                {
                        .regulator_id = AS3722_REGULATOR_ID_SD1,
@@@@@@@@@ -112,7 -112,7 -112,7 -112,7 -112,7 -112,7 -112,7 -111,6 +111,6 @@@@@@@@@
                        .sleep_ctrl_mask = AS3722_SD1_EXT_ENABLE_MASK,
                        .control_reg = AS3722_SD1_CONTROL_REG,
                        .mode_mask = AS3722_SD1_MODE_FAST,
-------                 .n_voltages = AS3722_SD0_VSEL_MAX + 1,
                },
                {
                        .regulator_id = AS3722_REGULATOR_ID_SD2,
@@@@@@@@@ -181,7 -181,7 -181,7 -181,7 -181,7 -181,7 -181,7 -179,6 +179,6 @@@@@@@@@
                        .sleep_ctrl_mask = AS3722_SD6_EXT_ENABLE_MASK,
                        .control_reg = AS3722_SD6_CONTROL_REG,
                        .mode_mask = AS3722_SD6_MODE_FAST,
-------                 .n_voltages = AS3722_SD0_VSEL_MAX + 1,
                },
                {
                        .regulator_id = AS3722_REGULATOR_ID_LDO0,
@@@@@@@@@ -590,11 -590,11 -590,11 -590,11 -590,11 -590,11 -590,11 -587,27 +587,27 @@@@@@@@@ static int as3722_sd016_set_current_lim
                default:
                        return -EINVAL;
                }
  ++++++        ret <<= ffs(mask) - 1;
                val = ret & mask;
  ------        val <<= ffs(mask) - 1;
                return as3722_update_bits(as3722, reg, mask, val);
        }
        
+++++++ static bool as3722_sd0_is_low_voltage(struct as3722_regulators *as3722_regs)
+++++++ {
+++++++         int err;
+++++++         unsigned val;
+++++++ 
+++++++         err = as3722_read(as3722_regs->as3722, AS3722_FUSE7_REG, &val);
+++++++         if (err < 0) {
+++++++                 dev_err(as3722_regs->dev, "Reg 0x%02x read failed: %d\n",
+++++++                         AS3722_FUSE7_REG, err);
+++++++                 return false;
+++++++         }
+++++++         if (val & AS3722_FUSE7_SD0_LOW_VOLTAGE)
+++++++                 return true;
+++++++         return false;
+++++++ }
+++++++ 
        static const struct regulator_linear_range as3722_sd2345_ranges[] = {
                REGULATOR_LINEAR_RANGE(612500, 0x01, 0x40, 12500),
                REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),
@@@@@@@@@ -820,9 -820,9 -820,9 -820,9 -820,9 -820,9 -820,9 -833,19 +833,19 @@@@@@@@@ static int as3722_regulator_probe(struc
                                        ops = &as3722_sd016_extcntrl_ops;
                                else
                                        ops = &as3722_sd016_ops;
-------                         as3722_regs->desc[id].min_uV = 610000;
+++++++                         if (id == AS3722_REGULATOR_ID_SD0 &&
+++++++                             as3722_sd0_is_low_voltage(as3722_regs)) {
+++++++                                 as3722_regs->desc[id].n_voltages =
+++++++                                         AS3722_SD0_VSEL_LOW_VOL_MAX + 1;
+++++++                                 as3722_regs->desc[id].min_uV = 410000;
+++++++                         } else {
+++++++                                 as3722_regs->desc[id].n_voltages =
+++++++                                         AS3722_SD0_VSEL_MAX + 1,
+++++++                                 as3722_regs->desc[id].min_uV = 610000;
+++++++                         }
                                as3722_regs->desc[id].uV_step = 10000;
                                as3722_regs->desc[id].linear_min_sel = 1;
+++++++                         as3722_regs->desc[id].enable_time = 600;
                                break;
                        case AS3722_REGULATOR_ID_SD2:
                        case AS3722_REGULATOR_ID_SD3:
@@@@@@@@@ -842,9 -842,9 -842,9 -842,9 -842,9 -842,9 -842,9 -865,6 +865,6 @@@@@@@@@
                                        ops = &as3722_ldo_extcntrl_ops;
                                else
                                        ops = &as3722_ldo_ops;
-------                         as3722_regs->desc[id].min_uV = 825000;
-------                         as3722_regs->desc[id].uV_step = 25000;
-------                         as3722_regs->desc[id].linear_min_sel = 1;
                                as3722_regs->desc[id].enable_time = 500;
                                as3722_regs->desc[id].linear_ranges = as3722_ldo_ranges;
                                as3722_regs->desc[id].n_linear_ranges =