Commit 76c854d1 authored by Amit Daniel Kachhap's avatar Amit Daniel Kachhap Committed by Mark Brown
Browse files

regulator: s5m8767: Fix to work even if no DVS gpio present 



Signed-off-by: default avatarAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent da130ab2

drivers/regulator/s5m8767.c

+10 −7
Original line number Original line Diff line number Diff line
@@ -626,9 +626,16 @@ static __devinit int s5m8767_pmic_probe(struct platform_device *pdev) 
		}

		}

	}

	}





	if (gpio_is_valid(pdata->buck_gpios[0]) &&

	if (pdata->buck2_gpiodvs || pdata->buck3_gpiodvs ||

		gpio_is_valid(pdata->buck_gpios[1]) &&

						pdata->buck4_gpiodvs) {

		gpio_is_valid(pdata->buck_gpios[2])) {



		if (!gpio_is_valid(pdata->buck_gpios[0]) ||

			!gpio_is_valid(pdata->buck_gpios[1]) ||

			!gpio_is_valid(pdata->buck_gpios[2])) {

			dev_err(&pdev->dev, "GPIO NOT VALID\n");

			return -EINVAL;

		}



		ret = devm_gpio_request(&pdev->dev, pdata->buck_gpios[0],

		ret = devm_gpio_request(&pdev->dev, pdata->buck_gpios[0],

					"S5M8767 SET1");

					"S5M8767 SET1");

		if (ret)

		if (ret)
@@ -653,10 +660,6 @@ static __devinit int s5m8767_pmic_probe(struct platform_device *pdev) 
		/* SET3 GPIO */

		/* SET3 GPIO */

		gpio_direction_output(pdata->buck_gpios[2],

		gpio_direction_output(pdata->buck_gpios[2],

				(s5m8767->buck_gpioindex >> 0) & 0x1);

				(s5m8767->buck_gpioindex >> 0) & 0x1);

	} else {

		dev_err(&pdev->dev, "GPIO NOT VALID\n");

		ret = -EINVAL;

		return ret;

	}

	}





	ret = devm_gpio_request(&pdev->dev, pdata->buck_ds[0], "S5M8767 DS2");

	ret = devm_gpio_request(&pdev->dev, pdata->buck_ds[0], "S5M8767 DS2");