summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 12:43:07 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 12:43:07 +0000
commit728088871c867f912f8a33ea049b7c4135c95637 (patch)
tree0395ac533e5f9c0c368044c3df60eaf1405c0649 /drivers/regulator
parentcf1466fbf8274d35a04d63a3f057b67d91afd671 (diff)
parentf33d0081ff3ffb7180a9794e60318458d7671b36 (diff)
downloadop-kernel-dev-728088871c867f912f8a33ea049b7c4135c95637.zip
op-kernel-dev-728088871c867f912f8a33ea049b7c4135c95637.tar.gz
Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/palmas-regulator.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index cbaf226..cde13bb 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;
OpenPOWER on IntegriCloud