提交 f02a3917 编写于 作者: K Kim, Milo 提交者: Mark Brown

lp8788-ldo: fix a parent device on devm_gpio_request()

 Use 'platform_device' rather than i2c client device node.
 Argument is added in lp8788_config_ldo_enable_mode().
Signed-off-by: NMilo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 939e88f0
...@@ -616,10 +616,11 @@ static struct regulator_desc lp8788_aldo_desc[] = { ...@@ -616,10 +616,11 @@ static struct regulator_desc lp8788_aldo_desc[] = {
}, },
}; };
static int lp8788_gpio_request_ldo_en(struct lp8788_ldo *ldo, static int lp8788_gpio_request_ldo_en(struct platform_device *pdev,
struct lp8788_ldo *ldo,
enum lp8788_ext_ldo_en_id id) enum lp8788_ext_ldo_en_id id)
{ {
struct device *dev = ldo->lp->dev; struct device *dev = &pdev->dev;
struct lp8788_ldo_enable_pin *pin = ldo->en_pin; struct lp8788_ldo_enable_pin *pin = ldo->en_pin;
int ret, gpio, pinstate; int ret, gpio, pinstate;
char *name[] = { char *name[] = {
...@@ -647,7 +648,8 @@ static int lp8788_gpio_request_ldo_en(struct lp8788_ldo *ldo, ...@@ -647,7 +648,8 @@ static int lp8788_gpio_request_ldo_en(struct lp8788_ldo *ldo,
return ret; return ret;
} }
static int lp8788_config_ldo_enable_mode(struct lp8788_ldo *ldo, static int lp8788_config_ldo_enable_mode(struct platform_device *pdev,
struct lp8788_ldo *ldo,
enum lp8788_ldo_id id) enum lp8788_ldo_id id)
{ {
int ret; int ret;
...@@ -693,7 +695,7 @@ static int lp8788_config_ldo_enable_mode(struct lp8788_ldo *ldo, ...@@ -693,7 +695,7 @@ static int lp8788_config_ldo_enable_mode(struct lp8788_ldo *ldo,
ldo->en_pin = pdata->ldo_pin[enable_id]; ldo->en_pin = pdata->ldo_pin[enable_id];
ret = lp8788_gpio_request_ldo_en(ldo, enable_id); ret = lp8788_gpio_request_ldo_en(pdev, ldo, enable_id);
if (ret) if (ret)
goto set_default_ldo_enable_mode; goto set_default_ldo_enable_mode;
...@@ -717,7 +719,7 @@ static int lp8788_dldo_probe(struct platform_device *pdev) ...@@ -717,7 +719,7 @@ static int lp8788_dldo_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
ldo->lp = lp; ldo->lp = lp;
ret = lp8788_config_ldo_enable_mode(ldo, lp8788_dldo_id[id]); ret = lp8788_config_ldo_enable_mode(pdev, ldo, lp8788_dldo_id[id]);
if (ret) if (ret)
return ret; return ret;
...@@ -773,7 +775,7 @@ static int lp8788_aldo_probe(struct platform_device *pdev) ...@@ -773,7 +775,7 @@ static int lp8788_aldo_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
ldo->lp = lp; ldo->lp = lp;
ret = lp8788_config_ldo_enable_mode(ldo, lp8788_aldo_id[id]); ret = lp8788_config_ldo_enable_mode(pdev, ldo, lp8788_aldo_id[id]);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册