diff --git a/BoardConfigPlatform.mk b/BoardConfigPlatform.mk
index e1d04fc..b6a7afc 100644
--- a/BoardConfigPlatform.mk
+++ b/BoardConfigPlatform.mk
@@ -128,10 +128,6 @@
 ### AUDIO
 USE_XML_AUDIO_POLICY_CONF := 1
 
-### CHARGER
-BOARD_CHARGER_DISABLE_INIT_BLANK := true
-BOARD_CHARGER_ENABLE_SUSPEND := true
-
 ### BLUETOOTH
 BOARD_HAVE_BLUETOOTH_SLSI := true
 
diff --git a/system.prop b/system.prop
index 3f00ac4..8b02fff 100644
--- a/system.prop
+++ b/system.prop
@@ -7,6 +7,9 @@
 ro.cmc.device_type=sd
 ro.cmc.version=2.0
 
+### CHARGER
+ro.charger.enable_suspend=true
+
 ### KEYSTORE
 ro.security.keystore.keytype=sak,gak