Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04f9f068 authored by Chanwoo Choi's avatar Chanwoo Choi Committed by Mark Brown
Browse files

regulator: s5m8767: Modify parsing method of the voltage table of buck2/3/4 



The s5m8767 regulator driver parse always the voltage table of buck2/3/4.
If gpio_dvs feature isn't used and dts haven't included the voltage table
of buck2/3/4, s5m8767 regulator driver return error and file probe state.

This patch check only voltage table of buck on s5m8767_pmic_dt_parse_pdata()
if buck[2-4]_gpiodvs is true.

Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarYoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 033054e8

drivers/regulator/s5m8767.c

+28 −26
Original line number Diff line number Diff line
@@ -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,34 +636,12 @@ 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_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_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-buck2-ramp-enable", NULL))

		pdata->buck2_ramp_enable = true;