Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 19 Feb 2013 12:43:07 +0000 (12:43 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 19 Feb 2013 12:43:07 +0000 (12:43 +0000)
drivers/regulator/palmas-regulator.c

index cbaf22627bd35dbaeaa60bbb1e093cd380b2d63c..cde13bb5a8fbc4163eb7769b9b7e09e90eaf1d75 100644 (file)
@@ -567,11 +567,6 @@ static void palmas_dt_to_pdata(struct device *dev,
                if (!ret)
                        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)