smdk4412-common: fix LPM

Change-Id: If928f8929e4960566d9f60ed7d804062363f20e8

3 files changed, 35 insertions, 73 deletions

diff --git a/common.mk b/common.mk
index fbe98fa..1c50530 100644
--- a/common.mk
+++ b/common.mk
@@ -29,7 +29,6 @@ $(call inherit-product, device/common/gps/gps_us_supl.mk)
 PRODUCT_COPY_FILES := \
     $(COMMON_PATH)/rootdir/init.smdk4x12.rc:root/init.smdk4x12.rc \
     $(COMMON_PATH)/rootdir/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
-    $(COMMON_PATH)/rootdir/lpm.rc:root/lpm.rc \
     $(COMMON_PATH)/rootdir/init.trace.rc:root/init.trace.rc \
     $(COMMON_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \
     $(COMMON_PATH)/rootdir/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index 78f12e1..16bc954 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -42,6 +42,41 @@ on fs
     chown radio system /efs
     chmod 0771 /efs
 
+on charger
+    mount ext4 /dev/block/platform/dw_mmc/by-name/SYSTEM /system ro wait noatime
+    mount ext4 /dev/block/platform/dw_mmc/by-name/USERDATA /data rw wait noatime nosuid nodev discard noauto_da_alloc journal_async_commit
+    mkdir /data/log 0777
+
+    chmod 0666 /dev/log/radio
+    chmod 0666 /dev/log/main
+    chmod 0666 /dev/log/event
+
+# CPU Frequency Governor
+    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor powersave
+
+# EHCI runtime enable for LPA
+    write /sys/devices/platform/s5p-ehci/power/control auto
+
+    ifup lo
+    hostname localhost
+    domainname localdomain
+
+    class_start default
+
+service debuggerd /system/bin/debuggerd
+
+service ueventd /sbin/ueventd
+    critical
+
+service console /system/bin/sh
+    console
+
+service healthd-charger /sbin/healthd -n
+    critical
+
+service lpm /system/bin/lpm
+    critical
+
 on post-fs-data
      # we will remap this as /mnt/sdcard with the sdcard fuse tool
      mkdir /data/media 0775 media_rw media_rw
diff --git a/rootdir/lpm.rc b/rootdir/lpm.rc
deleted file mode 100644
index 04cba30..0000000
--- a/rootdir/lpm.rc
+++ /dev/null
@@ -1,72 +0,0 @@
-on early-init
-    start ueventd
-
-on init
-    export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
-    export LD_LIBRARY_PATH /vendor/lib:/system/lib
-    export ANDROID_ROOT /system
-    export ANDROID_DATA /data
-    export EXTERNAL_STORAGE /sdcard
-
-    symlink /system/etc /etc
-    symlink /system/vendor /vendor
-
-    mkdir /sdcard
-    mkdir /preload
-    mkdir /system
-    mkdir /data
-    mkdir /cache
-    mkdir /efs
-    mkdir /tmp
-    mkdir /dbdata
-    mkdir /mnt 0775 root root
-
-    mount ext4 /dev/block/platform/dw_mmc/by-name/SYSTEM /system ro wait noatime
-    mount ext4 /dev/block/platform/dw_mmc/by-name/USERDATA /data rw wait noatime nosuid nodev discard noauto_da_alloc journal_async_commit
-
-    mkdir /data/log 0777
-
-    chmod 0666 /dev/log/radio
-    chmod 0666 /dev/log/main
-    chmod 0666 /dev/log/event
-
-    # CPU Frequency Governor
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor pegasusq
-
-    # EHCI runtime enable for LPA
-    write /sys/devices/platform/s5p-ehci/power/control auto
-
-    ifup lo
-    hostname localhost
-    domainname localdomain
-
-    class_start default
-
-service debuggerd /system/bin/debuggerd
-
-service ueventd /sbin/ueventd
-    critical
-
-service console /system/bin/sh
-    console
-
-service healthd-charger /sbin/healthd -n
-    critical
-    seclabel u:r:healthd:s0
-
-service lpm /system/bin/lpm
-    critical
-
-# adbd is controlled by the persist.service.adb.enable system property
-service adbd /sbin/adbd
-    disabled
-
-# adbd on at boot in emulator
-on property:ro.kernel.qemu=1
-    start adbd
-
-on property:persist.service.adb.enable=1
-    start adbd
-
-on property:persist.service.adb.enable=0
-    stop adbd