Fix for LPM charging

Conflicts:
	arch/arm/mach-ux500/sec_common.c