power:cpcap_battery: adapt last changes and fix mistakes