diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:43:07 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:43:07 +0000 |
| commit | 728088871c867f912f8a33ea049b7c4135c95637 (patch) | |
| tree | 0395ac533e5f9c0c368044c3df60eaf1405c0649 | |
| parent | cf1466fbf8274d35a04d63a3f057b67d91afd671 (diff) | |
| parent | f33d0081ff3ffb7180a9794e60318458d7671b36 (diff) | |
| download | linux-728088871c867f912f8a33ea049b7c4135c95637.tar.bz2 | |
Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index cbaf22627bd3..cde13bb5a8fb 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -568,11 +568,6 @@ static void palmas_dt_to_pdata(struct device *dev, pdata->reg_init[idx]->mode_sleep = prop; ret = of_property_read_u32(palmas_matches[idx].of_node, - "ti,warm_reset", &prop); - if (!ret) - pdata->reg_init[idx]->warm_reset = prop; - - ret = of_property_read_u32(palmas_matches[idx].of_node, "ti,tstep", &prop); if (!ret) pdata->reg_init[idx]->tstep = prop; |