peach: rebase device tree

4 files changed, 19 insertions, 193 deletions

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 651f223..bd64b4c 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -17,11 +17,3 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.target.rc
 LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.target.power.rc
-LOCAL_MODULE_TAGS  := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.target.power.rc
-LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
-include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 06db740..c333612 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -2,16 +2,15 @@
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
-/dev/block/bootdevice/by-name/system         /system      ext4    ro,barrier=0                                                wait
-/dev/block/bootdevice/by-name/userdata       /data        ext4    noatime,nosuid,nodev,barrier=0,noauto_da_alloc              wait,check,formattable,encryptable=footer,length=-16384
-/dev/block/bootdevice/by-name/cache          /cache       ext4    noatime,nodiratime,nosuid,nodev,barrier=0,noauto_da_alloc   wait,check
-/dev/block/bootdevice/by-name/persist        /persist     ext4    noatime,nodiratime,nosuid,nodev,barrier=0,noauto_da_alloc   wait,notrim
+/dev/block/bootdevice/by-name/system         /system      ext4    ro,barrier=1                                                wait
+/dev/block/bootdevice/by-name/userdata       /data        ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc              wait,check,formattable,encryptable=footer,length=-16384
+/dev/block/bootdevice/by-name/cache          /cache       ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc              wait,check,formattable
+/dev/block/bootdevice/by-name/persist        /persist     ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc              wait
 /dev/block/bootdevice/by-name/boot           /boot        emmc    defaults                                                    defaults
 /dev/block/bootdevice/by-name/recovery       /recovery    emmc    defaults                                                    defaults
 /dev/block/bootdevice/by-name/misc           /misc        emmc    defaults                                                    defaults
-/dev/block/bootdevice/by-name/config         /frp         emmc    defaults                                                    defaults
 /dev/block/bootdevice/by-name/modem          /firmware    vfat    ro,shortname=lower,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0    wait
+/dev/block/bootdevice/by-name/oem            /oem         ext4	  ro,context=u:object_r:oemfs:s0,nosuid,nodev                 wait
 
-/devices/soc.0/7864900.sdhci/mmc_host*       auto         auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/platform/msm_hsusb*                 auto         auto    defaults                                                    voldmanaged=usbdisk:auto
-/dev/block/zram0                             none         swap    defaults zramsize=268435456,zramstreams=4,notrim
+/devices/soc.0/7864900.sdhci/mmc_host*        auto	   auto	   defaults                                          	       voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/platform/msm_hsusb*                  auto	   auto    defaults                                                    voldmanaged=usb:auto
diff --git a/rootdir/etc/init.target.power.rc b/rootdir/etc/init.target.power.rc
deleted file mode 100644
index 18a343d..0000000
--- a/rootdir/etc/init.target.power.rc
+++ /dev/null
@@ -1,74 +0,0 @@
-on early-init
-
-on enable-target-low-power
-
-    # Adaptive LMK
-    write /sys/module/lowmemorykiller/parameters/enable_adaptive_lmk 1
-    write /sys/module/lowmemorykiller/parameters/vmpressure_file_min 53059
-
-    write /sys/module/lpm_levels/parameters/sleep_disabled 0
-
-    # HMP scheduler load tracking settings
-    write /proc/sys/kernel/sched_window_stats_policy 3
-    write /proc/sys/kernel/sched_ravg_hist_size 3
-
-    # HMP Task packing settings for 8916
-    write /proc/sys/kernel/sched_small_task 50
-    write /proc/sys/kernel/sched_mostly_idle_load 50
-    write /proc/sys/kernel/sched_mostly_idle_nr_run 3
-
-    # disable thermal core_control to update scaling_min_freq
-    write /sys/module/msm_thermal/core_control/enabled 0
-    write /sys/devices/system/cpu/cpu0/online 1
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq 400000
-    # enable thermal core_control now
-    write /sys/module/msm_thermal/core_control/enabled 1
-
-    write /sys/module/cpu_boost/parameters/boost_ms 20
-    write /sys/module/cpu_boost/parameters/sync_threshold 998400
-    write /sys/module/cpu_boost/parameters/input_boost_freq 1094400
-    write /sys/module/cpu_boost/parameters/input_boost_ms 40
-
-    write /sys/devices/system/cpu/cpu1/online 1
-    write /sys/devices/system/cpu/cpu2/online 1
-    write /sys/devices/system/cpu/cpu3/online 1
-    write /sys/module/msm_thermal/core_control/enabled 0
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "interactive"
-    write /sys/module/msm_thermal/core_control/enabled 1
-
-    write /sys/devices/system/cpu/cpufreq/interactive/timer_rate 20000
-    write /sys/devices/system/cpu/cpufreq/interactive/min_sample_time 60000
-    write /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq 998400
-    write /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load 80
-    write /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay 20000
-    write /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration 60000
-    write /sys/devices/system/cpu/cpufreq/interactive/target_loads 80
-    write /sys/devices/system/cpu/cpufreq/interactive/align_windows 1
-
-    # Configure foreground and background cpuset
-    write /dev/cpuset/foreground/cpus 0-3
-    write /dev/cpuset/foreground/boost/cpus 0-1
-    write /dev/cpuset/background/cpus 0
-    write /dev/cpuset/system-background/cpus 2-3
-
-    write /sys/class/devfreq/1c00000.qcom,kgsl-3d0/governor "msm-adreno-tz"
-    write /sys/class/devfreq/qcom,cpubw.30/governor "cpufreq"
-
-on charger
-    write /sys/module/lpm_levels/parameters/sleep_disabled 0
-    write /sys/module/msm_thermal/core_control/enabled 0
-    write /sys/devices/system/cpu/cpu1/online 1
-    write /sys/devices/system/cpu/cpu2/online 1
-    write /sys/devices/system/cpu/cpu3/online 1
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "powersave"
-    write /sys/module/msm_thermal/core_control/enabled 1
-    write /sys/devices/system/cpu/cpu1/online 0
-    write /sys/devices/system/cpu/cpu2/online 0
-    write /sys/devices/system/cpu/cpu3/online 0
-
-on boot
-    trigger enable-target-low-power
-
-on property:init.svc.recovery=running
-    trigger enable-target-low-power
-
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 4edfd15..6ad4cca 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2012, 2014, 2016, The Linux Foundation. All rights reserved.
+# Copyright (c) 2009-2012, 2014, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,19 +25,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-import init.target.power.rc
-
 on early-init
     #set non-stand-charger can used
     write /sys/module/phy_msm_usb/parameters/floated_charger_enable Y
 
 on boot
-    # Torch
-    chown system camera /sys/class/leds/torch-light0/brightness
-    chown system camera /sys/class/leds/flashlight/brightness
-    chmod 0660 /sys/class/leds/torch-light0/brightness
-    chmod 0660 /sys/class/leds/flashlight/brightness
-
     # charger
     chown system system /sys/bus/i2c/drivers/lc709203/batt_capacity
     chmod 0660 /sys/bus/i2c/drivers/lc709203/batt_capacity
@@ -46,84 +38,25 @@ on boot
     chmod 0664 /sys/class/power_supply/bms/current_now
     chmod 0664 /sys/class/power_supply/bms/voltage_ocv
 
-    # stk3x1x light
-    chown system system /sys/class/sensors/stk3x1x-light/calibrate
-    chown system system /sys/class/sensors/stk3x1x-light/enable
-    chown system system /sys/class/sensors/stk3x1x-light/enable_wakeup
-    chown system system /sys/class/sensors/stk3x1x-light/flush
-    chown system system /sys/class/sensors/stk3x1x-light/max_latency
-    chown system system /sys/class/sensors/stk3x1x-light/poll_delay
-    chmod 0664 /sys/class/sensors/stk3x1x-light/calibrate
-    chmod 0664 /sys/class/sensors/stk3x1x-light/enable
-    chmod 0664 /sys/class/sensors/stk3x1x-light/enable_wakeup
-    chmod 0664 /sys/class/sensors/stk3x1x-light/flush
-    chmod 0664 /sys/class/sensors/stk3x1x-light/max_latency
-    chmod 0664 /sys/class/sensors/stk3x1x-light/poll_delay
-
-    # stk3x1x proximity
-    chown system system /sys/class/sensors/stk3x1x-proximity/calibrate
-    chown system system /sys/class/sensors/stk3x1x-proximity/enable
-    chown system system /sys/class/sensors/stk3x1x-proximity/enable_wakeup
-    chown system system /sys/class/sensors/stk3x1x-proximity/flush
-    chown system system /sys/class/sensors/stk3x1x-proximity/max_latency
-    chown system system /sys/class/sensors/stk3x1x-proximity/poll_delay
-    chmod 0664 /sys/class/sensors/stk3x1x-proximity/calibrate
-    chmod 0664 /sys/class/sensors/stk3x1x-proximity/enable
-    chmod 0664 /sys/class/sensors/stk3x1x-proximity/enable_wakeup
-    chmod 0664 /sys/class/sensors/stk3x1x-proximity/flush
-    chmod 0664 /sys/class/sensors/stk3x1x-proximity/max_latency
-    chmod 0664 /sys/class/sensors/stk3x1x-proximity/poll_delay
+    # Notification LED
+    chown system system /sys/class/leds/red/blink
+    chown system system /sys/class/leds/green/blink
+    chown system system /sys/class/leds/blue/blink
+    chown system system /sys/class/leds/red/led_time
+    chown system system /sys/class/leds/green/led_time
+    chown system system /sys/class/leds/blue/led_time
 
-    # BMA
-    chown system system /sys/class/sensors/bma2x2-accel/calibrate
-    chown system system /sys/class/sensors/bma2x2-accel/enable
-    chown system system /sys/class/sensors/bma2x2-accel/enable_wakeup
-    chown system system /sys/class/sensors/bma2x2-accel/flush
-    chown system system /sys/class/sensors/bma2x2-accel/max_latency
-    chown system system /sys/class/sensors/bma2x2-accel/poll_delay
-    chmod 0664 /sys/class/sensors/bma2x2-accel/calibrate
-    chmod 0664 /sys/class/sensors/bma2x2-accel/enable
-    chmod 0664 /sys/class/sensors/bma2x2-accel/enable_wakeup
-    chmod 0664 /sys/class/sensors/bma2x2-accel/flush
-    chmod 0664 /sys/class/sensors/bma2x2-accel/max_latency
-    chmod 0664 /sys/class/sensors/bma2x2-accel/poll_delay
+    # Adaptive LMK
+    write /sys/module/lowmemorykiller/parameters/enable_adaptive_lmk 1
+    write /sys/module/lowmemorykiller/parameters/vmpressure_file_min 81250
 
-    # Set per_process_reclaim tuning parameters
+    # Per-process reclaim
     write /sys/module/process_reclaim/parameters/enable_process_reclaim 1
     write /sys/module/process_reclaim/parameters/pressure_min 50
     write /sys/module/process_reclaim/parameters/pressure_max 70
     write /sys/module/process_reclaim/parameters/per_swap_size 512
     write /sys/module/process_reclaim/parameters/swap_opt_eff 30
 
-    write /sys/block/mmcblk0/queue/add_random 0
-    write /sys/block/mmcblk0/queue/iosched/slice_idle 0
-    write /sys/block/mmcblk0/bdi/read_ahead_kb 128
-
-on post-fs-data
-     mkdir /data/dpm/nsrm 0771 system system
-     chown system system /data/dpm/nsrm
-
-on init
-
-on property:service.bootanim.exit=1
-    # Enable swap
-    write /sys/block/zram0/comp_algorithm lz4
-    swapon_all fstab.qcom
-    write /proc/sys/vm/page-cluster 0
-    write /proc/sys/vm/swappiness 100
-
-service calibacc /system/bin/accelcal
-    class main
-    oneshot
-    disabled
-
-on property:sys.sensors.acc=*
-    start calibacc
-
-service charger /charger
-    class charger
-    group log
-
 service vm_bms /system/bin/vm_bms
     class core
     user root
@@ -136,26 +69,6 @@ on charger
    chown root system /sys/class/power_supply/bms/voltage_ocv
    chmod 0664 /sys/class/power_supply/bms/current_now
    chmod 0664 /sys/class/power_supply/bms/voltage_ocv
-   write /sys/module/lpm_levels/system/cpu0/wfi/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu1/wfi/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu2/wfi/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu3/wfi/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu0/standalone_pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu1/standalone_pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu2/standalone_pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu3/standalone_pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu0/pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu1/pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu2/pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu3/pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/cpu0/pc/suspend_enabled N
-   write /sys/module/lpm_levels/system/cpu1/pc/suspend_enabled Y
-   write /sys/module/lpm_levels/system/cpu2/pc/suspend_enabled Y
-   write /sys/module/lpm_levels/system/cpu3/pc/suspend_enabled Y
-   write /sys/module/lpm_levels/system/l2-pc/idle_enabled Y
-   write /sys/module/lpm_levels/system/l2-cache-active/idle_enabled Y
-   write /sys/module/lpm_levels/system/l2-pc/suspend_enabled Y
-   write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ondemand
    start vm_bms
 
 service sensord /system/bin/sensord
@@ -172,7 +85,3 @@ service calibacc /system/bin/accelcal
 
 on property:sys.sensors.acc=*
     start calibacc
-
-# Fix torch on notification drawer
-on property:sys.boot_completed=1
-    restart media