mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
backlight: lp855x: Use private data for regulator control
LP855x backlight device can be enabled by external VDD input. The 'supply' data is used for this purpose. It's kind of private data which runs internally, so there is no reason to expose to the platform data. And devm_regulator_get() is moved from _parse_dt() to _probe(). Regulator consumer(lp855x) can control regulator not only from DT but also from platform data configuration in a source file such like board-*.c. Signed-off-by: Milo Kim <[email protected]> Acked-by: Sean Paul <[email protected]> Acked-by: Jingoo Han <[email protected]> Signed-off-by: Lee Jones <[email protected]>
This commit is contained in:
parent
bc0195aad0
commit
fe009175ae
2 changed files with 12 additions and 13 deletions
|
|
@ -73,6 +73,7 @@ struct lp855x {
|
|||
struct device *dev;
|
||||
struct lp855x_platform_data *pdata;
|
||||
struct pwm_device *pwm;
|
||||
struct regulator *supply; /* regulator for VDD input */
|
||||
};
|
||||
|
||||
static int lp855x_write_byte(struct lp855x *lp, u8 reg, u8 data)
|
||||
|
|
@ -378,13 +379,6 @@ static int lp855x_parse_dt(struct lp855x *lp)
|
|||
pdata->rom_data = &rom[0];
|
||||
}
|
||||
|
||||
pdata->supply = devm_regulator_get(dev, "power");
|
||||
if (IS_ERR(pdata->supply)) {
|
||||
if (PTR_ERR(pdata->supply) == -EPROBE_DEFER)
|
||||
return -EPROBE_DEFER;
|
||||
pdata->supply = NULL;
|
||||
}
|
||||
|
||||
lp->pdata = pdata;
|
||||
|
||||
return 0;
|
||||
|
|
@ -425,8 +419,15 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
|
|||
else
|
||||
lp->mode = REGISTER_BASED;
|
||||
|
||||
if (lp->pdata->supply) {
|
||||
ret = regulator_enable(lp->pdata->supply);
|
||||
lp->supply = devm_regulator_get(lp->dev, "power");
|
||||
if (IS_ERR(lp->supply)) {
|
||||
if (PTR_ERR(lp->supply) == -EPROBE_DEFER)
|
||||
return -EPROBE_DEFER;
|
||||
lp->supply = NULL;
|
||||
}
|
||||
|
||||
if (lp->supply) {
|
||||
ret = regulator_enable(lp->supply);
|
||||
if (ret < 0) {
|
||||
dev_err(&cl->dev, "failed to enable supply: %d\n", ret);
|
||||
return ret;
|
||||
|
|
@ -464,8 +465,8 @@ static int lp855x_remove(struct i2c_client *cl)
|
|||
|
||||
lp->bl->props.brightness = 0;
|
||||
backlight_update_status(lp->bl);
|
||||
if (lp->pdata->supply)
|
||||
regulator_disable(lp->pdata->supply);
|
||||
if (lp->supply)
|
||||
regulator_disable(lp->supply);
|
||||
sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue