Merge "msm: Add support for thermal monitor on msm8974" into msm-3.4
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index 36ff8c3..4c4510c 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -732,6 +732,15 @@
qcom,descriptor-fifo-size = <0x1400>;
};
};
+
+ qcom,msm-thermal {
+ compatible = "qcom,msm-thermal";
+ qcom,sensor-id = <0>;
+ qcom,poll-ms = <250>;
+ qcom,limit-temp = <60>;
+ qcom,temp-hysteresis = <10>;
+ qcom,freq-step = <2>;
+ };
};
/include/ "msm-pm8x41-rpm-regulator.dtsi"
diff --git a/arch/arm/mach-msm/board-8974.c b/arch/arm/mach-msm/board-8974.c
index ba8d7770..388307b 100644
--- a/arch/arm/mach-msm/board-8974.c
+++ b/arch/arm/mach-msm/board-8974.c
@@ -26,6 +26,7 @@
#endif
#include <linux/regulator/machine.h>
#include <linux/regulator/krait-regulator.h>
+#include <linux/msm_thermal.h>
#include <asm/mach/map.h>
#include <asm/hardware/gic.h>
#include <mach/board.h>
@@ -434,6 +435,7 @@
else
msm_clock_init(&msm8974_clock_init_data);
msm8974_init_buses();
+ msm_thermal_device_init();
}
static struct of_device_id irq_match[] __initdata = {
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index b2d2f74..d082273 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -75,7 +75,7 @@
config THERMAL_MONITOR
bool "Monitor thermal state and limit CPU Frequency"
- depends on THERMAL_TSENS8960
+ depends on THERMAL_TSENS8960 || THERMAL_TSENS8974
depends on CPU_FREQ_MSM
default n
help