From: Pavel Kubelun Date: Fri, 24 Mar 2017 13:12:40 +0000 (+0300) Subject: ipq806x: tsens: convert degrees to millicelsius X-Git-Tag: v18.06.0-rc1~3216 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=9ac4c1dcee7ba101233ac03437382e0831b74577 ipq806x: tsens: convert degrees to millicelsius Current driver shows temp in full degrees while other apps await it to be in millidegrees. Initially the driver represents termal data in millidegrees but then it gets divided by TSENS_FACTOR. So lets just set it to '1'. Signed-off-by: Pavel Kubelun --- diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi index dd55754106..2c7ba5acc1 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -85,26 +85,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -117,26 +117,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -149,26 +149,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -181,26 +181,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -213,26 +213,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -245,26 +245,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -277,26 +277,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -309,26 +309,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -341,26 +341,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -373,26 +373,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; @@ -405,26 +405,26 @@ trips { cpu-critical-hi { - temperature = <125>; - hysteresis = <2>; + temperature = <125000>; + hysteresis = <2000>; type = "critical_high"; }; cpu-config-hi { - temperature = <105>; - hysteresis = <2>; + temperature = <105000>; + hysteresis = <2000>; type = "configurable_hi"; }; cpu-config-lo { - temperature = <95>; - hysteresis = <2>; + temperature = <95000>; + hysteresis = <2000>; type = "configurable_lo"; }; cpu-critical-low { temperature = <0>; - hysteresis = <2>; + hysteresis = <2000>; type = "critical_low"; }; }; diff --git a/target/linux/ipq806x/patches-4.9/0063-1-ipq806x-tsens-driver.patch b/target/linux/ipq806x/patches-4.9/0063-1-ipq806x-tsens-driver.patch index d8205c16e3..691f32c5b6 100644 --- a/target/linux/ipq806x/patches-4.9/0063-1-ipq806x-tsens-driver.patch +++ b/target/linux/ipq806x/patches-4.9/0063-1-ipq806x-tsens-driver.patch @@ -109,7 +109,7 @@ index 0000000..c52888f + +#define THRESHOLD_ADDR 0x3624 +/* THRESHOLD_ADDR bitmasks */ -+#define THRESHOLD_MAX_CODE 0xff ++#define THRESHOLD_MAX_CODE 0x20000 +#define THRESHOLD_MIN_CODE 0 +#define THRESHOLD_MAX_LIMIT_SHIFT 24 +#define THRESHOLD_MIN_LIMIT_SHIFT 16 @@ -163,7 +163,7 @@ index 0000000..c52888f + +#define TSENS_8064_SEQ_SENSORS 5 +#define TSENS_8064_S4_S5_OFFSET 40 -+#define TSENS_FACTOR 1000 ++#define TSENS_FACTOR 1 + +/* Trips: from very hot to very cold */ +enum tsens_trip_type {