leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Amit Daniel Kachhap 2012-12-10 18:19:41 +05:30 committed by Mark Brown
parent da130ab2df
commit 76c854d1df
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/regulator/s5m8767.c
View File

@ -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");