b4c02c9998
Removed upstreamed patches:
generic/pending-5.4
445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch
446-mtd-spinand-gigadevice-Add-QE-Bit.patch
pistachio/patches-5.4
150-pwm-img-Fix-null-pointer-access-in-probe.patch
Manually rebased:
layerscape/patches-5.4
801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch
801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch
801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch
820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
mvebu (mamba, rango), x86_64, ramips/mt7621
Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
185 lines
3.9 KiB
Diff
185 lines
3.9 KiB
Diff
From eba73069e7f6ac3bcb3669d980994ec42ddd810a Mon Sep 17 00:00:00 2001
|
|
From: Yuantian Tang <andy.tang@nxp.com>
|
|
Date: Thu, 16 Apr 2020 17:40:06 +0800
|
|
Subject: [PATCH] arm64: dts: lx2160a: add more thermal zone support
|
|
|
|
There are 7 thermal zones in lx2160a soc. Add the
|
|
rest thermal zone node to enable them.
|
|
Also correct one of the values for tmu-calibration property.
|
|
|
|
Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
|
|
---
|
|
.../arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 130 +++++++++++++++++-
|
|
1 file changed, 125 insertions(+), 5 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
|
|
@@ -440,19 +440,19 @@
|
|
};
|
|
|
|
thermal-zones {
|
|
- core_thermal1: core-thermal1 {
|
|
+ cluster6-7 {
|
|
polling-delay-passive = <1000>;
|
|
polling-delay = <5000>;
|
|
thermal-sensors = <&tmu 0>;
|
|
|
|
trips {
|
|
- core_cluster_alert: core-cluster-alert {
|
|
+ cluster6_7_alert: cluster6-7-alert {
|
|
temperature = <85000>;
|
|
hysteresis = <2000>;
|
|
type = "passive";
|
|
};
|
|
|
|
- core_cluster_crit: core-cluster-crit {
|
|
+ cluster6_7_crit: cluster6-7-crit {
|
|
temperature = <95000>;
|
|
hysteresis = <2000>;
|
|
type = "critical";
|
|
@@ -461,7 +461,7 @@
|
|
|
|
cooling-maps {
|
|
map0 {
|
|
- trip = <&core_cluster_alert>;
|
|
+ trip = <&cluster6_7_alert>;
|
|
cooling-device =
|
|
<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
@@ -482,6 +482,126 @@
|
|
};
|
|
};
|
|
};
|
|
+
|
|
+ ddr-cluster5 {
|
|
+ polling-delay-passive = <1000>;
|
|
+ polling-delay = <5000>;
|
|
+ thermal-sensors = <&tmu 1>;
|
|
+
|
|
+ trips {
|
|
+ ddr-cluster5-alert {
|
|
+ temperature = <85000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "passive";
|
|
+ };
|
|
+
|
|
+ ddr-cluster5-crit {
|
|
+ temperature = <95000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "critical";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ wriop {
|
|
+ polling-delay-passive = <1000>;
|
|
+ polling-delay = <5000>;
|
|
+ thermal-sensors = <&tmu 2>;
|
|
+
|
|
+ trips {
|
|
+ wriop-alert {
|
|
+ temperature = <85000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "passive";
|
|
+ };
|
|
+
|
|
+ wriop-crit {
|
|
+ temperature = <95000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "critical";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ dce-qbman-hsio2 {
|
|
+ polling-delay-passive = <1000>;
|
|
+ polling-delay = <5000>;
|
|
+ thermal-sensors = <&tmu 3>;
|
|
+
|
|
+ trips {
|
|
+ dce-qbman-alert {
|
|
+ temperature = <85000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "passive";
|
|
+ };
|
|
+
|
|
+ dce-qbman-crit {
|
|
+ temperature = <95000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "critical";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ ccn-dpaa-tbu {
|
|
+ polling-delay-passive = <1000>;
|
|
+ polling-delay = <5000>;
|
|
+ thermal-sensors = <&tmu 4>;
|
|
+
|
|
+ trips {
|
|
+ ccn-dpaa-alert {
|
|
+ temperature = <85000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "passive";
|
|
+ };
|
|
+
|
|
+ ccn-dpaa-crit {
|
|
+ temperature = <95000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "critical";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ cluster4-hsio3 {
|
|
+ polling-delay-passive = <1000>;
|
|
+ polling-delay = <5000>;
|
|
+ thermal-sensors = <&tmu 5>;
|
|
+
|
|
+ trips {
|
|
+ clust4-hsio3-alert {
|
|
+ temperature = <85000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "passive";
|
|
+ };
|
|
+
|
|
+ clust4-hsio3-crit {
|
|
+ temperature = <95000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "critical";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ cluster2-3 {
|
|
+ polling-delay-passive = <1000>;
|
|
+ polling-delay = <5000>;
|
|
+ thermal-sensors = <&tmu 6>;
|
|
+
|
|
+ trips {
|
|
+ cluster2-3-alert {
|
|
+ temperature = <85000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "passive";
|
|
+ };
|
|
+
|
|
+ cluster2-3-crit {
|
|
+ temperature = <95000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "critical";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
soc {
|
|
@@ -760,7 +880,7 @@
|
|
/* Calibration data group 1 */
|
|
<0x00000000 0x00000035
|
|
/* Calibration data group 2 */
|
|
- 0x00010001 0x00000154>;
|
|
+ 0x00000001 0x00000154>;
|
|
little-endian;
|
|
#thermal-sensor-cells = <1>;
|
|
};
|