Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/st-pwm...

[karo-tx-linux.git] / drivers / regulator / arizona-ldo1.c

diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 4f6c2055f6b210436a5c1a9565b9f302ecdd21da..b1033d30b504c70cd50364bd5dcbdbca198474f6 100644 (file)
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -153,11 +153,9 @@ static const struct regulator_desc arizona_ldo1 = {
 
        .vsel_reg = ARIZONA_LDO1_CONTROL_1,
        .vsel_mask = ARIZONA_LDO1_VSEL_MASK,
-       .bypass_reg = ARIZONA_LDO1_CONTROL_1,
-       .bypass_mask = ARIZONA_LDO1_BYPASS,
        .min_uV = 900000,
-       .uV_step = 50000,
-       .n_voltages = 7,
+       .uV_step = 25000,
+       .n_voltages = 13,
        .enable_time = 500,
 
        .owner = THIS_MODULE,
@@ -189,10 +187,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
        int ret;
 
        ldo1 = devm_kzalloc(&pdev->dev, sizeof(*ldo1), GFP_KERNEL);
-       if (ldo1 == NULL) {
-               dev_err(&pdev->dev, "Unable to allocate private data\n");
+       if (!ldo1)
                return -ENOMEM;
-       }
 
        ldo1->arizona = arizona;
 
@@ -203,6 +199,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
         */
        switch (arizona->type) {
        case WM5102:
+       case WM8997:
                desc = &arizona_ldo1_hc;
                ldo1->init_data = arizona_ldo1_dvfs;
                break;