Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72808887 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next

parents cf1466fb f33d0081
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -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)