diff --git a/BoardConfig.mk b/BoardConfig.mk
index 79fa38b8..247db107 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -110,3 +110,6 @@ TARGET_USES_HWC2 := true
 # Display
 TARGET_HAS_WIDE_COLOR_DISPLAY := true
 TARGET_HAS_HDR_DISPLAY := false
+
+# Charger Mode
+BOARD_CHARGER_ENABLE_SUSPEND := true
diff --git a/device.mk b/device.mk
index 5f6cc509..8cd22ffb 100644
--- a/device.mk
+++ b/device.mk
@@ -421,3 +421,7 @@ PRODUCT_COPY_FILES += \
 # Provide meaningful APN configuration
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/apns-full-conf.xml:system/etc/apns-conf.xml
+
+# Use the default charger mode images
+PRODUCT_PACKAGES += \
+    charger_res_images
diff --git a/init.hardware.rc b/init.hardware.rc
index eaa6d449..7db7db64 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -17,6 +17,19 @@
 import init.${ro.hardware}.usb.rc
 import init.${ro.hardware}.diag.rc
 
+on charger
+    write /sys/devices/system/cpu/cpu2/online 0
+    write /sys/devices/system/cpu/cpu3/online 0
+    write /sys/devices/system/cpu/cpu4/online 0
+    write /sys/devices/system/cpu/cpu5/online 0
+    write /sys/devices/system/cpu/cpu6/online 0
+    write /sys/devices/system/cpu/cpu7/online 0
+    wait /dev/block/bootdevice
+
+service charger /charger
+    class charger
+    seclabel u:r:charger:s0
+
 on early-init
     mount debugfs debugfs /sys/kernel/debug
     chmod 0755 /sys/kernel/debug