Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[cascardo/linux.git] / drivers / regulator / s5m8767.c

diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 2297fdf..cbf91e2 100644 (file)
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -522,7 +522,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
        struct device_node *pmic_np, *regulators_np, *reg_np;
        struct sec_regulator_data *rdata;
        struct sec_opmode_data *rmode;
-       unsigned int i, dvs_voltage_nr = 1, ret;
+       unsigned int i, dvs_voltage_nr = 8, ret;
 
        pmic_np = iodev->dev->of_node;
        if (!pmic_np) {
@@ -586,15 +586,39 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
                rmode++;
        }
 
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL))
+       if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL)) {
                pdata->buck2_gpiodvs = true;
 
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck3-uses-gpio-dvs", NULL))
+               if (of_property_read_u32_array(pmic_np,
+                               "s5m8767,pmic-buck2-dvs-voltage",
+                               pdata->buck2_voltage, dvs_voltage_nr)) {
+                       dev_err(iodev->dev, "buck2 voltages not specified\n");
+                       return -EINVAL;
+               }
+       }
+
+       if (of_get_property(pmic_np, "s5m8767,pmic-buck3-uses-gpio-dvs", NULL)) {
                pdata->buck3_gpiodvs = true;
 
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck4-uses-gpio-dvs", NULL))
+               if (of_property_read_u32_array(pmic_np,
+                               "s5m8767,pmic-buck3-dvs-voltage",
+                               pdata->buck3_voltage, dvs_voltage_nr)) {
+                       dev_err(iodev->dev, "buck3 voltages not specified\n");
+                       return -EINVAL;
+               }
+       }
+
+       if (of_get_property(pmic_np, "s5m8767,pmic-buck4-uses-gpio-dvs", NULL)) {
                pdata->buck4_gpiodvs = true;
 
+               if (of_property_read_u32_array(pmic_np,
+                               "s5m8767,pmic-buck4-dvs-voltage",
+                               pdata->buck4_voltage, dvs_voltage_nr)) {
+                       dev_err(iodev->dev, "buck4 voltages not specified\n");
+                       return -EINVAL;
+               }
+       }
+
        if (pdata->buck2_gpiodvs || pdata->buck3_gpiodvs ||
                                                pdata->buck4_gpiodvs) {
                ret = s5m8767_pmic_dt_parse_dvs_gpio(iodev, pdata, pmic_np);
@@ -612,32 +636,26 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
                                "invalid value for default dvs index, use 0\n");
                        }
                }
-               dvs_voltage_nr = 8;
        }
 
        ret = s5m8767_pmic_dt_parse_ds_gpio(iodev, pdata, pmic_np);
        if (ret)
                return -EINVAL;
 
-       if (of_property_read_u32_array(pmic_np,
-                               "s5m8767,pmic-buck2-dvs-voltage",
-                               pdata->buck2_voltage, dvs_voltage_nr)) {
-               dev_err(iodev->dev, "buck2 voltages not specified\n");
-               return -EINVAL;
-       }
+       if (of_get_property(pmic_np, "s5m8767,pmic-buck2-ramp-enable", NULL))
+               pdata->buck2_ramp_enable = true;
 
-       if (of_property_read_u32_array(pmic_np,
-                               "s5m8767,pmic-buck3-dvs-voltage",
-                               pdata->buck3_voltage, dvs_voltage_nr)) {
-               dev_err(iodev->dev, "buck3 voltages not specified\n");
-               return -EINVAL;
-       }
+       if (of_get_property(pmic_np, "s5m8767,pmic-buck3-ramp-enable", NULL))
+               pdata->buck3_ramp_enable = true;
 
-       if (of_property_read_u32_array(pmic_np,
-                               "s5m8767,pmic-buck4-dvs-voltage",
-                               pdata->buck4_voltage, dvs_voltage_nr)) {
-               dev_err(iodev->dev, "buck4 voltages not specified\n");
-               return -EINVAL;
+       if (of_get_property(pmic_np, "s5m8767,pmic-buck4-ramp-enable", NULL))
+               pdata->buck4_ramp_enable = true;
+
+       if (pdata->buck2_ramp_enable || pdata->buck3_ramp_enable
+                       || pdata->buck4_ramp_enable) {
+               if (of_property_read_u32(pmic_np, "s5m8767,pmic-buck-ramp-delay",
+                               &pdata->buck_ramp_delay))
+                       pdata->buck_ramp_delay = 0;
        }
 
        return 0;