Commit d9ffae15 authored by Milo Kim's avatar Milo Kim Committed by Mark Brown

regulator: lp872x: use the private data instead of updating I2C device platform data

Currently, lp872x driver parses the DT and copies values into the
'cl->dev.platform_data' if 'of_node' exists.
This may have architectural issue. Platform data is configurable through
the DT or I2C board info inside the platform area.
However, lp872x driver changes this configuration when it is loaded.

The lp872x driver should get data from the platform side and use the private
data, 'lp872x->pdata' instead of changing the original platform data.
Signed-off-by: default avatarMilo Kim <milo.kim@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc0195aa
...@@ -903,6 +903,7 @@ static struct lp872x_platform_data ...@@ -903,6 +903,7 @@ static struct lp872x_platform_data
static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
{ {
struct lp872x *lp; struct lp872x *lp;
struct lp872x_platform_data *pdata;
int ret; int ret;
const int lp872x_num_regulators[] = { const int lp872x_num_regulators[] = {
[LP8720] = LP8720_NUM_REGULATORS, [LP8720] = LP8720_NUM_REGULATORS,
...@@ -910,8 +911,10 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) ...@@ -910,8 +911,10 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
}; };
if (cl->dev.of_node) if (cl->dev.of_node)
cl->dev.platform_data = lp872x_populate_pdata_from_dt(&cl->dev, pdata = lp872x_populate_pdata_from_dt(&cl->dev,
(enum lp872x_id)id->driver_data); (enum lp872x_id)id->driver_data);
else
pdata = dev_get_platdata(&cl->dev);
lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL); lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL);
if (!lp) if (!lp)
...@@ -927,7 +930,7 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) ...@@ -927,7 +930,7 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
} }
lp->dev = &cl->dev; lp->dev = &cl->dev;
lp->pdata = dev_get_platdata(&cl->dev); lp->pdata = pdata;
lp->chipid = id->driver_data; lp->chipid = id->driver_data;
i2c_set_clientdata(cl, lp); i2c_set_clientdata(cl, lp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment