rootdir: huge cleanup based on @dinolek's m2 device tree

10 files changed, 75 insertions, 1453 deletions

diff --git a/recovery/twrp.fstab b/recovery/twrp.fstab
index b697385..41d34aa 100644
--- a/recovery/twrp.fstab
+++ b/recovery/twrp.fstab
@@ -2,15 +2,20 @@
 
 /boot			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/boot	flags=display="Boot";backup=1;flashimg=1
 /cache			ext4	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/cache	flags=display="Cache";backup=1
-/lk			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/lk	flags=display="Uboot";backup=1;flashimg=1
+/custom			ext4	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/custom	flags=display="Custom";backup=1
+/data			ext4	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/userdata	flags=encryptable=/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/metadata;display="Data";backup=1
+/lk			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/lk	flags=display="LK";backup=1
 /logo			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/logo	flags=display="Logo";backup=1;flashimg=1
 /metadata		emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/metadata
 /misc			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/para
+/nvdata			ext4	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/nvdata	flags=display="Nvdata";backup=1
 /nvram			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/nvram	flags=display="Nvram";backup=1
-/secro			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/secro	flags=display="Secro";backup=1;flashimg=1
-/recovery		emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/recovery	flags=display="Recovery";backup=1;backup=1
-/system			ext4	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/system	flags=display="System";backup=1
-/data			ext4	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/userdata	flags=length=-16384;encryptable=/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/metadata;display="Data";backup=1
-/external_sd		auto	/dev/block/mmcblk1p1	/dev/block/mmcblk1	flags=display="External SDcard";storage;removable;backup=0
-/usbotg			auto	/dev/block/sda1	/dev/block/sda	flags=display="USB-OTG";storage;removable;backup=0
 /persistent		emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/frp
+/proinfo		emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/proinfo	flags=display="ProInfo";backup=1
+/tee1			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/tee1	flags=display="Tee";backup=1
+/tee2			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/tee2	flags=backup=1;subpartitionof=/tee1
+/recovery		emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/recovery	flags=display="Recovery";backup=1;flashimg=1
+/secro			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/secro	flags=display="Secro";backup=1
+/system			ext4	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/system	flags=display="System";backup=1
+/usbotg			auto	/dev/block/sda1	/dev/block/sda	flags=display="OTG";storage;removable;backup=0
+/external_sd		auto	/dev/block/mmcblk1p1	/dev/block/mmcblk1	flags=display="External SD";storage;removable;backup=0
diff --git a/rootdir/factory_init.project.rc b/rootdir/factory_init.project.rc
deleted file mode 100644
index c1ef1a3..0000000
--- a/rootdir/factory_init.project.rc
+++ /dev/null
@@ -1,60 +0,0 @@
-mkdir /data/misc/sensors 0664 system system
-
-service msensord /vendor/bin/msensord
-    user system
-    group system
-    oneshot
-
-service akmd09911 /vendor/bin/akmd09911
-    disabled
-    user system
-    group system
-
-
-on post-fs
-#
-# Connectivity related modules and character device nodes (Begin)
-#
-    #for 662x_launcher
-    chmod 0660 /dev/ttyMT2
-    chown system system /dev/ttyMT2
-
-    # Create char device file for WMT, GPS, BT, FM, WIFI
-    mknod /dev/stpwmt c 190 0;
-    mknod /dev/stpgps c 191 0;
-    mknod /dev/stpbt  c 192 0;
-    chmod 0660 /dev/stpwmt
-    chown system system /dev/stpwmt
-    chmod 0660 /dev/wmtdetect
-    chown system system /dev/wmtdetect
- 		
-    mknod /dev/wmtWifi c 153 0
-    chmod 0666 /dev/wmtWifi
-    chmod 0660 /dev/stpgps
-    chmod 0660 /dev/stpbt
-    chown bluetooth radio /dev/stpbt
-
-#
-# Connectivity related modules and character device nodes (Ends)
-#
-
-on boot
-
-#
-# Connectivity related services (Begin)
-#
-
-service wmtLoader /vendor/bin/wmt_loader
-    user root
-    group root
-    oneshot
-    
-service conn_launcher /vendor/bin/6620_launcher -p /vendor/etc/firmware/
-    user system
-    group system
-    
-
-#
-# Connectivity related services (End)
-#
-
diff --git a/rootdir/factory_init.rc b/rootdir/factory_init.rc
deleted file mode 100644
index 8cff364..0000000
--- a/rootdir/factory_init.rc
+++ /dev/null
@@ -1,553 +0,0 @@
-import /init.environ.rc
-import init.ssd.rc
-
-on early-init
-    # Set init and its forked children's oom_adj.
-    write /proc/1/oom_score_adj -1000
-
-    # Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
-    write /sys/fs/selinux/checkreqprot 0
-
-    # Set the security context for the init process.
-    # This should occur before anything else (e.g. ueventd) is started.
-    setcon u:r:init:s0
-
-    # Set the security context of /adb_keys if present.
-    restorecon /adb_keys
-
-    start ueventd
-
-    write /proc/bootprof "INIT: usr/eng build setting"
-# create mountpoints
-    mkdir /mnt 0775 root system
-
-on init
-
-sysclktz 0
-
-loglevel 5
-
-# Backward compatibility
-    symlink /system/etc /etc
-    symlink /sys/kernel/debug /d
-    
-# Temp Backward compatibility
-    symlink /dev/block/platform/mtk-msdc.0/by-name/boot /dev/bootimg 
-    symlink /dev/block/platform/mtk-msdc.0/by-name/recovery /dev/recovery
-    symlink /dev/block/platform/mtk-msdc.0/by-name/secro  /dev/sec_ro
-    symlink /dev/block/platform/mtk-msdc.0/by-name/kb /dev/kb
-    symlink /dev/block/platform/mtk-msdc.0/by-name/dkb /dev/dkb 
-    symlink /dev/block/platform/mtk-msdc.0/by-name/seccfg /dev/seccfg
-    symlink /dev/block/platform/mtk-msdc.0/by-name/proinfo /dev/pro_info
-    symlink /dev/block/platform/mtk-msdc.0/by-name/nvram /dev/nvram
-    symlink /dev/block/platform/mtk-msdc.0/by-name/para /dev/misc
-    symlink /dev/block/platform/mtk-msdc.0/by-name/logo /dev/logo
-
-
-# Link /vendor to /system/vendor for devices without a vendor partition.
-    symlink /system/vendor /vendor
-
-# Create cgroup mount point for cpu accounting
-    mkdir /acct
-    mount cgroup none /acct cpuacct
-    mkdir /acct/uid
-
-    mkdir /system
-    mkdir /data 0771 system system
-    mkdir /cache 0770 system cache
-    mkdir /config 0500 root root
-    mkdir /protect_f 0771 system system
-    mkdir /protect_s 0771 system system
-    #create mountpoint for persist partition
-    mkdir /persist 0771 system system
-    #Create nvdata mount point
-    mkdir /nvdata 0771 system system
-
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell 0700 shell shell
-    mkdir /mnt/media_rw 0700 media_rw media_rw
-    mkdir /storage 0751 root sdcard_r
-
-    # Filesystem image public mount points.
-    mkdir /mnt/obb 0700 root system
-    mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000
-
-    write /proc/sys/kernel/panic_on_oops 1
-    write /proc/sys/kernel/hung_task_timeout_secs 0
-    write /proc/cpu/alignment 4
-    write /proc/sys/kernel/sched_latency_ns 10000000
-    write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000
-    write /proc/sys/kernel/sched_compat_yield 1
-    write /proc/sys/kernel/sched_child_runs_first 0
-
-    # Healthd can trigger a full boot from charger mode by signaling this
-    # property when the power button is held.
-    on property:sys.boot_from_charger_mode=1
-    class_stop charger
-    trigger late-init
-
-    # Load properties from /system/ + /factory after fs mount.
-    on load_all_props_action
-    load_system_props
-    load_persist_props
-
-    # Mount filesystems and start core system services.
-    on late-init
-    trigger early-fs
-    trigger fs
-    trigger post-fs
-    trigger post-fs-data
-
-    # Load properties from /system/ + /factory after fs mount. Place
-    # this in another action so that the load will be scheduled after the prior
-    # issued fs triggers have completed.
-    trigger load_all_props_action
-
-    trigger early-boot
-    trigger boot
-
-on fs
-    write /proc/bootprof "INIT:Mount_START"
-    mount_all /fstab.mt6735
-
-    #change partition permissions
-    exec /system/bin/chmod 0640 /dev/block/platform/mtk-msdc.0/by-name/boot
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/boot
-    exec /system/bin/chmod 0640 /dev/block/platform/mtk-msdc.0/by-name/recovery
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/recovery
-    exec /system/bin/chmod 0640 /dev/block/platform/mtk-msdc.0/by-name/secro
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/secro
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/seccfg
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/seccfg
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/proinfo
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/proinfo
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/otp
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/otp
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/nvram
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/nvram
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/para
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/para
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/logo
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/logo			
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/para
-    write /proc/bootprof "INIT:Mount_END"
-
-on post-fs
-    # once everything is setup, no need to modify /
-    mount rootfs rootfs / ro remount
-    chown system system /system/data
-    mkdir /system/cache 0770 system cache
-    # We restorecon /cache in case the cache partition has been reset.
-    restorecon_recursive /cache
-
-    # We chown/chmod /data again so because mount is run as root + defaults
-    chown system system /system/data
-    chmod 0777 /system/data
-    # We chown/chmod /data again so because mount is run as root + defaults
-    chown system system /data
-    chmod 0771 /data
-    # We restorecon /data in case the userdata partition has been reset.
-    restorecon /data
-    
-    # Same reason as /data above
-    chown system cache /cache
-    chmod 0770 /cache
-
-    mkdir /cache/recovery 0770 system system
-    chown system system /protect_f
-    chmod 0770 /protect_f
-
-    chown system system /protect_s
-    chmod 0770 /protect_s
-
-    # This may have been created by the recovery system with odd permissions
-    chown system cache /cache/recovery
-    chmod 0770 /cache/recovery
-
-    #change permissions on vmallocinfo so we can grab it from bugreports
-    chown root log /proc/vmallocinfo
-    chmod 0440 /proc/vmallocinfo
-
-    #change permissions on kmsg & sysrq-trigger so bugreports can grab kthread stacks
-    chown root system /proc/kmsg
-    chmod 0440 /proc/kmsg
-    
-    # make the selinux kernel policy world-readable
-    chmod 0444 /sys/fs/selinux/policy
-
-    # create the lost+found directories, so as to enforce our permissions
-    mkdir /cache/lost+found 0770 root root
-
-on post-fs-data
-
-#SeLinux
-    mkdir /data/ccci_cfg 0770 system radio
-    restorecon /data/ccci_cfg
-    restorecon_recursive /protect_f
-    restorecon_recursive /protect_s
-   
-    # We chown/chmod /data again so because mount is run as root + defaults
-    
-    chown root system /proc/sysrq-trigger
-    chmod 0220 /proc/sysrq-trigger
-
-    chown system system /persist
-    chmod 0771 /persist
-# create basic filesystem structure
-    #mkdir /data/nvram 2770 root system
-    # We chown/chmod /nvdata again so because mount is run as root + defaults
-    chown root system /nvdata
-    chmod 2770 /nvdata
-    symlink /nvdata /data/nvram
-
-    # Set SELinux security contexts on upgrade or policy update.
-    restorecon_recursive /nvdata
-
-    mkdir /data/misc 01771 system misc
-    mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth
-    mkdir /data/misc/bluetooth 0770 system system
-    mkdir /data/misc/keystore 0700 keystore keystore
-    mkdir /data/misc/keychain 0771 system system
-    mkdir /data/misc/vpn 0770 system vpn
-    mkdir /data/misc/systemkeys 0700 system system
-    # give system access to wpa_supplicant.conf for backup and restore
-    mkdir /data/misc/wifi 0770 wifi wifi
-    chmod 0660 /data/misc/wifi/wpa_supplicant.conf
-    mkdir /data/local 0771 shell shell
-    mkdir /data/local/tmp 0771 shell shell
-    mkdir /data/data 0771 system system
-    mkdir /data/app-private 0771 system system
-    mkdir /data/app 0771 system system
-    mkdir /data/property 0700 root root
-    mkdir /data/tombstones 0771 system system
-
-    # create the lost+found directories, so as to enforce our permissions
-    mkdir /data/lost+found 0770
-    mkdir /cache/lost+found 0770
-    mkdir /data/adb 0700 root root
-
-    # double check the perms, in case lost+found already exists, and set owner
-    chown root root /data/lost+found
-    chmod 0770 /data/lost+found
-    chown root root /cache/lost+found
-    chmod 0770 /cache/lost+found
-    
-    # VIA flashlessd service
-    mkdir /data/flashless 0770 radio nvram
-    mkdir /data/nvram/md_via 0770 root nvram
-    chmod 0660 /dev/ttyMT4
-    chown radio radio /dev/ttyMT4
-    chmod 0660 /dev/vmodem
-    chown radio radio /dev/vmodem
-
-    #VIA pppd service
-    mkdir /data/pppd_via 0770 radio system
-
-    # md32 boot
-    chown root system /dev/md32
-    chmod 0440 /dev/md32
-    chown root system /sys/class/misc/md32/md32_mobile_log
-    chmod 0660 /sys/class/misc/md32/md32_mobile_log
-    write /sys/class/misc/md32/md32_boot 1
-    
-    # dhcp server 
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
-    chown dhcp dhcp /data/misc/dhcp
-
-    # device info interface
-    chmod 0440 /dev/devmap
-    chown root system /dev/devmap
-
-
-
-    #change partition permission
-    exec /system/etc/partition_permission.sh
-    
-## Custom pos-fs area (START)
-# Please add custom fs operation below
-
-    # Touch Panel
-    chown root diag /sys/module/tpd_setting/parameters/tpd_calmat
-    chown root diag /sys/module/tpd_setting/parameters/tpd_em_debounce_time
-    chown root diag /sys/module/tpd_debug/parameters/tpd_em_log
-    chown root diag /sys/module/tpd_debug/parameters/tpd_em_log_to_fs
-
-    chmod 0664 /dev/pmem_multimedia
-    chmod 0664 /dev/mt6516-isp
-    chmod 0664 /dev/mt6516-IDP
-    chmod 0664 /dev/mt9p012
-    chmod 0664 /dev/mt6516_jpeg
-
-    # RTC
-    mkdir /data/misc/rtc 0770 system system
-
-    # Modem related device nodes
-    mkdir /data/nvram/md  0770 root system
-    mkdir /data/nvram/md2 0770 root system
-
-    chown radio radio /sys/kernel/ccci/boot
-
-    # M4U
-    chmod 0444 /dev/M4U_device
-    
-    #set mlock limit to infinate (for m4u operation)
-    setrlimit 8 -1 -1
-
-    # Sensor
-    chmod 0666 /dev/hwmsensor
-    chmod 0666 /dev/gyroscope
-    chmod 0666 /dev/msensor
-    chmod 0666 /dev/gsensor
-    chmod 0666 /dev/alsps
-
-    #VideoCodec
-    chmod 0666 /dev/Vcodec
-
-
-    mkdir /data/amit/
-
-    # GPIO
-    chmod 0666 /dev/mtgpio
-
-    chmod 0666 /dev/exm0
-
-    # TTY
-    # For BT relayer
-    chown bluetooth radio /dev/ttyGS2
-    chmod 0660 /dev/ttyGS2
-    # For MD Logger
-    chown system radio /dev/ttyGS3
-    chmod 0660 /dev/ttyGS3
-
-## Custom pos_fs area (END)
-
-    # Separate location for storing security policy files on data
-    mkdir /data/security 0711 system system
-
-    # Reload policy from /data/security if present.
-    setprop selinux.reload_policy 1
-
-    # Set SELinux security contexts on upgrade or policy update.
-    restorecon_recursive /data
-
-    # If there is no fs-post-data action in the init.<device>.rc file, you
-    # must uncomment this line, otherwise encrypted filesystems
-    # won't work.
-    # Set indication (checked by vold) that we have finished this action
-    setprop vold.post_fs_data_done 1
-
-on boot
-
-    #VIA device property
-    setprop viatel.device.asci uart.4.ttyMT
-    setprop viatel.device.fls  sdio.3.ttySDIO
-    setprop viatel.device.at   sdio.4.ttySDIO
-    setprop viatel.device.data sdio.1.ttySDIO
-
-# basic network init
-    ifup lo
-    hostname localhost
-    domainname localdomain
-
-
-# Start default class, this line is very important!!
-   class_start default
-   class_start core
-
-on nonencrypted
-    class_start main
-    class_start late_start
-
-on property:vold.decrypt=trigger_default_encryption
-    start defaultcrypto
-
-on property:vold.decrypt=trigger_encryption
-    start surfaceflinger
-    start encrypt
-
-on property:vold.decrypt=trigger_reset_main
-    class_reset main
-
-on property:vold.decrypt=trigger_load_persist_props
-    load_persist_props
-
-on property:vold.decrypt=trigger_post_fs_data
-    trigger post-fs-data
-
-on property:vold.decrypt=trigger_restart_min_framework
-    class_start main
-
-on property:vold.decrypt=trigger_restart_framework
-    start nvram_daemon
-    class_start main
-    class_start late_start
-
-on property:vold.decrypt=trigger_shutdown_framework
-    class_reset late_start
-    class_reset main
-
-## Daemon processes to be run by init.
-##
-
-service ueventd /sbin/ueventd
-    class core
-    critical
-    seclabel u:r:ueventd:s0
-    
-service logd /system/bin/logd
-    class core
-    socket logd stream 0666 logd logd
-    socket logdr seqpacket 0666 logd logd
-    socket logdw dgram 0222 logd logd
-    seclabel u:r:logd:s0
-    
-service console /system/bin/sh
-    class core
-    console
-    disabled
-    user shell
-    group shell log
-    seclabel u:r:shell:s0
-
-on property:sys.powerctl=*
-    powerctl ${sys.powerctl}
-
-on property:ro.debuggable=1
-    start console
-
-# adbd is controlled via property triggers in init.<platform>.usb.rc
-service adbd /sbin/adbd --root_seclabel=u:r:su:s0
-    class core
-    socket adbd stream 660 system system
-    disabled
-    seclabel u:r:adbd:s0
-
-service vold /system/bin/vold
-    class core
-    socket vold stream 0660 root mount
-    socket cryptd stream 0660 root mount
-    ioprio be 2
-
-# One shot invocation to deal with encrypted volume.
-service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
-    disabled
-    oneshot
-    # vold will set vold.decrypt to trigger_restart_framework (default
-    # encryption) or trigger_restart_min_framework (other encryption)
-
-# One shot invocation to encrypt unencrypted volumes
-service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default
-    disabled
-    oneshot
-    # vold will set vold.decrypt to trigger_restart_framework (default
-    # encryption)
-
-## Custom service area (START)
-# Please add custom service below
-
-service thermal_manager /vendor/bin/thermal_manager
-    user root
-    oneshot
-
-service ccci_fsd /vendor/bin/ccci_fsd 0
-    user radio
-    group radio system
-    oneshot
-
-service ccci_mdinit /vendor/bin/ccci_mdinit 0
-    user system
-    group radio system
-    oneshot
-
-service nvram_daemon /vendor/bin/nvram_daemon
-    class main
-    user root
-    group system
-    oneshot
-
-service installd /system/bin/installd
-    class main
-    socket installd stream 600 system system
-
-service factory_no_image /system/bin/factory
-    disabled
-    oneshot
-
-service factory_with_image /sbin/factory
-    disabled
-    oneshot
-
-#
-# Connectivity related services (End)
-#
-#
-## Custom service area (END)
-
-
-#statusd service
-service statusd /system/bin/statusd -f [/system/bin/flashlessd -l -m 0]
-    socket statusd stream 660 radio radio
-    user radio
-    group radio cache inet misc system
-
-on property:sys.mtk.no.factoryimage=1
-    start factory_no_image
-
-on property:sys.mtk.no.factoryimage=0
-    start factory_with_image
-
-#mass_storage,adb,acm
-on property:ro.boot.usbconfig=0
-    write /sys/class/android_usb/android0/iSerial $ro.serialno
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 0e8d
-    write /sys/class/android_usb/android0/idProduct 2006
-    write /sys/class/android_usb/android0/f_acm/instances 1
-    write /sys/class/android_usb/android0/functions mass_storage,adb,acm
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.acm_idx 1
-
-#acm
-on property:ro.boot.usbconfig=1
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/iSerial " "
-    write /sys/class/android_usb/android0/idVendor 0e8d
-    write /sys/class/android_usb/android0/idProduct 2007
-    write /sys/class/android_usb/android0/f_acm/instances 1
-    write /sys/class/android_usb/android0/functions acm
-    write /sys/class/android_usb/android0/bDeviceClass 02
-    write /sys/class/android_usb/android0/enable 1
-
-#single modem comport for factory mode   
-on property:sys.usb.config=gs3,dual_acm
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor $sys.usb.vid
-    write /sys/class/android_usb/android0/idProduct 202E
-    write /sys/class/android_usb/android0/f_acm/port_index 1,4
-    write /sys/devices/platform/mt_usb/saving 1
-    write /sys/class/android_usb/android0/functions mass_storage,adb,acm
-    write /sys/class/android_usb/android0/enable 1
-    chown system radio /dev/ttyGS3
-    chmod 0660 /dev/ttyGS3
-    start adbd
-    setprop sys.usb.state $sys.usb.config
-    setprop sys.usb.acm_idx 1,4
-    
-#dual modem comport for factory mode
-on property:sys.usb.config=gs1gs3,dual_acm
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor $sys.usb.vid
-    write /sys/class/android_usb/android0/idProduct 202F
-    write /sys/class/android_usb/android0/f_acm/port_index 1,2,4
-    write /sys/devices/platform/mt_usb/saving 1
-    write /sys/class/android_usb/android0/functions adb,acm
-    write /sys/class/android_usb/android0/enable 1
-    chown system radio /dev/ttyGS3
-    chmod 0660 /dev/ttyGS3
-    chown system radio /dev/ttyGS1
-    chmod 0660 /dev/ttyGS1
-    start adbd
-    setprop sys.usb.state $sys.usb.config
-    setprop sys.usb.acm_idx 1,2,4
-
diff --git a/rootdir/init.mt6735.rc b/rootdir/init.mt6735.rc
index 267e251..12d8585 100755
--- a/rootdir/init.mt6735.rc
+++ b/rootdir/init.mt6735.rc
@@ -2,7 +2,7 @@ import init.mt6735.usb.rc
 import init.modem.rc
 
 on late-fs
-    # boot time fs tune
+    # Boot fs tune
     write /sys/block/mmcblk0/queue/iostats 0
     write /sys/block/mmcblk0/queue/iosched/slice_idle 0
     write /sys/block/mmcblk0/queue/read_ahead_kb 2048
@@ -20,7 +20,7 @@ on early-init
     write /sys/class/leds/lcd-backlight/trigger "backlight"
 
 on init
-    # mount points
+    # Mount points
     mkdir /protect_f 0771 system system
     mkdir /protect_s 0771 system system
     mkdir /persist 0771 system system
@@ -29,44 +29,10 @@ on init
     mkdir /mnt/media_rw/usbotg 0700 media_rw media_rw
     mkdir /storage/usbotg 0700 root root
 
-    # ion device
+    # ION device
     chmod 0666 /dev/ion
-    chmod 0660 /sys/bus/platform/drivers/gsensor/cpsdata
-    chmod 0660 /sys/bus/platform/drivers/gsensor/cpsrange
-    chmod 0660 /sys/bus/platform/drivers/gsensor/cpsbandwidth
-    chmod 0660 /sys/bus/platform/drivers/gsensor/cpsopmode
-    chmod 0660 /sys/bus/platform/drivers/gsensor/fifo_mode
-    chmod 0660 /sys/bus/platform/drivers/gsensor/fifo_data_frame
-    chmod 0660 /sys/bus/platform/drivers/gsensor/fifo_framecount
-    chown system system /sys/bus/platform/drivers/gsensor/cpsdata
-    chown system system /sys/bus/platform/drivers/gsensor/cpsrange
-    chown system system /sys/bus/platform/drivers/gsensor/cpsbandwidth
-    chown system system /sys/bus/platform/drivers/gsensor/cpsopmode
-    chown system system /sys/bus/platform/drivers/gsensor/fifo_mode
-    chown system system /sys/bus/platform/drivers/gsensor/fifo_data_frame
-    chown system system /sys/bus/platform/drivers/gsensor/fifo_framecount
-    # add for mag 
-    chmod 0660 /sys/bus/platform/drivers/msensor/rawdata 
-    chown system system /sys/bus/platform/drivers/msensor/rawdata 
-    chmod 0660 /sys/bus/platform/drivers/msensor/daemon
-    chown system system /sys/bus/platform/drivers/msensor/daemon
-    # add for gyro 
-    chmod 0660 /sys/bus/platform/drivers/gyroscope/rawdata 
-    chmod 0660 /sys/bus/platform/drivers/gyroscope/datarate 
-    chmod 0660 /sys/bus/platform/drivers/gyroscope/range 
-    chmod 0660 /sys/bus/platform/drivers/gyroscope/powermode 
-    chmod 0660 /sys/bus/platform/drivers/gyroscope/fifo_mode 
-    chmod 0660 /sys/bus/platform/drivers/gyroscope/fifo_data_frame 
-    chmod 0660 /sys/bus/platform/drivers/gyroscope/fifo_framecount 
-    chown system system /sys/bus/platform/drivers/gyroscope/rawdata 
-    chown system system /sys/bus/platform/drivers/gyroscope/datarate 
-    chown system system /sys/bus/platform/drivers/gyroscope/range 
-    chown system system /sys/bus/platform/drivers/gyroscope/powermode 
-    chown system system /sys/bus/platform/drivers/gyroscope/fifo_mode 
-    chown system system /sys/bus/platform/drivers/gyroscope/fifo_data_frame
-    chown system system /sys/bus/platform/drivers/gyroscope/fifo_framecount
-
-    # change lk_env permission
+
+    # Change lk_env permission
     chown root system /proc/lk_env
     chmod 0660 /proc/lk_env
 
@@ -82,7 +48,7 @@ on post-fs
     write /sys/block/zram0/comp_algorithm lz4
     write /proc/sys/vm/page-cluster 0
 
-    # change owner
+    # Change owner
     chown root system /proc/mtprof/cputime
     chown root system /proc/mtprof/reboot_pid
 
@@ -97,9 +63,9 @@ on post-fs
     mkdir /nvdata/APCFG 0770 system camera
     mkdir /nvdata/APCFG/APRDCL 0770 system camera
     mkdir /nvdata/APCFG/APRDEB 0770 system camera
-    mkdir /nvdata/md     0770 system radio
+    mkdir /nvdata/md 0770 system radio
     mkdir /nvdata/md_cmn 0770 system radio
-    mkdir /nvdata/media  0770 media audio
+    mkdir /nvdata/media 0770 media audio
     restorecon_recursive /nvdata
 
     # Workaround for old nvram blobs
@@ -112,17 +78,16 @@ on post-fs
     chmod 0660 /dev/wmtWifi
     chown system system /dev/wmtWifi
 
-    mknod /dev/stpwmt c 190 0
-    mknod /dev/stpgps c 191 0
-    mknod /dev/stpbt  c 192 0
-
     # BT
+    mknod /dev/stpbt c 192 0
     chmod 0660 /dev/stpbt
     chown radio bluetooth /dev/stpbt
 
+    mknod /dev/stpwmt c 190 0
     chmod 0660 /dev/stpwmt
     chown system system /dev/stpwmt
 
+    mknod /dev/stpgps c 191 0
     chmod 0660 /dev/wmtdetect
     chown system system /dev/wmtdetect
 
@@ -134,10 +99,10 @@ on post-fs
     # GPS
     chmod 0660 /dev/gps
     chown system gps /dev/gps
+
     chmod 0660 /dev/stpgps
     chown gps gps /dev/stpgps
 
-
 on post-fs-data
     # We chown/chmod /nvdata again so because mount is run as root + defaults
     chown root system /nvdata
@@ -149,14 +114,12 @@ on post-fs-data
     # Set SELinux security contexts on upgrade or policy update.
     restorecon_recursive /nvdata
 
-    #give system access to rfkill device node
+    # Give system access to rfkill device node
     chmod 0660 /dev/rfkill
 
-    # create for muxd pts device node to operate without root
+    # Create for muxd pts device node to operate without root
     mkdir /dev/radio 0770 radio radio
 
-    mkdir /data/drm/wv 0770 drm system
-
     # GPS
     mkdir /data/gps_mnl 0771 gps system
     mkdir /data/misc/gps 0770 gps gps
@@ -166,27 +129,19 @@ on post-fs-data
     chown gps gps /sys/class/gpsdrv/gps/pwrsave
     chown gps gps /sys/class/gpsdrv/gps/status
 
-
-    # md32 boot
-    chown root system /dev/md32
-    chmod 0440 /dev/md32
-    chown root system /sys/class/misc/md32/md32_mobile_log
-    chmod 0660 /sys/class/misc/md32/md32_mobile_log
-    write /sys/class/misc/md32/md32_boot 1
-
     # Mali Graphics
     chmod 666 /dev/mali0
 
-    # watch dog kicker
+    # Watch dog kicker
     write /proc/wdk "0 20 30"
 
-    # set ptmx group to non-root
+    # Set ptmx group to non-root
     chown root radio /dev/ptmx
 
     # RTC
     mkdir /data/misc/rtc 0770 system system
 
-    # set mlock limit to infinate (for m4u operation)
+    # Set mlock limit to infinate (for m4u operation)
     setrlimit 8 -1 -1
 
     # CMDQ
@@ -197,26 +152,17 @@ on post-fs-data
     chmod 0640 /dev/offloadservice
     chown media media /dev/offloadservice
 
-    # Sensor
+    # Sensors
     chmod 0660 /dev/hwmsensor
     chmod 0660 /dev/msensor
     chmod 0660 /dev/gsensor
     chmod 0660 /dev/als_ps
-    chmod 0660 /dev/gyroscope
     chmod 0660 /dev/aal_als
 
-    chmod 0660 /sys/devices/platform/msensor/driver/cpsopmode
-    chmod 0660 /sys/devices/platform/msensor/driver/cpsreptxy
-    chmod 0660 /sys/devices/platform/msensor/driver/cpsreptz
-    chmod 0660 /sys/devices/platform/gsensor/driver/cpsopmode
-    chmod 0660 /sys/devices/platform/gsensor/driver/cpsrange
-    chmod 0660 /sys/devices/platform/gsensor/driver/cpsbandwidth
-
     chown system system /dev/hwmsensor
     chown system system /dev/msensor
     chown system system /dev/gsensor
     chown radio system /dev/als_ps
-    chown system system /dev/gyroscope
     chown system system /dev/aal_als
 
     chmod 0660 /sys/class/misc/m_acc_misc/accenablenodata
@@ -287,46 +233,6 @@ on post-fs-data
     chown media system /sys/class/flashlightdrv/kd_camera_flashlight/flash1
     chown media system /sys/class/flashlightdrv/kd_camera_flashlight/flash2
 
-    chmod 0660 /sys/class/misc/m_mag_misc/magactive
-    chmod 0660 /sys/class/misc/m_mag_misc/magdelay
-    chmod 0660 /sys/class/misc/m_mag_misc/magbatch
-    chmod 0660 /sys/class/misc/m_mag_misc/magflush
-    chmod 0660 /sys/class/misc/m_mag_misc/magoactive
-    chmod 0660 /sys/class/misc/m_mag_misc/magodelay
-    chmod 0660 /sys/class/misc/m_mag_misc/magobatch
-    chmod 0660 /sys/class/misc/m_mag_misc/magoflush
-    chown system system /sys/class/misc/m_mag_misc/magactive
-    chown system system /sys/class/misc/m_mag_misc/magdelay
-    chown system system /sys/class/misc/m_mag_misc/magbatch
-    chown system system /sys/class/misc/m_mag_misc/magflush
-    chown system system /sys/class/misc/m_mag_misc/magoactive
-    chown system system /sys/class/misc/m_mag_misc/magodelay
-    chown system system /sys/class/misc/m_mag_misc/magobatch
-    chown system system /sys/class/misc/m_mag_misc/magoflush
-    chmod 0660 /sys/class/misc/m_batch_misc/batchactive
-    chmod 0660 /sys/class/misc/m_batch_misc/batchdelay
-    chmod 0660 /sys/class/misc/m_batch_misc/batchbatch
-    chmod 0660 /sys/class/misc/m_batch_misc/batchflush
-    chown system system /sys/class/misc/m_batch_misc/batchactive
-    chown system system /sys/class/misc/m_batch_misc/batchdelay
-    chown system system /sys/class/misc/m_batch_misc/batchbatch
-    chown system system /sys/class/misc/m_batch_misc/batchflush
-
-    chmod 0660 /sys/class/misc/m_gyro_misc/gyroenablenodata
-    chmod 0660 /sys/class/misc/m_gyro_misc/gyroactive
-    chmod 0660 /sys/class/misc/m_gyro_misc/gyrodelay
-    chmod 0660 /sys/class/misc/m_gyro_misc/gyrobatch
-    chmod 0660 /sys/class/misc/m_gyro_misc/gyroflush
-    chown system system /sys/class/misc/m_gyro_misc/gyroenablenodata
-    chown system system /sys/class/misc/m_gyro_misc/gyroactive
-    chown system system /sys/class/misc/m_gyro_misc/gyrodelay
-    chown system system /sys/class/misc/m_gyro_misc/gyrobatch
-    chown system system /sys/class/misc/m_gyro_misc/gyroflush
-
-    chmod 0660 /sys/class/misc/m_alsps_misc/alsactive
-    chmod 0660 /sys/class/misc/m_alsps_misc/alsdelay
-    chmod 0660 /sys/class/misc/m_alsps_misc/alsbatch
-    chmod 0660 /sys/class/misc/m_alsps_misc/alsflush
     chmod 0660 /sys/class/misc/m_alsps_misc/psactive
     chmod 0660 /sys/class/misc/m_alsps_misc/psdelay
     chmod 0660 /sys/class/misc/m_alsps_misc/psbatch
@@ -339,18 +245,6 @@ on post-fs-data
     chown system system /sys/class/misc/m_alsps_misc/psdelay
     chown system system /sys/class/misc/m_alsps_misc/psbatch
     chown system system /sys/class/misc/m_alsps_misc/psflush
-
-    chmod 0660 /sys/class/misc/m_baro_misc/baroenablenodata
-    chmod 0660 /sys/class/misc/m_baro_misc/baroactive
-    chmod 0660 /sys/class/misc/m_baro_misc/barodelay
-    chmod 0660 /sys/class/misc/m_baro_misc/barobatch
-    chmod 0660 /sys/class/misc/m_baro_misc/baroflush
-    chown system system /sys/class/misc/m_baro_misc/baroenablenodata
-    chown system system /sys/class/misc/m_baro_misc/baroactive
-    chown system system /sys/class/misc/m_baro_misc/barodelay
-    chown system system /sys/class/misc/m_baro_misc/barobatch
-    chown system system /sys/class/misc/m_baro_misc/baroflush
-
     # Meizu sensor interfaces
     chown system system /sys/class/meizu/acc/acc_calibration
     chown system system /sys/class/meizu/acc/acc_enable
@@ -413,15 +307,15 @@ on post-fs-data
     #duanzhanyang@wind-mobi.com 20150620
     chown system system /sys/devices/mx_leds/leds_mode
 
-    #Accdet
+    # Accdet
     chown root radio /sys/devices/platform/Accdet_Driver/driver/accdet_call_state
 
-    #VideoCodec
+    # VideoCodec
     mknod /dev/Vcodec c 160 0
     chmod 0660 /dev/Vcodec
     chown media camera /dev/Vcodec
 
-    #MJC
+    # MJC
     chmod 0660 /dev/MJC
     chown system media /dev/MJC
 
@@ -429,16 +323,8 @@ on post-fs-data
     chown radio system /sys/devices/platform/mt-pmic/low_battery_protect_stop
     chown radio system /sys/devices/platform/mt-pmic/low_battery_protect_ut
 
-    mkdir /data/amit 0770 system system
     mkdir /data/misc/sensor 0774 system system
     mkdir /data/misc/akmd 0770 system system
-    mkdir /data/misc/s62x 0771 compass compass
-    chown system /sys/devices/platform/msensor/driver/cpsopmode
-    chown system /sys/devices/platform/msensor/driver/cpsreptxy
-    chown system /sys/devices/platform/msensor/driver/cpsreptz
-    chown system /sys/devices/platform/gsensor/driver/cpsopmode
-    chown system /sys/devices/platform/gsensor/driver/cpsrange
-    mkdir /data/data/mcube 0664 system system
 
     # Display
     chmod 0660 /dev/graphics/fb0
@@ -450,28 +336,15 @@ on post-fs-data
     chmod 0660 /sys/devices/platform/mtk_disp_mgr.0/rgb
     chown system system /sys/devices/platform/mtk_disp_mgr.0/rgb
 
-    chmod 0660 /dev/mtkfb_vsync
-    chown system graphics /dev/mtkfb_vsync
-
     chmod 0660 /dev/sw_sync
     chown system graphics /dev/sw_sync
 
-    # pmu
-    chown root radio /sys/devices/platform/mt-pmic/pmic_access_bank0
-    chown root radio /sys/devices/platform/mt-pmic/pmic_access_bank1
-    chown root radio /sys/devices/platform/mt6311-user/mt6311_access
+    # PMU
     chown root radio /sys/devices/platform/mt-pmic/pmic_access
-    chmod 0664 /sys/devices/platform/mt-pmic/pmic_access_bank0
-    chmod 0664 /sys/devices/platform/mt-pmic/pmic_access_bank1
-    chmod 0664 /sys/devices/platform/mt6311-user/mt6311_access
     chmod 0664 /sys/devices/platform/mt-pmic/pmic_access
 
-    # Android SEC related device nodes
-    chmod 0660 /dev/sec
-    chown root system /dev/sec
-
-    # device info /proc interface
-    mknod /dev/devmap c 196 0;
+    # Device info /proc interface
+    mknod /dev/devmap c 196 0
     chmod 0440 /dev/devmap
     chown system camera /dev/devmap
 
@@ -479,12 +352,6 @@ on post-fs-data
     chown bluetooth radio /dev/ttyGS2
     chmod 0660 /dev/ttyGS2
 
-    # bluetooth
-    mkdir /data/@btmtk 0770 bluetooth net_bt
-    chown bluetooth bluetooth /data/@btmtk/host_cache
-    chown bluetooth bluetooth /data/@btmtk/dev_cache
-    chown bluetooth bluetooth /dev/hid-keyboard
-    chmod 0660 /dev/hid-keyboard
     # Use uinput's default permission
     chown system net_bt_admin /dev/uinput
 
@@ -492,12 +359,11 @@ on post-fs-data
     chown system media /dev/uibc
     chmod 0660 /dev/uibc
 
-    #Camera
+    # Camera
     chmod 0660 /dev/camera-isp
     chmod 0660 /dev/camera-fdvt
     chmod 0660 /dev/kd_camera_hw
     chmod 0660 /dev/kd_camera_flashlight
-    chmod 0660 /dev/kd_camera_hw_bus2
     chmod 0660 /dev/BU64245
     chmod 0660 /dev/CAM_CAL_DRV
     chmod 0660 /dev/CAM_CAL_DRV_SUB
@@ -506,7 +372,6 @@ on post-fs-data
     chown system camera /dev/camera-fdvt
     chown system camera /dev/kd_camera_hw
     chown system camera /dev/kd_camera_flashlight
-    chown system camera /dev/kd_camera_hw_bus2
     chown system camera /dev/BU64245
     chown system camera /dev/CAM_CAL_DRV
     chown system camera /dev/CAM_CAL_DRV_SUB
@@ -518,7 +383,7 @@ on post-fs-data
     chown system camera /sys/bus/platform/drivers/mem_bw_ctrl/concurrency_scenario
     chmod 0660 /sys/bus/platform/drivers/mem_bw_ctrl/concurrency_scenario
 
-    # change partition permission
+    # Change partition permission
     chmod 0640 /mtd@sec_ro
     chown root system /mtd@sec_ro
 
@@ -543,15 +408,15 @@ on post-fs-data
     chmod 0660 /mtd@misc
     chown root system /mtd@misc
 
-    # mtk_sched
+    # MTK_SCHED
     chmod 0660 /dev/mtk_sched
     chown system media /dev/mtk_sched
 
-    # BT SCO CVSD, for MT6572 and MT6582 CVSD codec on AP
+    # EBC
     chmod 0660 /dev/ebc
     chown system media /dev/ebc
 
-    # autok
+    # Autok
     chown root system /sys/autok/debug
     chown root system /sys/autok/param_count
     chown root system /sys/autok/ready
@@ -563,7 +428,7 @@ on post-fs-data
     chown root system /sys/autok/stage1/2/LOG
     chown root system /sys/autok/stage2/2
 
-    #sn
+    # Serial
     chmod 0664 /sys/class/android_usb/android0/iSerial
     chown root system /sys/class/android_usb/android0/iSerial
     chmod 0664 /sys/devices/platform/mt_usb/cmode
@@ -604,17 +469,14 @@ on boot
     write /proc/sys/vm/dirty_writeback_centisecs 300
     chmod 0660 /sys/power/autosleep
 
-    chmod 0664 /sys/class/leds/lcd-backlight/brightness
-
-    chown system system /sys/bus/platform/drivers/gyroscope/gyro_orientation
-    chown system system /sys/devices/system/cpu/cpufreq/hotplug/cpu_num_base
-    chmod 0660 /sys/devices/system/cpu/cpufreq/hotplug/cpu_num_base
     chown root   system /sys/kernel/debug/binder/transaction_log_enable
     chown root   system /sys/kernel/debug/binder/perf_evalue
 
     chown system /sys/module/mlog/parameters/do_mlog
     chown system /sys/module/mlog/parameters/timer_intval
 
+    chmod 0664 /sys/class/leds/lcd-backlight/brightness
+
     chown root   radio  /sys/class/leds/lcd-backlight/duty
     chown root   radio  /sys/class/leds/lcd-backlight/div
     chown system system /sys/class/leds/lcd-backlight/trigger
@@ -629,6 +491,8 @@ on boot
     chmod 0220 /sys/power/tuxonice/do_hibernate
 
     # HMP CPU hotplug strategy
+    chown system system /sys/devices/system/cpu/cpufreq/hotplug/cpu_num_base
+    chmod 0660 /sys/devices/system/cpu/cpufreq/hotplug/cpu_num_base
     chown system system /proc/hps/num_base_perf_serv
     chmod 0660 /proc/hps/num_base_perf_serv
     chown system system /proc/hps/num_limit_power_serv
@@ -650,7 +514,7 @@ on boot
     chown system system /proc/fliper
     chmod 0664 /proc/fliper
 
-    #change permissions about terminal
+    # Change permissions about terminal
     chown root radio /proc/net/vlan/config
     chmod 0640 /proc/net/vlan/config
     chown root radio /proc/net/ip6_tables_matches
@@ -673,7 +537,7 @@ on boot
     chown shell system /proc/driver/wmt_dbg
     chown shell system /proc/driver/wmt_aee
 
-    # /dev/ttyMT2 for Connectivity BT/GPS usage
+    # Connectivity usage
     chmod 0660 /dev/ttyMT2
     chown system system /dev/ttyMT2
 
@@ -685,7 +549,7 @@ on property:ro.board.platform=mt6753
 on property:sys.boot_completed=1
     # defer zram init after boot_complete
     swapon_all /fstab.swap
-    # end boot time fs tune
+    # End boot fs tune
     write /sys/block/mmcblk0/queue/read_ahead_kb 128
     write /sys/block/mmcblk0/queue/nr_requests 128
     write /sys/block/mmcblk0/queue/iostats 1
@@ -727,9 +591,7 @@ service pq /vendor/bin/pq
     group system graphics
     oneshot
 
-#
-# MTK Wi-Fi related services (Begin)
-#
+# MTK Wi-Fi related services
 
 # monitor property and power on/off wlan
 on property:wlan.driver.status=ok
@@ -766,10 +628,6 @@ service wpa_supplicant /system/bin/wpa_supplicant \
     disabled
     oneshot
 
-#
-# MTK Wi-Fi related services (End)
-#
-
 # GPS
 service agpsd /vendor/bin/mtk_agpsd
     class main
@@ -801,18 +659,12 @@ service akmd09911 /vendor/bin/akmd09911
     group system
     class main
 
-#
-# emsvr service (start)
-#
+# Emsvr
 service emsvr /vendor/bin/em_svr
     disabled
     user system
     group system radio diag net_bt_stack
 
-#
-# emsvr service (end)
-#
-
 # Thermal
 service thermal_manager /vendor/bin/thermal_manager
     class main
@@ -820,11 +672,6 @@ service thermal_manager /vendor/bin/thermal_manager
     group system
     oneshot
 
-service fuelgauged /vendor/bin/fuelgauged
-    class main
-    user system
-    group system
-
 service wmtLoader /vendor/bin/wmt_loader
     user root
     group root
@@ -836,8 +683,13 @@ service conn_launcher /vendor/bin/6620_launcher -p /vendor/etc/firmware/
     group system
     class core
 
-# healthd charger
+# Charger
 service charger /sbin/healthd -c
     class charger
     critical
     seclabel u:r:healthd:s0
+
+service fuelgauged /vendor/bin/fuelgauged
+    class main
+    user system
+    group system
diff --git a/rootdir/init.mt6735.usb.rc b/rootdir/init.mt6735.usb.rc
index d5f390c..50faad3 100755
--- a/rootdir/init.mt6735.usb.rc
+++ b/rootdir/init.mt6735.usb.rc
@@ -312,65 +312,6 @@ on property:sys.usb.config=ptp,mass_storage,adb,acm
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 
-# duplicate of init.usb.rc
-
-#28. USB accessory configuration
-#on property:sys.usb.config=accessory
-#    write /sys/class/android_usb/android0/enable 0
-#    write /sys/class/android_usb/android0/idVendor 18d1
-#    write /sys/class/android_usb/android0/idProduct 2d00
-#    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-#    write /sys/class/android_usb/android0/enable 1
-#    setprop sys.usb.state ${sys.usb.config}
-
-#39. USB accessory configuration, with adb
-#on property:sys.usb.config=accessory,adb
-#    write /sys/class/android_usb/android0/enable 0
-#    write /sys/class/android_usb/android0/idVendor 18d1
-#    write /sys/class/android_usb/android0/idProduct 2d01
-#    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-#    write /sys/class/android_usb/android0/enable 1
-#    start adbd
-#    setprop sys.usb.state ${sys.usb.config}
-
-#30. audio accessory configuration
-#on property:sys.usb.config=audio_source
-#    write /sys/class/android_usb/android0/enable 0
-#    write /sys/class/android_usb/android0/idVendor 18d1
-#    write /sys/class/android_usb/android0/idProduct 2d02
-#    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-#    write /sys/class/android_usb/android0/enable 1
-#    setprop sys.usb.state ${sys.usb.config}
-
-#31. audio accessory configuration, with adb
-#on property:sys.usb.config=audio_source,adb
-#    write /sys/class/android_usb/android0/enable 0
-#    write /sys/class/android_usb/android0/idVendor 18d1
-#    write /sys/class/android_usb/android0/idProduct 2d03
-#    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-#    write /sys/class/android_usb/android0/enable 1
-#    start adbd
-#    setprop sys.usb.state ${sys.usb.config}
-
-#32. USB and audio accessory configuration
-#on property:sys.usb.config=accessory,audio_source
-#    write /sys/class/android_usb/android0/enable 0
-#    write /sys/class/android_usb/android0/idVendor 18d1
-#    write /sys/class/android_usb/android0/idProduct 2d04
-#    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-#    write /sys/class/android_usb/android0/enable 1
-#    setprop sys.usb.state ${sys.usb.config}
-
-#33. USB and audio accessory configuration, with adb
-#on property:sys.usb.config=accessory,audio_source,adb
-#    write /sys/class/android_usb/android0/enable 0
-#    write /sys/class/android_usb/android0/idVendor 18d1
-#    write /sys/class/android_usb/android0/idProduct 2d05
-#    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-#    write /sys/class/android_usb/android0/enable 1
-#    start adbd
-#    setprop sys.usb.state ${sys.usb.config}
-
 #34.USB Charging Only configuration
 on property:sys.usb.config=charging
     setprop sys.usb.state ${sys.usb.config}
@@ -619,8 +560,6 @@ on property:sys.usb.config=gs1gs3,dual_acm
     setprop sys.usb.state ${sys.usb.config}
     setprop sys.usb.acm_idx 1,2,4
 
-###############################################
-
 on property:sys.usb.config=mass_storage,dual_acm
     write /sys/class/android_usb/android0/enable 0
     write /sys/class/android_usb/android0/idVendor ${sys.usb.vid}
@@ -706,22 +645,22 @@ on property:sys.usb.bicr=no
     write /sys/class/android_usb/android0/f_mass_storage/lun/file "0"
 
 on property:mediatek.usb.port.mode=usb
-      write /sys/devices/platform/mt_usb/portmode 0
+    write /sys/devices/platform/mt_usb/portmode 0
 
 on property:mediatek.usb.port.mode=uart
-      write /sys/devices/platform/mt_usb/portmode 1
+    write /sys/devices/platform/mt_usb/portmode 1
 
 on property:mediatek.em.usb.set=USB_DRIVING_CAPABILITY
     write /sys/kernel/debug/usb20_phy/USB_DRIVING_CAPABILITY ${mediatek.em.usb.value}
 
 on property:mediatek.em.usb.set=RG_USB20_TERM_VREF_SEL
-	write /sys/kernel/debug/usb20_phy/RG_USB20_TERM_VREF_SEL ${mediatek.em.usb.value}
+    write /sys/kernel/debug/usb20_phy/RG_USB20_TERM_VREF_SEL ${mediatek.em.usb.value}
 
 on property:mediatek.em.usb.set=RG_USB20_HSTX_SRCTRL
-	write /sys/kernel/debug/usb20_phy/RG_USB20_HSTX_SRCTRL ${mediatek.em.usb.value}
+    write /sys/kernel/debug/usb20_phy/RG_USB20_HSTX_SRCTRL ${mediatek.em.usb.value}
 
 on property:mediatek.em.usb.set=RG_USB20_VRT_VREF_SEL
-	write /sys/kernel/debug/usb20_phy/RG_USB20_VRT_VREF_SEL ${mediatek.em.usb.value}
+    write /sys/kernel/debug/usb20_phy/RG_USB20_VRT_VREF_SEL ${mediatek.em.usb.value}
 
 on property:mediatek.em.usb.set=RG_USB20_INTR_EN
-	write /sys/kernel/debug/usb20_phy/RG_USB20_INTR_EN ${mediatek.em.usb.value}
+    write /sys/kernel/debug/usb20_phy/RG_USB20_INTR_EN ${mediatek.em.usb.value}
diff --git a/rootdir/init.recovery.mt6735.rc b/rootdir/init.recovery.mt6735.rc
index 42473ff..077afc3 100644
--- a/rootdir/init.recovery.mt6735.rc
+++ b/rootdir/init.recovery.mt6735.rc
@@ -3,7 +3,14 @@ on boot
     # Temp Backward compatibility
     mkdir /dev/block/platform/mtk-msdc.0/by-name 0777 system system
     symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/system /dev/block/platform/mtk-msdc.0/by-name/system
+    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/custom /dev/block/platform/mtk-msdc.0/by-name/custom
+    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/nvdata /dev/block/platform/mtk-msdc.0/by-name/nvdata
+    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/nvram /dev/block/platform/mtk-msdc.0/by-name/nvram
     symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/userdata /dev/block/platform/mtk-msdc.0/by-name/userdata
     symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/cache /dev/block/platform/mtk-msdc.0/by-name/cache
     symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/boot /dev/block/platform/mtk-msdc.0/by-name/boot
-    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/recovery /dev/block/platform/mtk-msdc.0/by-name/recovery
\ No newline at end of file
+    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/logo /dev/block/platform/mtk-msdc.0/by-name/logo
+    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/lk /dev/block/platform/mtk-msdc.0/by-name/lk
+    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/tee1 /dev/block/platform/mtk-msdc.0/by-name/tee1
+    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/tee2 /dev/block/platform/mtk-msdc.0/by-name/tee2
+    symlink /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/recovery /dev/block/platform/mtk-msdc.0/by-name/recovery
diff --git a/rootdir/meta_init.modem.rc b/rootdir/meta_init.modem.rc
deleted file mode 100644
index 8fd1006..0000000
--- a/rootdir/meta_init.modem.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# IMPORTANT: Do not create world writable files or directories.
-# This is a common source of Android security bugs.
-#
-
-on post-fs
-
-    write /proc/bootprof "post-fs: on meta modem start"
-
-    # Modem related device nodes
-    mkdir /data/nvram/md  0770 root system
-
-    chown radio radio /sys/kernel/ccci/boot
-
-service ccci_fsd /vendor/bin/ccci_fsd 0
-    user radio
-    group radio system
-    oneshot
-
-service ccci_mdinit /vendor/bin/ccci_mdinit 0
-    user system
-    group radio system
-    oneshot
-
-on post-fs-data
-
-#SeLinux
-    mkdir /data/ccci_cfg 0770 system radio
-    restorecon /data/ccci_cfg
-    restorecon_recursive /protect_f
-    restorecon_recursive /protect_s
diff --git a/rootdir/meta_init.project.rc b/rootdir/meta_init.project.rc
deleted file mode 100644
index bbc9e5d..0000000
--- a/rootdir/meta_init.project.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-on post-fs
-#
-# Connectivity related modules and character device nodes (Begin)
-#
-    # for 662x_launcher
-    chmod 0660 /dev/ttyMT2
-    chown system system /dev/ttyMT2
-
-    # Create char device file for WMT, GPS, BT, WIFI
-    mknod /dev/stpwmt c 190 0;
-    mknod /dev/stpgps c 191 0;
-    mknod /dev/stpbt  c 192 0;
-    chmod 0660 /dev/stpwmt
-    chown system system /dev/stpwmt
-    chmod 0660 /dev/wmtdetect
-    chown system system /dev/wmtdetect
-
-    mknod /dev/wmtWifi c 153 0
-    chmod 0666 /dev/wmtWifi
-    chmod 0660 /dev/stpgps
-    chmod 0660 /dev/stpbt
-    chown bluetooth radio /dev/stpbt
-
-#
-# Connectivity related modules and character device nodes (Ends)
-#
-
-on boot
-
-
-#
-# Connectivity related services (Begin)
-#
-
-service wmtLoader /vendor/bin/wmt_loader
-    user root
-    group root
-    oneshot
-    
-service conn_launcher /vendor/bin/6620_launcher -p /vendor/etc/firmware/
-    user system
-    group system
-
-#
-# Connectivity related services (End)
-#
diff --git a/rootdir/meta_init.rc b/rootdir/meta_init.rc
deleted file mode 100644
index f533b0a..0000000
--- a/rootdir/meta_init.rc
+++ /dev/null
@@ -1,447 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# IMPORTANT: Do not create world writable files or directories.
-# This is a common source of Android security bugs.
-#
-import /init.environ.rc
-import init.ssd.rc
-import init.no_ssd.rc
-import init.ssd_nomuser.rc
-import init.fon.rc
-import init.trustonic.rc
-
-on early-init
-    # Set init and its forked children's oom_adj.
-    write /proc/1/oom_score_adj -1000
-
-    # Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
-    write /sys/fs/selinux/checkreqprot 0
-
-    # Set the security context for the init process.
-    # This should occur before anything else (e.g. ueventd) is started.
-    setcon u:r:init:s0
-
-    # Set the security context of /adb_keys if present.
-    restorecon /adb_keys
-
-    start ueventd
-
-# create mountpoints
-    mkdir /mnt 0775 root system
-
-on init
-    sysclktz 0
-
-loglevel 5
-
-    # Backward compatibility.
-    symlink /system/etc /etc
-    symlink /sys/kernel/debug /d
-
-    # Link /vendor to /system/vendor for devices without a vendor partition.
-    symlink /system/vendor /vendor
-
-# Temp Backward compatibility
-    symlink /dev/block/platform/mtk-msdc.0/by-name/boot /dev/bootimg
-    symlink /dev/block/platform/mtk-msdc.0/by-name/recovery /dev/recovery
-    symlink /dev/block/platform/mtk-msdc.0/by-name/secro  /dev/sec_ro
-    symlink /dev/block/platform/mtk-msdc.0/by-name/kb /dev/kb
-    symlink /dev/block/platform/mtk-msdc.0/by-name/dkb /dev/dkb
-    symlink /dev/block/platform/mtk-msdc.0/by-name/seccfg /dev/seccfg
-    symlink /dev/block/platform/mtk-msdc.0/by-name/proinfo /dev/pro_info
-    symlink /dev/block/platform/mtk-msdc.0/by-name/nvram /dev/nvram
-    symlink /dev/block/platform/mtk-msdc.0/by-name/para /dev/misc
-    symlink /dev/block/platform/mtk-msdc.0/by-name/logo /dev/logo
-# Create cgroup mount point for cpu accounting
-    mkdir /acct
-    mount cgroup none /acct cpuacct
-    mkdir /acct/uid
-
-    mkdir /system
-    mkdir /data 0771 system system
-    mkdir /cache 0770 system cache
-    mkdir /config 0500 root root
-    mkdir /protect_f 0771 system system
-    mkdir /protect_s 0771 system system
-    #create mountpoint for persist partition
-    mkdir /persist 0771 system system
-    #Create nvdata mount point
-    mkdir /nvdata 0771 system system
-
-    #Create CIP mount point
-    mkdir /custom
-
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell 0700 shell shell
-    mkdir /mnt/media_rw 0700 media_rw media_rw
-    mkdir /storage 0751 root sdcard_r
-
-    mkdir /mnt/cd-rom 0000 system system
-
-    # Directory for putting things only root should see.
-    mkdir /mnt/secure 0700 root root
-
-    # Directory for staging bindmounts
-    mkdir /mnt/secure/staging 0700 root root
-
-    # Directory-target for where the secure container
-    # imagefile directory will be bind-mounted
-    mkdir /mnt/secure/asec  0700 root root
-
-    # Secure container public mount points.
-    mkdir /mnt/asec  0700 root system
-    mount tmpfs tmpfs /mnt/asec mode=0755,gid=1000
-
-    # Filesystem image public mount points.
-    mkdir /mnt/obb 0700 root system
-    mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000
-
-    write /proc/sys/kernel/panic_on_oops 1
-    write /proc/sys/kernel/hung_task_timeout_secs 0
-    write /proc/cpu/alignment 4
-    write /proc/sys/kernel/sched_latency_ns 10000000
-    write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000
-    write /proc/sys/kernel/sched_compat_yield 1
-
-# Healthd can trigger a full boot from charger mode by signaling this
-# property when the power button is held.
-on property:sys.boot_from_charger_mode=1
-    class_stop charger
-    trigger late-init
-
-# Load properties from /system/ + /factory after fs mount.
-on load_all_props_action
-    load_system_props
-    load_persist_props
-
-# Mount filesystems and start core system services.
-on late-init
-    trigger early-fs
-    trigger fs
-    trigger post-fs
-    trigger post-fs-data
-
-    # Load properties from /system/ + /factory after fs mount. Place
-    # this in another action so that the load will be scheduled after the prior
-    # issued fs triggers have completed.
-    trigger load_all_props_action
-
-    trigger early-boot
-    trigger boot
-
-on fs
-    write /proc/bootprof "INIT:Mount_START"
-    mount_all /fstab.mt6735
-
-    #change partition permissions
-    exec /system/bin/chmod 0640 /dev/block/platform/mtk-msdc.0/by-name/boot
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/boot
-    exec /system/bin/chmod 0640 /dev/block/platform/mtk-msdc.0/by-name/recovery
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/recovery
-    exec /system/bin/chmod 0640 /dev/block/platform/mtk-msdc.0/by-name/secro
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/secro
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/seccfg
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/seccfg
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/proinfo
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/proinfo
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/otp
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/otp
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/nvram
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/nvram
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/para
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/para
-    exec /system/bin/chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/logo
-    exec /system/bin/chown root:system /dev/block/platform/mtk-msdc.0/by-name/logo
-    write /proc/bootprof "INIT:Mount_END"
-
-on post-fs
-    # once everything is setup, no need to modify /
-    mount rootfs rootfs / ro remount
-
-    # We chown/chmod /cache again so because mount is run as root + defaults
-    chown system cache /cache
-    chmod 0770 /cache
-    # We restorecon /cache in case the cache partition has been reset.
-    restorecon_recursive /cache
-
-    chown system system /protect_f
-    chmod 0770 /protect_f
-
-    chown system system /protect_s
-    chmod 0770 /protect_s
-
-    #change permissions on kmsg & sysrq-trigger so bugreports can grab kthread stacks
-    chown root system /proc/kmsg
-    chmod 0440 /proc/kmsg
-
-    # make the selinux kernel policy world-readable
-    chmod 0444 /sys/fs/selinux/policy
-
-    # create the lost+found directories, so as to enforce our permissions
-    mkdir /cache/lost+found 0770 root root
-
-on post-fs-data
-    # We chown/chmod /data again so because mount is run as root + defaults
-    chown system system /data
-    chmod 0771 /data
-    # We restorecon /data in case the userdata partition has been reset.
-    restorecon /data
-    chown system system /persist
-    chmod 0771 /persist
-
-    # create basic filesystem structure
-    #mkdir /data/nvram 2770 root system
-    # We chown/chmod /nvdata again so because mount is run as root + defaults
-    chown root system /nvdata
-    chmod 2770 /nvdata
-    symlink /nvdata /data/nvram
-
-    # Set SELinux security contexts on upgrade or policy update.
-    restorecon_recursive /nvdata
-
-    mkdir /data/misc 01771 system misc
-    mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth
-    mkdir /data/misc/bluetooth 0770 system system
-    mkdir /data/misc/keystore 0700 keystore keystore
-    mkdir /data/misc/keychain 0771 system system
-    mkdir /data/misc/vpn 0770 system vpn
-    mkdir /data/misc/systemkeys 0700 system system
-    # give system access to wpa_supplicant.conf for backup and restore
-    mkdir /data/misc/wifi 0770 wifi wifi
-    chmod 0660 /data/misc/wifi/wpa_supplicant.conf
-    chmod 0660 /data/misc/wifi/p2p_supplicant.conf
-    mkdir /data/local 0751 root root
-    # For security reasons, /data/local/tmp should always be empty.
-    # Do not place files or directories in /data/local/tmp
-    mkdir /data/local/tmp 0771 shell shell
-    mkdir /data/data 0771 system system
-    mkdir /data/app-private 0771 system system
-    mkdir /data/app-asec 0700 root root
-    mkdir /data/app 0771 system system
-    mkdir /data/property 0700 root root
-    mkdir /data/ssh 0750 root shell
-    mkdir /data/ssh/empty 0700 root root
-
-    # create the lost+found directories, so as to enforce our permissions
-    mkdir /data/lost+found 0770
-
-    # double check the perms, in case lost+found already exists, and set owner
-    chown root root /data/lost+found
-    chmod 0770 /data/lost+found
-
-    # H264 Decoder
-    chmod 777 /dev/MT6516_H264_DEC
-
-    # Internal SRAM Driver
-    chmod 777 /dev/MT6516_Int_SRAM
-
-    # MM QUEUE Driver
-    chmod 777 /dev/MT6516_MM_QUEUE
-
-    # MPEG4 Decoder
-    chmod 777 /dev/MT6516_MP4_DEC
-
-    # MPEG4 Encoder
-    chmod 777 /dev/MT6516_MP4_ENC
-
-    # OpenCORE proxy config
-    chmod 0666 /data/http-proxy-cfg
-
-    # OpenCORE player config
-    chmod 0666 /etc/player.cfg
-
-    # WiFi
-    mkdir /data/misc/wifi 0770 system wifi
-    mkdir /data/misc/wifi/sockets 0770 system wifi
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
-    chown dhcp dhcp /data/misc/dhcp
-    chmod 0660 /sys/class/rfkill/rfkill1/state
-    chown system system /sys/class/rfkill/rfkill1/state
-    # Turn off wifi by default
-    write /sys/class/rfkill/rfkill1/state 0
-
-    #otp
-    chmod 0660 /dev/otp
-    chown root system /dev/otp
-
-    # Touch Panel
-    chown system system /sys/touchpanel/calibration
-    chmod 0660 /sys/touchpanel/calibration
-
-    chmod 0664 /dev/pmem_multimedia
-    chmod 0664 /dev/mt6516-isp
-    chmod 0664 /dev/mt6516-IDP
-    chmod 0664 /dev/mt9p012
-    chmod 0664 /dev/mt6516_jpeg
-
-    # RTC
-    mkdir /data/misc/rtc 0770 system system
-
-    # M4U
-    #insmod /system/lib/modules/m4u.ko
-    #mknod /dev/M4U_device c 188 0
-    chmod 0444 /dev/M4U_device
-
-    # Sensor
-    chmod 0666 /dev/sensor
-
-    # GPIO
-    chmod 0666 /dev/mtgpio
-
-    # Android SEC related device nodes
-    chmod 0660 /dev/sec
-    chown root system /dev/sec
-
-    # device info interface
-    chmod 0440 /dev/devmap
-    chown root system /dev/devmap
-
-    chmod 0666 /dev/exm0
-
-    # Separate location for storing security policy files on data
-    mkdir /data/security 0711 system system
-
-    # Reload policy from /data/security if present.
-    setprop selinux.reload_policy 1
-
-    # Set SELinux security contexts on upgrade or policy update.
-    restorecon_recursive /data
-
-    # If there is no fs-post-data action in the init.<device>.rc file, you
-    # must uncomment this line, otherwise encrypted filesystems
-    # won't work.
-    # Set indication (checked by vold) that we have finished this action
-    setprop vold.post_fs_data_done 1
-
-on boot
-
-
-# basic network init
-    ifup lo
-    hostname localhost
-    domainname localdomain
-
-    class_start default
-    class_start core
-
-on nonencrypted
-    class_start main
-    class_start late_start
-
-on property:vold.decrypt=trigger_default_encryption
-    start defaultcrypto
-
-on property:vold.decrypt=trigger_encryption
-    start surfaceflinger
-    start encrypt
-
-on property:vold.decrypt=trigger_reset_main
-    class_reset main
-
-on property:vold.decrypt=trigger_load_persist_props
-    load_persist_props
-
-on property:vold.decrypt=trigger_post_fs_data
-    trigger post-fs-data
-
-on property:vold.decrypt=trigger_restart_min_framework
-    class_start main
-
-on property:vold.decrypt=trigger_restart_framework
-    start nvram_daemon
-    class_start main
-    class_start late_start
-    start permission_check
-
-on property:vold.decrypt=trigger_shutdown_framework
-    class_reset late_start
-    class_reset main
-
-service ueventd /sbin/ueventd
-    class core
-    critical
-    seclabel u:r:ueventd:s0
-
-service logd /system/bin/logd
-    class core
-    socket logd stream 0666 logd logd
-    socket logdr seqpacket 0666 logd logd
-    socket logdw dgram 0222 logd logd
-    seclabel u:r:logd:s0
-
-service console /system/bin/sh
-    class core
-    console
-    disabled
-    user shell
-    group shell log
-    seclabel u:r:shell:s0
-
-on property:sys.powerctl=*
-    powerctl ${sys.powerctl}
-
-on property:ro.debuggable=1
-    start console
-
-# adbd is controlled via property triggers in init.<platform>.usb.rc
-service adbd /sbin/adbd --root_seclabel=u:r:su:s0
-    class core
-    socket adbd stream 660 system system
-    disabled
-    seclabel u:r:adbd:s0
-
-service vold /system/bin/vold
-    class core
-    socket vold stream 0660 root mount
-    ioprio be 2
-
-# One shot invocation to deal with encrypted volume.
-service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
-    disabled
-    oneshot
-    # vold will set vold.decrypt to trigger_restart_framework (default
-    # encryption) or trigger_restart_min_framework (other encryption)
-
-# One shot invocation to encrypt unencrypted volumes
-service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default
-    disabled
-    oneshot
-    # vold will set vold.decrypt to trigger_restart_framework (default
-    # encryption)
-
-service meta_tst /vendor/bin/meta_tst
-
-service nvram_daemon /vendor/bin/nvram_daemon
-    class main
-    user root
-    group system
-    oneshot
-
-service debuggerd /system/bin/debuggerd
-    class main
-
-service debuggerd64 /system/bin/debuggerd64
-    class main
-
-
-#mass_storage,adb,acm
-on property:ro.boot.usbconfig=0
-    write /sys/class/android_usb/android0/iSerial $ro.serialno
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 0e8d
-    write /sys/class/android_usb/android0/idProduct 2006
-    write /sys/class/android_usb/android0/f_acm/instances 1
-    write /sys/class/android_usb/android0/functions mass_storage,adb,acm
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-
-#acm
-on property:ro.boot.usbconfig=1
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/iSerial " "
-    write /sys/class/android_usb/android0/idVendor 0e8d
-    write /sys/class/android_usb/android0/idProduct 2007
-    write /sys/class/android_usb/android0/f_acm/instances 1
-    write /sys/class/android_usb/android0/functions acm
-    write /sys/class/android_usb/android0/bDeviceClass 02
-    write /sys/class/android_usb/android0/enable 1
diff --git a/rootdir/ueventd.mt6735.rc b/rootdir/ueventd.mt6735.rc
index 312a403..87e9afc 100644
--- a/rootdir/ueventd.mt6735.rc
+++ b/rootdir/ueventd.mt6735.rc
@@ -29,7 +29,7 @@ subsystem adf
 /dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/frp       0660    root    system
 
 # OTP
-/dev/otp                  0660  system      system
+/dev/otp                 0660  system      system
 
 # Connectivity
 /dev/stpwmt              0660  system     system
@@ -45,7 +45,7 @@ subsystem adf
 # WIFI
 /dev/wmtWifi             0660  system     system
 
-# MTK BTIF driver
+# BTIF driver
 /dev/btif                 0600  system system
 
 # add the read write right of ttyUSB*
@@ -59,18 +59,12 @@ subsystem adf
 # Anyone can read the logs, but if they're not in the "logs"
 # group, then they'll only see log entries for their UID.
 /dev/xLog                 0600   root       root
-/dev/log/*                0666   root       log
-/dev/log/ksystem          0600   root       log
 
-# kms driver for drm based gpu
-/dev/dri/*                0666   root       graphics
-
-# these should not be world writable
+# These should not be world writable
 /dev/diag                 0660   radio      radio
 /dev/diag_arm9            0660   radio      radio
 /dev/android_adb          0660   adb        adb
 /dev/android_adb_enable   0660   adb        adb
-/dev/ttyMSM0              0600   bluetooth  bluetooth
 /dev/uhid                 0660   system     net_bt_stack
 /dev/uinput               0660   system     net_bt_stack
 /dev/alarm                0664   system     radio
@@ -80,34 +74,19 @@ subsystem adf
 /dev/input/*              0660   root       input
 /dev/eac                  0660   root       audio
 /dev/cam                  0660   root       camera
-/dev/pmem                 0660   system     graphics
-/dev/pmem_adsp*           0660   system     audio
-/dev/pmem_camera*         0660   system     camera
 /dev/oncrpc/*             0660   root       system
 /dev/adsp/*               0660   system     audio
 /dev/snd/*                0660   system     audio
-/dev/mt9t013              0660   system     system
 /dev/lightsensor          0640   system     system
-/dev/msm_pcm_out*         0660   system     audio
-/dev/msm_pcm_in*          0660   system     audio
-/dev/msm_pcm_ctl*         0660   system     audio
-/dev/msm_snd*             0660   system     audio
 /dev/msm_mp3*             0660   system     audio
 /dev/audience_a1026*      0660   system     audio
 /dev/tpa2018d1*           0660   system     audio
-/dev/msm_audpre           0660   system     audio
-/dev/msm_audio_ctl        0660   system     audio
-/dev/htc-acoustic         0660   system     audio
 /dev/vdec                 0660   system     audio
 /dev/q6venc               0660   system     audio
 /dev/snd/dsp              0660   system     audio
 /dev/snd/dsp1             0660   system     audio
 /dev/snd/mixer            0660   system     audio
 /dev/smd0                 0640   radio      radio
-/dev/qmi                  0640   radio      radio
-/dev/qmi0                 0640   radio      radio
-/dev/qmi1                 0640   radio      radio
-/dev/qmi2                 0640   radio      radio
 /dev/bus/usb/*            0660   root       usb
 /dev/mtp_usb              0660   root       mtp
 /dev/usb_accessory        0660   root       usb
@@ -118,42 +97,20 @@ subsystem adf
 /sys/kernel/ccci          modem_info   0644   radio       radio
 /sys/kernel/ccci          md1_postfix  0644   radio       radio
 /sys/kernel/ccci          md2_postfix  0644   radio       radio
-/dev/ccci_pcm_rx          0660   audio      audio
-/dev/ccci_pcm_tx          0660   audio      audio
 /dev/ccci_aud             0660   audio      audio
-/dev/ccci2_aud            0660   audio      audio
-/dev/eemcs_aud            0660   audio      audio
-
-# SGX device node
-/dev/pvrsrvkm             0666   root       root
-/dev/pvr_sync             0666   root       root
 
 # GPIO
 /dev/mtgpio	0600	radio	root
 
-# FOR VIA MODEM
-/dev/ttySDIO*	0660	radio    sdcard_rw
-/dev/ttyRB*     0660    radio    radio
-
 # Mali node
-/dev/mali               0666  system graphics
+/dev/mali*               0666  system graphics
 
 # Change ION driver permission
 /dev/ion                  0666   system     graphics
 
 # touch
 /dev/touch              0660   root  system
-/dev/hotknot            0660   root  system
-
-# hang_detect
-/dev/RT_Monitor         0600   system  system
-/dev/kick_powerkey      0600   system  system
-
-# MTK In-House TEE
-/dev/ttyACM0		0660   radio   radio
-
 # for lsm6ds3
-
 #common sensors files
 /sys/devices/iio:device* buffer/enable 0666 system system
 /sys/devices/iio:device* buffer/length 0666 system system