msm8960-common: kill thermald

Replace with in kernel solution

Change-Id: I81f0f4fa8401d8e136679923cc2fb5fa7c5dcd38

5 files changed, 0 insertions, 63 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2e13e0f..fceaab3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -125,7 +125,6 @@ BOARD_SEPOLICY_UNION += \
     sysinit.te \
     system_app.te \
     system_server.te \
-    thermal-engine.te \
     ueventd.te \
     vold.te \
     wpa.te
diff --git a/configs/thermald-8960.conf b/configs/thermald-8960.conf
deleted file mode 100644
index 7fd19b5..0000000
--- a/configs/thermald-8960.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-sampling         5000
-
-[pa_therm0]
-sampling         100000
-thresholds       65      70      75      80      85      90
-thresholds_clr   60      65      70      75      80      85
-actions          none    none    none    none    none    none
-action_info      0       0       0       0       0       0
-
-[tsens_tz_sensor0]
-sampling         1000
-thresholds       65      90      93      96      99      102     105
-thresholds_clr   62      87      90      93      96      99      102
-actions          cpu     cpu     cpu     cpu     cpu     cpu     shutdown
-action_info      1512000 1296000 1188000 918000  756000  648000  5000
-
-[tsens_tz_sensor1]
-sampling         1000
-thresholds       75
-thresholds_clr   72
-actions          none
-action_info      0
-
-[tsens_tz_sensor2]
-sampling         1000
-thresholds       75
-thresholds_clr   72
-actions          none
-action_info      0
-
-[tsens_tz_sensor3]
-sampling         1000
-thresholds       75      78      81      84      87      90
-thresholds_clr   72      75      78      81      84      87
-actions          cpu     cpu     cpu     cpu     cpu     shutdown
-action_info      1296000 1188000 918000  756000  648000  5000
-
-[tsens_tz_sensor4]
-sampling         1000
-thresholds       75
-thresholds_clr   72
-actions          none
-action_info      0
-
diff --git a/msm8960.mk b/msm8960.mk
index 3bba07e..d10f9b6 100644
--- a/msm8960.mk
+++ b/msm8960.mk
@@ -185,11 +185,6 @@ PRODUCT_PACKAGES += \
     init.qcom.usb.rc \
     ueventd.qcom.rc
 
-# Thermal
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/thermald-8960.conf:system/etc/thermald-8960.conf \
-    $(LOCAL_PATH)/configs/thermald-8960.conf:system/etc/thermald.conf
-
 # USB
 PRODUCT_PACKAGES += \
     com.android.future.usb.accessory
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index c2a4182..087b653 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -684,7 +684,6 @@ on property:sys.boot_completed=1
     write /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/idle_enabled 1
     write /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/idle_enabled 1
     write /sys/module/pm_8x60/modes/cpu0/power_collapse/idle_enabled 1
-    write /sys/module/msm_thermal/core_control/enabled 0
     write /sys/devices/system/cpu/cpu1/online 1
     write /sys/devices/system/cpu/cpufreq/interactive/min_sample_time 90000
     write /sys/devices/system/cpu/cpufreq/interactive/max_freq_hysteresis 100000
@@ -696,7 +695,6 @@ on property:sys.boot_completed=1
     write /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq 384000
     write /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq 384000
     write /sys/devices/system/cpu/sched_mc_power_savings 2
-    write /sys/module/msm_thermal/core_control/enabled 1
     chown root system /sys/devices/system/cpu/mfreq
     chmod 220 /sys/devices/system/cpu/mfreq
     chown system system /sys/devices/system/cpu/cpu1/online
@@ -742,7 +740,6 @@ on property:sys.boot_completed=1
 
     # Set performance profile
     setprop sys.perf.profile 1
-    start thermald
 
     # Set up KSM
     write /sys/kernel/mm/ksm/deferred_timer 1
@@ -867,12 +864,6 @@ service qcamerasvr /system/bin/mm-qcamera-daemon
     user media
     group system camera inet input graphics
 
-service thermald /system/bin/thermald
-   class main
-   user root
-   group root
-   disabled
-
 service mpdecision /system/bin/mpdecision --avg_comp
     user root
     group root system
diff --git a/sepolicy/thermal-engine.te b/sepolicy/thermal-engine.te
deleted file mode 100644
index eaf4eb7..0000000
--- a/sepolicy/thermal-engine.te
+++ /dev/null
@@ -1,4 +0,0 @@
-allow thermal-engine self:capability net_admin;
-allow thermal-engine self:netlink_kobject_uevent_socket { bind read setopt };
-allow thermal-engine sysfs:file w_file_perms;
-allow thermal-engine sysfs_devices_system_cpu:file rw_file_perms;