]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branches 'regulator/topic/ab8500', 'regulator/topic/act8865...
authorMark Brown <broonie@linaro.org>
Tue, 31 Dec 2013 17:18:46 +0000 (17:18 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 31 Dec 2013 17:18:46 +0000 (17:18 +0000)
1  2  3  4  5  6  7  8  9  10  11  12  13  14  15  16  17  18  19  20 
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/arizona-micsupp.c
drivers/regulator/as3722-regulator.c
drivers/regulator/gpio-regulator.c
drivers/regulator/pfuze100-regulator.c
drivers/regulator/s2mps11.c

Simple merge
Simple merge
index fd3154d86901fcf3865139d42bc997d72b4ff608,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,3c75bf82eeb56734ecbf2d12889c54aea87760cb,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,e87536bf0bed038f09af9bc251c85d0b00fb6c97,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,fd3154d86901fcf3865139d42bc997d72b4ff608,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226..034ece7070838991a59d45f88f0e0ace95c6abba
@@@@@@@@@@@@@@@@@@@@@ -159,48 -159,21 -159,21 -159,21 -126,24 -159,21 -159,21 -159,21 -159,21 -159,21 -159,21 -159,21 -159,21 -159,21 -159,21 -159,48 -159,21 -159,21 -159,21 -159,21 +126,51 @@@@@@@@@@@@@@@@@@@@@ static const struct regulator_desc ariz
                        .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 |
@@@@@@@@@@@@@@@@@@@@@ -275,9 -225,9 -225,9 -225,9 -195,9 -225,9 -225,9 -225,7 -225,9 -225,9 -225,9 -225,9 -225,9 -225,9 -225,9 -275,9 -225,9 -225,9 -225,9 -225,9 +245,9 @@@@@@@@@@@@@@@@@@@@@ static int arizona_micsupp_probe(struc
                        regmap_update_bits(arizona->regmap, ARIZONA_MIC_CHARGE_PUMP_1,
                                           ARIZONA_CPMIC_BYPASS, 0);
                    
       -                micsupp->regulator = regulator_register(&arizona_micsupp, &config);
       +                micsupp->regulator = devm_regulator_register(&pdev->dev,
 ------ ------- ----                                                 &arizona_micsupp,
 ++++++++++++++ ++++                                                 desc,
       +                                                             &config);
                        if (IS_ERR(micsupp->regulator)) {
                                ret = PTR_ERR(micsupp->regulator);
                                dev_err(arizona->dev, "Failed to register mic supply: %d\n",
index b9f1d24c6812eb91d0cf55031c617888b914c560,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,fdb31371a2326cbda99a15f1e51686734d1610bd,5917fe3dc983dc5335d62e393fe079459817d439,0000000000000000000000000000000000000000,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,b9f1d24c6812eb91d0cf55031c617888b914c560,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439,5917fe3dc983dc5335d62e393fe079459817d439..27fe63c175c79f5ea7f81ca2f7c807c6236db68b
mode 100644,100644,100644,100644,100644,100644,100644,000000,100644,100644,100644,100644,100644,100644,100644,100644,100644,100644,100644,100644..100644
--- /dev/null
 ------ ------- ----    val <<= ffs(mask) - 1;
       +            /*
       +             * Voltage regulator support for AMS AS3722 PMIC
       +             *
       +             * Copyright (C) 2013 ams
       +             *
       +             * Author: Florian Lobmaier <florian.lobmaier@ams.com>
       +             * Author: Laxman Dewangan <ldewangan@nvidia.com>
       +             *
       +             * This program is free software; you can redistribute it and/or modify
       +             * it under the terms of the GNU General Public License as published by
       +             * the Free Software Foundation; either version 2 of the License, or
       +             * (at your option) any later version.
       +             *
       +             * This program is distributed in the hope that it will be useful,
       +             * but WITHOUT ANY WARRANTY; without even the implied warranty of
       +             * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
       +             * GNU General Public License for more details.
       +             *
       +             * You should have received a copy of the GNU General Public License
       +             * along with this program; if not, write to the Free Software
       +             * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
       +             *
       +             */
       +            
       +            #include <linux/err.h>
       +            #include <linux/kernel.h>
       +            #include <linux/module.h>
       +            #include <linux/mfd/as3722.h>
       +            #include <linux/of.h>
       +            #include <linux/of_platform.h>
       +            #include <linux/platform_device.h>
       +            #include <linux/regulator/driver.h>
       +            #include <linux/regulator/machine.h>
       +            #include <linux/regulator/of_regulator.h>
       +            #include <linux/slab.h>
       +            
       +            /* Regulator IDs */
       +            enum as3722_regulators_id {
       +                AS3722_REGULATOR_ID_SD0,
       +                AS3722_REGULATOR_ID_SD1,
       +                AS3722_REGULATOR_ID_SD2,
       +                AS3722_REGULATOR_ID_SD3,
       +                AS3722_REGULATOR_ID_SD4,
       +                AS3722_REGULATOR_ID_SD5,
       +                AS3722_REGULATOR_ID_SD6,
       +                AS3722_REGULATOR_ID_LDO0,
       +                AS3722_REGULATOR_ID_LDO1,
       +                AS3722_REGULATOR_ID_LDO2,
       +                AS3722_REGULATOR_ID_LDO3,
       +                AS3722_REGULATOR_ID_LDO4,
       +                AS3722_REGULATOR_ID_LDO5,
       +                AS3722_REGULATOR_ID_LDO6,
       +                AS3722_REGULATOR_ID_LDO7,
       +                AS3722_REGULATOR_ID_LDO9,
       +                AS3722_REGULATOR_ID_LDO10,
       +                AS3722_REGULATOR_ID_LDO11,
       +                AS3722_REGULATOR_ID_MAX,
       +            };
       +            
       +            struct as3722_register_mapping {
       +                u8 regulator_id;
       +                const char *name;
       +                const char *sname;
       +                u8 vsel_reg;
       +                u8 vsel_mask;
       +                int n_voltages;
       +                u32 enable_reg;
       +                u8 enable_mask;
       +                u32 control_reg;
       +                u8 mode_mask;
       +                u32 sleep_ctrl_reg;
       +                u8 sleep_ctrl_mask;
       +            };
       +            
       +            struct as3722_regulator_config_data {
       +                struct regulator_init_data *reg_init;
       +                bool enable_tracking;
       +                int ext_control;
       +            };
       +            
       +            struct as3722_regulators {
       +                struct device *dev;
       +                struct as3722 *as3722;
       +                struct regulator_dev *rdevs[AS3722_REGULATOR_ID_MAX];
       +                struct regulator_desc desc[AS3722_REGULATOR_ID_MAX];
       +                struct as3722_regulator_config_data
       +                                reg_config_data[AS3722_REGULATOR_ID_MAX];
       +            };
       +            
       +            static const struct as3722_register_mapping as3722_reg_lookup[] = {
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_SD0,
       +                        .name = "as3722-sd0",
       +                        .vsel_reg = AS3722_SD0_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_SD_VSEL_MASK,
       +                        .enable_reg = AS3722_SD_CONTROL_REG,
       +                        .enable_mask = AS3722_SDn_CTRL(0),
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL1_REG,
       +                        .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,
       +                        .name = "as3722-sd1",
       +                        .vsel_reg = AS3722_SD1_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_SD_VSEL_MASK,
       +                        .enable_reg = AS3722_SD_CONTROL_REG,
       +                        .enable_mask = AS3722_SDn_CTRL(1),
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL1_REG,
       +                        .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,
       +                        .name = "as3722-sd2",
       +                        .sname = "vsup-sd2",
       +                        .vsel_reg = AS3722_SD2_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_SD_VSEL_MASK,
       +                        .enable_reg = AS3722_SD_CONTROL_REG,
       +                        .enable_mask = AS3722_SDn_CTRL(2),
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL1_REG,
       +                        .sleep_ctrl_mask = AS3722_SD2_EXT_ENABLE_MASK,
       +                        .control_reg = AS3722_SD23_CONTROL_REG,
       +                        .mode_mask = AS3722_SD2_MODE_FAST,
       +                        .n_voltages = AS3722_SD2_VSEL_MAX + 1,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_SD3,
       +                        .name = "as3722-sd3",
       +                        .sname = "vsup-sd3",
       +                        .vsel_reg = AS3722_SD3_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_SD_VSEL_MASK,
       +                        .enable_reg = AS3722_SD_CONTROL_REG,
       +                        .enable_mask = AS3722_SDn_CTRL(3),
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL1_REG,
       +                        .sleep_ctrl_mask = AS3722_SD3_EXT_ENABLE_MASK,
       +                        .control_reg = AS3722_SD23_CONTROL_REG,
       +                        .mode_mask = AS3722_SD3_MODE_FAST,
       +                        .n_voltages = AS3722_SD2_VSEL_MAX + 1,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_SD4,
       +                        .name = "as3722-sd4",
       +                        .sname = "vsup-sd4",
       +                        .vsel_reg = AS3722_SD4_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_SD_VSEL_MASK,
       +                        .enable_reg = AS3722_SD_CONTROL_REG,
       +                        .enable_mask = AS3722_SDn_CTRL(4),
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL2_REG,
       +                        .sleep_ctrl_mask = AS3722_SD4_EXT_ENABLE_MASK,
       +                        .control_reg = AS3722_SD4_CONTROL_REG,
       +                        .mode_mask = AS3722_SD4_MODE_FAST,
       +                        .n_voltages = AS3722_SD2_VSEL_MAX + 1,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_SD5,
       +                        .name = "as3722-sd5",
       +                        .sname = "vsup-sd5",
       +                        .vsel_reg = AS3722_SD5_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_SD_VSEL_MASK,
       +                        .enable_reg = AS3722_SD_CONTROL_REG,
       +                        .enable_mask = AS3722_SDn_CTRL(5),
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL2_REG,
       +                        .sleep_ctrl_mask = AS3722_SD5_EXT_ENABLE_MASK,
       +                        .control_reg = AS3722_SD5_CONTROL_REG,
       +                        .mode_mask = AS3722_SD5_MODE_FAST,
       +                        .n_voltages = AS3722_SD2_VSEL_MAX + 1,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_SD6,
       +                        .name = "as3722-sd6",
       +                        .vsel_reg = AS3722_SD6_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_SD_VSEL_MASK,
       +                        .enable_reg = AS3722_SD_CONTROL_REG,
       +                        .enable_mask = AS3722_SDn_CTRL(6),
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL2_REG,
       +                        .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,
       +                        .name = "as3722-ldo0",
       +                        .sname = "vin-ldo0",
       +                        .vsel_reg = AS3722_LDO0_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO0_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL0_REG,
       +                        .enable_mask = AS3722_LDO0_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL3_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO0_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO0_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO1,
       +                        .name = "as3722-ldo1",
       +                        .sname = "vin-ldo1-6",
       +                        .vsel_reg = AS3722_LDO1_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL0_REG,
       +                        .enable_mask = AS3722_LDO1_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL3_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO1_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO2,
       +                        .name = "as3722-ldo2",
       +                        .sname = "vin-ldo2-5-7",
       +                        .vsel_reg = AS3722_LDO2_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL0_REG,
       +                        .enable_mask = AS3722_LDO2_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL3_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO2_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO3,
       +                        .name = "as3722-ldo3",
       +                        .name = "vin-ldo3-4",
       +                        .vsel_reg = AS3722_LDO3_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO3_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL0_REG,
       +                        .enable_mask = AS3722_LDO3_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL3_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO3_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO3_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO4,
       +                        .name = "as3722-ldo4",
       +                        .name = "vin-ldo3-4",
       +                        .vsel_reg = AS3722_LDO4_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL0_REG,
       +                        .enable_mask = AS3722_LDO4_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL4_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO4_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO5,
       +                        .name = "as3722-ldo5",
       +                        .sname = "vin-ldo2-5-7",
       +                        .vsel_reg = AS3722_LDO5_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL0_REG,
       +                        .enable_mask = AS3722_LDO5_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL4_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO5_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO6,
       +                        .name = "as3722-ldo6",
       +                        .sname = "vin-ldo1-6",
       +                        .vsel_reg = AS3722_LDO6_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL0_REG,
       +                        .enable_mask = AS3722_LDO6_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL4_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO6_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO7,
       +                        .name = "as3722-ldo7",
       +                        .sname = "vin-ldo2-5-7",
       +                        .vsel_reg = AS3722_LDO7_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL0_REG,
       +                        .enable_mask = AS3722_LDO7_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL4_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO7_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO9,
       +                        .name = "as3722-ldo9",
       +                        .sname = "vin-ldo9-10",
       +                        .vsel_reg = AS3722_LDO9_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL1_REG,
       +                        .enable_mask = AS3722_LDO9_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL5_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO9_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO10,
       +                        .name = "as3722-ldo10",
       +                        .sname = "vin-ldo9-10",
       +                        .vsel_reg = AS3722_LDO10_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL1_REG,
       +                        .enable_mask = AS3722_LDO10_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL5_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO10_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +                {
       +                        .regulator_id = AS3722_REGULATOR_ID_LDO11,
       +                        .name = "as3722-ldo11",
       +                        .sname = "vin-ldo11",
       +                        .vsel_reg = AS3722_LDO11_VOLTAGE_REG,
       +                        .vsel_mask = AS3722_LDO_VSEL_MASK,
       +                        .enable_reg = AS3722_LDOCONTROL1_REG,
       +                        .enable_mask = AS3722_LDO11_CTRL,
       +                        .sleep_ctrl_reg = AS3722_ENABLE_CTRL5_REG,
       +                        .sleep_ctrl_mask = AS3722_LDO11_EXT_ENABLE_MASK,
       +                        .n_voltages = AS3722_LDO_NUM_VOLT,
       +                },
       +            };
       +            
       +            
       +            static const int as3722_ldo_current[] = { 150000, 300000 };
       +            static const int as3722_sd016_current[] = { 2500000, 3000000, 3500000 };
       +            
       +            static int as3722_current_to_index(int min_uA, int max_uA,
       +                        const int *curr_table, int n_currents)
       +            {
       +                int i;
       +            
       +                for (i = n_currents - 1; i >= 0; i--) {
       +                        if ((min_uA <= curr_table[i]) && (curr_table[i] <= max_uA))
       +                                return i;
       +                }
       +                return -EINVAL;
       +            }
       +            
       +            static int as3722_ldo_get_current_limit(struct regulator_dev *rdev)
       +            {
       +                struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
       +                struct as3722 *as3722 = as3722_regs->as3722;
       +                int id = rdev_get_id(rdev);
       +                u32 val;
       +                int ret;
       +            
       +                ret = as3722_read(as3722, as3722_reg_lookup[id].vsel_reg, &val);
       +                if (ret < 0) {
       +                        dev_err(as3722_regs->dev, "Reg 0x%02x read failed: %d\n",
       +                                as3722_reg_lookup[id].vsel_reg, ret);
       +                        return ret;
       +                }
       +                if (val & AS3722_LDO_ILIMIT_MASK)
       +                        return 300000;
       +                return 150000;
       +            }
       +            
       +            static int as3722_ldo_set_current_limit(struct regulator_dev *rdev,
       +                        int min_uA, int max_uA)
       +            {
       +                struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
       +                struct as3722 *as3722 = as3722_regs->as3722;
       +                int id = rdev_get_id(rdev);
       +                int ret;
       +                u32 reg = 0;
       +            
       +                ret = as3722_current_to_index(min_uA, max_uA, as3722_ldo_current,
       +                                        ARRAY_SIZE(as3722_ldo_current));
       +                if (ret < 0) {
       +                        dev_err(as3722_regs->dev,
       +                                "Current range min:max = %d:%d does not support\n",
       +                                min_uA, max_uA);
       +                        return ret;
       +                }
       +                if (ret)
       +                        reg = AS3722_LDO_ILIMIT_BIT;
       +                return as3722_update_bits(as3722, as3722_reg_lookup[id].vsel_reg,
       +                                AS3722_LDO_ILIMIT_MASK, reg);
       +            }
       +            
       +            static struct regulator_ops as3722_ldo0_ops = {
       +                .is_enabled = regulator_is_enabled_regmap,
       +                .enable = regulator_enable_regmap,
       +                .disable = regulator_disable_regmap,
       +                .list_voltage = regulator_list_voltage_linear,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_current_limit = as3722_ldo_get_current_limit,
       +                .set_current_limit = as3722_ldo_set_current_limit,
       +            };
       +            
       +            static struct regulator_ops as3722_ldo0_extcntrl_ops = {
       +                .list_voltage = regulator_list_voltage_linear,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_current_limit = as3722_ldo_get_current_limit,
       +                .set_current_limit = as3722_ldo_set_current_limit,
       +            };
       +            
       +            static int as3722_ldo3_set_tracking_mode(struct as3722_regulators *as3722_reg,
       +                        int id, u8 mode)
       +            {
       +                struct as3722 *as3722 = as3722_reg->as3722;
       +            
       +                switch (mode) {
       +                case AS3722_LDO3_MODE_PMOS:
       +                case AS3722_LDO3_MODE_PMOS_TRACKING:
       +                case AS3722_LDO3_MODE_NMOS:
       +                case AS3722_LDO3_MODE_SWITCH:
       +                        return as3722_update_bits(as3722,
       +                                as3722_reg_lookup[id].vsel_reg,
       +                                AS3722_LDO3_MODE_MASK, mode);
       +            
       +                default:
       +                        return -EINVAL;
       +                }
       +            }
       +            
       +            static int as3722_ldo3_get_current_limit(struct regulator_dev *rdev)
       +            {
       +                return 150000;
       +            }
       +            
       +            static struct regulator_ops as3722_ldo3_ops = {
       +                .is_enabled = regulator_is_enabled_regmap,
       +                .enable = regulator_enable_regmap,
       +                .disable = regulator_disable_regmap,
       +                .list_voltage = regulator_list_voltage_linear,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_current_limit = as3722_ldo3_get_current_limit,
       +            };
       +            
       +            static struct regulator_ops as3722_ldo3_extcntrl_ops = {
       +                .list_voltage = regulator_list_voltage_linear,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_current_limit = as3722_ldo3_get_current_limit,
       +            };
       +            
       +            static const struct regulator_linear_range as3722_ldo_ranges[] = {
       +                REGULATOR_LINEAR_RANGE(825000, 0x01, 0x24, 25000),
       +                REGULATOR_LINEAR_RANGE(1725000, 0x40, 0x7F, 25000),
       +            };
       +            
       +            static struct regulator_ops as3722_ldo_ops = {
       +                .is_enabled = regulator_is_enabled_regmap,
       +                .enable = regulator_enable_regmap,
       +                .disable = regulator_disable_regmap,
       +                .map_voltage = regulator_map_voltage_linear_range,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .list_voltage = regulator_list_voltage_linear_range,
       +                .get_current_limit = as3722_ldo_get_current_limit,
       +                .set_current_limit = as3722_ldo_set_current_limit,
       +            };
       +            
       +            static struct regulator_ops as3722_ldo_extcntrl_ops = {
       +                .map_voltage = regulator_map_voltage_linear_range,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .list_voltage = regulator_list_voltage_linear_range,
       +                .get_current_limit = as3722_ldo_get_current_limit,
       +                .set_current_limit = as3722_ldo_set_current_limit,
       +            };
       +            
       +            static unsigned int as3722_sd_get_mode(struct regulator_dev *rdev)
       +            {
       +                struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
       +                struct as3722 *as3722 = as3722_regs->as3722;
       +                int id = rdev_get_id(rdev);
       +                u32 val;
       +                int ret;
       +            
       +                if (!as3722_reg_lookup[id].control_reg)
       +                        return -ENOTSUPP;
       +            
       +                ret = as3722_read(as3722, as3722_reg_lookup[id].control_reg, &val);
       +                if (ret < 0) {
       +                        dev_err(as3722_regs->dev, "Reg 0x%02x read failed: %d\n",
       +                                as3722_reg_lookup[id].control_reg, ret);
       +                        return ret;
       +                }
       +            
       +                if (val & as3722_reg_lookup[id].mode_mask)
       +                        return REGULATOR_MODE_FAST;
       +                else
       +                        return REGULATOR_MODE_NORMAL;
       +            }
       +            
       +            static int as3722_sd_set_mode(struct regulator_dev *rdev,
       +                        unsigned int mode)
       +            {
       +                struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
       +                struct as3722 *as3722 = as3722_regs->as3722;
       +                u8 id = rdev_get_id(rdev);
       +                u8 val = 0;
       +                int ret;
       +            
       +                if (!as3722_reg_lookup[id].control_reg)
       +                        return -ERANGE;
       +            
       +                switch (mode) {
       +                case REGULATOR_MODE_FAST:
       +                        val = as3722_reg_lookup[id].mode_mask;
       +                case REGULATOR_MODE_NORMAL: /* fall down */
       +                        break;
       +                default:
       +                        return -EINVAL;
       +                }
       +            
       +                ret = as3722_update_bits(as3722, as3722_reg_lookup[id].control_reg,
       +                                as3722_reg_lookup[id].mode_mask, val);
       +                if (ret < 0) {
       +                        dev_err(as3722_regs->dev, "Reg 0x%02x update failed: %d\n",
       +                                as3722_reg_lookup[id].control_reg, ret);
       +                        return ret;
       +                }
       +                return ret;
       +            }
       +            
       +            static int as3722_sd016_get_current_limit(struct regulator_dev *rdev)
       +            {
       +                struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
       +                struct as3722 *as3722 = as3722_regs->as3722;
       +                int id = rdev_get_id(rdev);
       +                u32 val, reg;
       +                int mask;
       +                int ret;
       +            
       +                switch (id) {
       +                case AS3722_REGULATOR_ID_SD0:
       +                        reg = AS3722_OVCURRENT_REG;
       +                        mask = AS3722_OVCURRENT_SD0_TRIP_MASK;
       +                        break;
       +                case AS3722_REGULATOR_ID_SD1:
       +                        reg = AS3722_OVCURRENT_REG;
       +                        mask = AS3722_OVCURRENT_SD1_TRIP_MASK;
       +                        break;
       +                case AS3722_REGULATOR_ID_SD6:
       +                        reg = AS3722_OVCURRENT_DEB_REG;
       +                        mask = AS3722_OVCURRENT_SD6_TRIP_MASK;
       +                        break;
       +                default:
       +                        return -EINVAL;
       +                }
       +                ret = as3722_read(as3722, reg, &val);
       +                if (ret < 0) {
       +                        dev_err(as3722_regs->dev, "Reg 0x%02x read failed: %d\n",
       +                                reg, ret);
       +                        return ret;
       +                }
       +                val &= mask;
       +                val >>= ffs(mask) - 1;
       +                if (val == 3)
       +                        return -EINVAL;
       +                return as3722_sd016_current[val];
       +            }
       +            
       +            static int as3722_sd016_set_current_limit(struct regulator_dev *rdev,
       +                        int min_uA, int max_uA)
       +            {
       +                struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
       +                struct as3722 *as3722 = as3722_regs->as3722;
       +                int id = rdev_get_id(rdev);
       +                int ret;
       +                int val;
       +                int mask;
       +                u32 reg;
       +            
       +                ret = as3722_current_to_index(min_uA, max_uA, as3722_sd016_current,
       +                                        ARRAY_SIZE(as3722_sd016_current));
       +                if (ret < 0) {
       +                        dev_err(as3722_regs->dev,
       +                                "Current range min:max = %d:%d does not support\n",
       +                                min_uA, max_uA);
       +                        return ret;
       +                }
       +            
       +                switch (id) {
       +                case AS3722_REGULATOR_ID_SD0:
       +                        reg = AS3722_OVCURRENT_REG;
       +                        mask = AS3722_OVCURRENT_SD0_TRIP_MASK;
       +                        break;
       +                case AS3722_REGULATOR_ID_SD1:
       +                        reg = AS3722_OVCURRENT_REG;
       +                        mask = AS3722_OVCURRENT_SD1_TRIP_MASK;
       +                        break;
       +                case AS3722_REGULATOR_ID_SD6:
       +                        reg = AS3722_OVCURRENT_DEB_REG;
       +                        mask = AS3722_OVCURRENT_SD6_TRIP_MASK;
       +                        break;
       +                default:
       +                        return -EINVAL;
       +                }
 ++++++++++++++ ++++    ret <<= ffs(mask) - 1;
       +                val = ret & mask;
----- - ------------                    as3722_regs->desc[id].min_uV = 825000;
----- - ------------                    as3722_regs->desc[id].uV_step = 25000;
----- - ------------                    as3722_regs->desc[id].linear_min_sel = 1;
       +                return as3722_update_bits(as3722, reg, mask, val);
       +            }
       +            
       +            static const struct regulator_linear_range as3722_sd2345_ranges[] = {
       +                REGULATOR_LINEAR_RANGE(612500, 0x01, 0x40, 12500),
       +                REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),
       +                REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7F, 50000),
       +            };
       +            
       +            static struct regulator_ops as3722_sd016_ops = {
       +                .is_enabled = regulator_is_enabled_regmap,
       +                .enable = regulator_enable_regmap,
       +                .disable = regulator_disable_regmap,
       +                .list_voltage = regulator_list_voltage_linear,
       +                .map_voltage = regulator_map_voltage_linear,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_current_limit = as3722_sd016_get_current_limit,
       +                .set_current_limit = as3722_sd016_set_current_limit,
       +                .get_mode = as3722_sd_get_mode,
       +                .set_mode = as3722_sd_set_mode,
       +            };
       +            
       +            static struct regulator_ops as3722_sd016_extcntrl_ops = {
       +                .list_voltage = regulator_list_voltage_linear,
       +                .map_voltage = regulator_map_voltage_linear,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_current_limit = as3722_sd016_get_current_limit,
       +                .set_current_limit = as3722_sd016_set_current_limit,
       +                .get_mode = as3722_sd_get_mode,
       +                .set_mode = as3722_sd_set_mode,
       +            };
       +            
       +            static struct regulator_ops as3722_sd2345_ops = {
       +                .is_enabled = regulator_is_enabled_regmap,
       +                .enable = regulator_enable_regmap,
       +                .disable = regulator_disable_regmap,
       +                .list_voltage = regulator_list_voltage_linear_range,
       +                .map_voltage = regulator_map_voltage_linear_range,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .get_mode = as3722_sd_get_mode,
       +                .set_mode = as3722_sd_set_mode,
       +            };
       +            
       +            static struct regulator_ops as3722_sd2345_extcntrl_ops = {
       +                .list_voltage = regulator_list_voltage_linear_range,
       +                .map_voltage = regulator_map_voltage_linear_range,
       +                .set_voltage_sel = regulator_set_voltage_sel_regmap,
       +                .get_voltage_sel = regulator_get_voltage_sel_regmap,
       +                .get_mode = as3722_sd_get_mode,
       +                .set_mode = as3722_sd_set_mode,
       +            };
       +            
       +            static int as3722_extreg_init(struct as3722_regulators *as3722_regs, int id,
       +                        int ext_pwr_ctrl)
       +            {
       +                int ret;
       +                unsigned int val;
       +            
       +                if ((ext_pwr_ctrl < AS3722_EXT_CONTROL_ENABLE1) ||
       +                        (ext_pwr_ctrl > AS3722_EXT_CONTROL_ENABLE3))
       +                        return -EINVAL;
       +            
       +                val =  ext_pwr_ctrl << (ffs(as3722_reg_lookup[id].sleep_ctrl_mask) - 1);
       +                ret = as3722_update_bits(as3722_regs->as3722,
       +                                as3722_reg_lookup[id].sleep_ctrl_reg,
       +                                as3722_reg_lookup[id].sleep_ctrl_mask, val);
       +                if (ret < 0)
       +                        dev_err(as3722_regs->dev, "Reg 0x%02x update failed: %d\n",
       +                                as3722_reg_lookup[id].sleep_ctrl_reg, ret);
       +                return ret;
       +            }
       +            
       +            static struct of_regulator_match as3722_regulator_matches[] = {
       +                { .name = "sd0", },
       +                { .name = "sd1", },
       +                { .name = "sd2", },
       +                { .name = "sd3", },
       +                { .name = "sd4", },
       +                { .name = "sd5", },
       +                { .name = "sd6", },
       +                { .name = "ldo0", },
       +                { .name = "ldo1", },
       +                { .name = "ldo2", },
       +                { .name = "ldo3", },
       +                { .name = "ldo4", },
       +                { .name = "ldo5", },
       +                { .name = "ldo6", },
       +                { .name = "ldo7", },
       +                { .name = "ldo9", },
       +                { .name = "ldo10", },
       +                { .name = "ldo11", },
       +            };
       +            
       +            static int as3722_get_regulator_dt_data(struct platform_device *pdev,
       +                        struct as3722_regulators *as3722_regs)
       +            {
       +                struct device_node *np;
       +                struct as3722_regulator_config_data *reg_config;
       +                u32 prop;
       +                int id;
       +                int ret;
       +            
       +                np = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");
       +                if (!np) {
       +                        dev_err(&pdev->dev, "Device is not having regulators node\n");
       +                        return -ENODEV;
       +                }
       +                pdev->dev.of_node = np;
       +            
       +                ret = of_regulator_match(&pdev->dev, np, as3722_regulator_matches,
       +                                ARRAY_SIZE(as3722_regulator_matches));
       +                if (ret < 0) {
       +                        dev_err(&pdev->dev, "Parsing of regulator node failed: %d\n",
       +                                ret);
       +                        return ret;
       +                }
       +            
       +                for (id = 0; id < ARRAY_SIZE(as3722_regulator_matches); ++id) {
       +                        struct device_node *reg_node;
       +            
       +                        reg_config = &as3722_regs->reg_config_data[id];
       +                        reg_config->reg_init = as3722_regulator_matches[id].init_data;
       +                        reg_node = as3722_regulator_matches[id].of_node;
       +            
       +                        if (!reg_config->reg_init || !reg_node)
       +                                continue;
       +            
       +                        ret = of_property_read_u32(reg_node, "ams,ext-control", &prop);
       +                        if (!ret) {
       +                                if (prop < 3)
       +                                        reg_config->ext_control = prop;
       +                                else
       +                                        dev_warn(&pdev->dev,
       +                                                "ext-control have invalid option: %u\n",
       +                                                prop);
       +                        }
       +                        reg_config->enable_tracking =
       +                                of_property_read_bool(reg_node, "ams,enable-tracking");
       +                }
       +                return 0;
       +            }
       +            
       +            static int as3722_regulator_probe(struct platform_device *pdev)
       +            {
       +                struct as3722 *as3722 = dev_get_drvdata(pdev->dev.parent);
       +                struct as3722_regulators *as3722_regs;
       +                struct as3722_regulator_config_data *reg_config;
       +                struct regulator_dev *rdev;
       +                struct regulator_config config = { };
       +                struct regulator_ops *ops;
       +                int id;
       +                int ret;
       +            
       +                as3722_regs = devm_kzalloc(&pdev->dev, sizeof(*as3722_regs),
       +                                        GFP_KERNEL);
       +                if (!as3722_regs)
       +                        return -ENOMEM;
       +            
       +                as3722_regs->dev = &pdev->dev;
       +                as3722_regs->as3722 = as3722;
       +                platform_set_drvdata(pdev, as3722_regs);
       +            
       +                ret = as3722_get_regulator_dt_data(pdev, as3722_regs);
       +                if (ret < 0)
       +                        return ret;
       +            
       +                config.dev = &pdev->dev;
       +                config.driver_data = as3722_regs;
       +                config.regmap = as3722->regmap;
       +            
       +                for (id = 0; id < AS3722_REGULATOR_ID_MAX; id++) {
       +                        reg_config = &as3722_regs->reg_config_data[id];
       +            
       +                        as3722_regs->desc[id].name = as3722_reg_lookup[id].name;
       +                        as3722_regs->desc[id].supply_name = as3722_reg_lookup[id].sname;
       +                        as3722_regs->desc[id].id = as3722_reg_lookup[id].regulator_id;
       +                        as3722_regs->desc[id].n_voltages =
       +                                                as3722_reg_lookup[id].n_voltages;
       +                        as3722_regs->desc[id].type = REGULATOR_VOLTAGE;
       +                        as3722_regs->desc[id].owner = THIS_MODULE;
       +                        as3722_regs->desc[id].enable_reg =
       +                                                as3722_reg_lookup[id].enable_reg;
       +                        as3722_regs->desc[id].enable_mask =
       +                                                as3722_reg_lookup[id].enable_mask;
       +                        as3722_regs->desc[id].vsel_reg = as3722_reg_lookup[id].vsel_reg;
       +                        as3722_regs->desc[id].vsel_mask =
       +                                                as3722_reg_lookup[id].vsel_mask;
       +                        switch (id) {
       +                        case AS3722_REGULATOR_ID_LDO0:
       +                                if (reg_config->ext_control)
       +                                        ops = &as3722_ldo0_extcntrl_ops;
       +                                else
       +                                        ops = &as3722_ldo0_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;
       +                                break;
       +                        case AS3722_REGULATOR_ID_LDO3:
       +                                if (reg_config->ext_control)
       +                                        ops = &as3722_ldo3_extcntrl_ops;
       +                                else
       +                                        ops = &as3722_ldo3_ops;
       +                                as3722_regs->desc[id].min_uV = 620000;
       +                                as3722_regs->desc[id].uV_step = 20000;
       +                                as3722_regs->desc[id].linear_min_sel = 1;
       +                                as3722_regs->desc[id].enable_time = 500;
       +                                if (reg_config->enable_tracking) {
       +                                        ret = as3722_ldo3_set_tracking_mode(as3722_regs,
       +                                                id, AS3722_LDO3_MODE_PMOS_TRACKING);
       +                                        if (ret < 0) {
       +                                                dev_err(&pdev->dev,
       +                                                        "LDO3 tracking failed: %d\n",
       +                                                        ret);
       +                                                return ret;
       +                                        }
       +                                }
       +                                break;
       +                        case AS3722_REGULATOR_ID_SD0:
       +                        case AS3722_REGULATOR_ID_SD1:
       +                        case AS3722_REGULATOR_ID_SD6:
       +                                if (reg_config->ext_control)
       +                                        ops = &as3722_sd016_extcntrl_ops;
       +                                else
       +                                        ops = &as3722_sd016_ops;
       +                                as3722_regs->desc[id].min_uV = 610000;
       +                                as3722_regs->desc[id].uV_step = 10000;
       +                                as3722_regs->desc[id].linear_min_sel = 1;
       +                                break;
       +                        case AS3722_REGULATOR_ID_SD2:
       +                        case AS3722_REGULATOR_ID_SD3:
       +                        case AS3722_REGULATOR_ID_SD4:
       +                        case AS3722_REGULATOR_ID_SD5:
       +                                if (reg_config->ext_control)
       +                                        ops = &as3722_sd2345_extcntrl_ops;
       +                                else
       +                                        ops = &as3722_sd2345_ops;
       +                                as3722_regs->desc[id].linear_ranges =
       +                                                        as3722_sd2345_ranges;
       +                                as3722_regs->desc[id].n_linear_ranges =
       +                                                ARRAY_SIZE(as3722_sd2345_ranges);
       +                                break;
       +                        default:
       +                                if (reg_config->ext_control)
       +                                        ops = &as3722_ldo_extcntrl_ops;
       +                                else
       +                                        ops = &as3722_ldo_ops;
       +                                as3722_regs->desc[id].enable_time = 500;
       +                                as3722_regs->desc[id].linear_ranges = as3722_ldo_ranges;
       +                                as3722_regs->desc[id].n_linear_ranges =
       +                                                        ARRAY_SIZE(as3722_ldo_ranges);
       +                                break;
       +                        }
       +                        as3722_regs->desc[id].ops = ops;
       +                        config.init_data = reg_config->reg_init;
       +                        config.of_node = as3722_regulator_matches[id].of_node;
       +                        rdev = devm_regulator_register(&pdev->dev,
       +                                                &as3722_regs->desc[id], &config);
       +                        if (IS_ERR(rdev)) {
       +                                ret = PTR_ERR(rdev);
       +                                dev_err(&pdev->dev, "regulator %d register failed %d\n",
       +                                        id, ret);
       +                                return ret;
       +                        }
       +            
       +                        as3722_regs->rdevs[id] = rdev;
       +                        if (reg_config->ext_control) {
       +                                ret = regulator_enable_regmap(rdev);
       +                                if (ret < 0) {
       +                                        dev_err(&pdev->dev,
       +                                                "Regulator %d enable failed: %d\n",
       +                                                id, ret);
       +                                        return ret;
       +                                }
       +                                ret = as3722_extreg_init(as3722_regs, id,
       +                                                reg_config->ext_control);
       +                                if (ret < 0) {
       +                                        dev_err(&pdev->dev,
       +                                                "AS3722 ext control failed: %d", ret);
       +                                        return ret;
       +                                }
       +                        }
       +                }
       +                return 0;
       +            }
       +            
       +            static const struct of_device_id of_as3722_regulator_match[] = {
       +                { .compatible = "ams,as3722-regulator", },
       +                {},
       +            };
       +            MODULE_DEVICE_TABLE(of, of_as3722_regulator_match);
       +            
       +            static struct platform_driver as3722_regulator_driver = {
       +                .driver = {
       +                        .name = "as3722-regulator",
       +                        .owner = THIS_MODULE,
       +                        .of_match_table = of_as3722_regulator_match,
       +                },
       +                .probe = as3722_regulator_probe,
       +            };
       +            
       +            module_platform_driver(as3722_regulator_driver);
       +            
       +            MODULE_ALIAS("platform:as3722-regulator");
       +            MODULE_DESCRIPTION("AS3722 regulator driver");
       +            MODULE_AUTHOR("Florian Lobmaier <florian.lobmaier@ams.com>");
       +            MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
       +            MODULE_LICENSE("GPL");
index 234960dc96077389460632cdc832f0c6ea5e69e1,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,49fe20f58d2ab1ed85dd521354921a2e83021de3,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,234960dc96077389460632cdc832f0c6ea5e69e1,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4,04406a918c041b5773adcf9adf331eadf289caf4..c0a1d00b78c932a6982961334f9e3e9501592c50
@@@@@@@@@@@@@@@@@@@@@ -203,17 -202,13 -202,13 -202,13 -202,13 -202,13 -202,13 -203,18 -202,13 -202,13 -202,13 -202,13 -202,13 -202,13 -202,13 -203,17 -202,13 -202,13 -202,13 -202,13 +203,18 @@@@@@@@@@@@@@@@@@@@@ of_get_gpio_regulator_config(struct dev
                        }
                        config->nr_states = i;
                    
 ------ ------- ----    of_property_read_string(np, "regulator-type", &regtype);
 ------ ------- ----
 ------ ------- ----    if (!strncmp("voltage", regtype, 7))
 ------ ------- ----            config->type = REGULATOR_VOLTAGE;
 ------ ------- ----    else if (!strncmp("current", regtype, 7))
 ------ ------- ----            config->type = REGULATOR_CURRENT;
+++++++ ++++++++++++    config->type = REGULATOR_VOLTAGE;
 ++++++ +++++++ ++++    ret = of_property_read_string(np, "regulator-type", &regtype);
-              -        if (ret < 0) {
-              -                dev_err(dev, "Missing 'regulator-type' property\n");
-              -                return ERR_PTR(-EINVAL);
+++++++ ++++++++++++    if (ret >= 0) {
+++++++ ++++++++++++            if (!strncmp("voltage", regtype, 7))
+++++++ ++++++++++++                    config->type = REGULATOR_VOLTAGE;
+++++++ ++++++++++++            else if (!strncmp("current", regtype, 7))
+++++++ ++++++++++++                    config->type = REGULATOR_CURRENT;
+++++++ ++++++++++++            else
+++++++ ++++++++++++                    dev_warn(dev, "Unknown regulator-type '%s'\n",
+++++++ ++++++++++++                             regtype);
 ++++++ +++++++ ++++    }
                    
-              -        if (!strncmp("voltage", regtype, 7))
-              -                config->type = REGULATOR_VOLTAGE;
-              -        else if (!strncmp("current", regtype, 7))
-              -                config->type = REGULATOR_CURRENT;
-              -    
                        return config;
                    }
                    
Simple merge