drivers: power: add power and battery changes back in