colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: zynqmp: Sync DTs with Linux v6.13-rc1

Browse Source 
Sync zynqmp* DTS files with v6.13-rc1 Linux kernel including three patches
from Sean:
arm64: zynqmp: Enable AMS for all boards
arm64: zynqmp: Expose AMS to userspace as HWMON
arm64: zynqmp: Add thermal zones

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/06e466d64c9d8e718e2f06a76cc65d6da2a37a7b.1733996500.git.michal.simek@amd.com
This commit is contained in:
Michal Simek
2024-12-12 10:41:44 +01:00
parent 9ce8f720af
commit bb1562e347
6 changed files with 100 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/dts/zynqmp-sm-k26-revA.dts
View File

@@ -90,20 +90,6 @@
};
};
ams {
compatible = "iio-hwmon";
io-channels = <&xilinx_ams 0>, <&xilinx_ams 1>, <&xilinx_ams 2>,
<&xilinx_ams 3>, <&xilinx_ams 4>, <&xilinx_ams 5>,
<&xilinx_ams 6>, <&xilinx_ams 7>, <&xilinx_ams 8>,
<&xilinx_ams 9>, <&xilinx_ams 10>, <&xilinx_ams 11>,
<&xilinx_ams 12>, <&xilinx_ams 13>, <&xilinx_ams 14>,
<&xilinx_ams 15>, <&xilinx_ams 16>, <&xilinx_ams 17>,
<&xilinx_ams 18>, <&xilinx_ams 19>, <&xilinx_ams 20>,
<&xilinx_ams 21>, <&xilinx_ams 22>, <&xilinx_ams 23>,
<&xilinx_ams 24>, <&xilinx_ams 25>, <&xilinx_ams 26>,
<&xilinx_ams 27>, <&xilinx_ams 28>, <&xilinx_ams 29>;
};
pwm-fan {
compatible = "pwm-fan";
status = "okay";
@@ -369,10 +355,6 @@
"", "", "", ""; /* 170 - 173 */
};
&xilinx_ams {
status = "okay";
};
&ams_ps {
status = "okay";
};

4
arch/arm/dts/zynqmp-zcu100-revC.dts
View File

@@ -593,10 +593,6 @@
status = "okay";
};
&xilinx_ams {
status = "okay";
};
&ams_ps {
status = "okay";
};

4
arch/arm/dts/zynqmp-zcu102-revA.dts
View File

@@ -1065,10 +1065,6 @@
status = "okay";
};
&xilinx_ams {
status = "okay";
};
&ams_ps {
status = "okay";
};

4
arch/arm/dts/zynqmp-zcu104-revA.dts
View File

@@ -527,10 +527,6 @@
status = "okay";
};
&xilinx_ams {
status = "okay";
};
&ams_ps {
status = "okay";
};

4
arch/arm/dts/zynqmp-zcu104-revC.dts
View File

@@ -539,10 +539,6 @@
status = "okay";
};
&xilinx_ams {
status = "okay";
};
&ams_ps {
status = "okay";
};

101
arch/arm/dts/zynqmp.dtsi
View File

@@ -18,6 +18,7 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/power/xlnx-zynqmp-power.h>
#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
#include <dt-bindings/thermal/thermal.h>
/ {
compatible = "xlnx,zynqmp";
@@ -36,6 +37,7 @@
#size-cells = <0>;
cpu0: cpu@0 {
#cooling-cells = <2>;
compatible = "arm,cortex-a53";
device_type = "cpu";
enable-method = "psci";
@@ -46,6 +48,7 @@
};
cpu1: cpu@1 {
#cooling-cells = <2>;
compatible = "arm,cortex-a53";
device_type = "cpu";
enable-method = "psci";
@@ -56,6 +59,7 @@
};
cpu2: cpu@2 {
#cooling-cells = <2>;
compatible = "arm,cortex-a53";
device_type = "cpu";
enable-method = "psci";
@@ -66,6 +70,7 @@
};
cpu3: cpu@3 {
#cooling-cells = <2>;
compatible = "arm,cortex-a53";
device_type = "cpu";
enable-method = "psci";
@@ -388,6 +393,101 @@
};
};
ams {
compatible = "iio-hwmon";
io-channels = <&xilinx_ams 0>, <&xilinx_ams 1>, <&xilinx_ams 2>,
<&xilinx_ams 3>, <&xilinx_ams 4>, <&xilinx_ams 5>,
<&xilinx_ams 6>, <&xilinx_ams 7>, <&xilinx_ams 8>,
<&xilinx_ams 9>, <&xilinx_ams 10>, <&xilinx_ams 11>,
<&xilinx_ams 12>, <&xilinx_ams 13>, <&xilinx_ams 14>,
<&xilinx_ams 15>, <&xilinx_ams 16>, <&xilinx_ams 17>,
<&xilinx_ams 18>, <&xilinx_ams 19>, <&xilinx_ams 20>,
<&xilinx_ams 21>, <&xilinx_ams 22>, <&xilinx_ams 23>,
<&xilinx_ams 24>, <&xilinx_ams 25>, <&xilinx_ams 26>,
<&xilinx_ams 27>, <&xilinx_ams 28>, <&xilinx_ams 29>;
};
tsens_apu: thermal-sensor-apu {
compatible = "generic-adc-thermal";
#thermal-sensor-cells = <0>;
io-channels = <&xilinx_ams 7>;
io-channel-names = "sensor-channel";
};
tsens_rpu: thermal-sensor-rpu {
compatible = "generic-adc-thermal";
#thermal-sensor-cells = <0>;
io-channels = <&xilinx_ams 8>;
io-channel-names = "sensor-channel";
};
tsens_pl: thermal-sensor-pl {
compatible = "generic-adc-thermal";
#thermal-sensor-cells = <0>;
io-channels = <&xilinx_ams 20>;
io-channel-names = "sensor-channel";
};
thermal-zones {
apu-thermal {
polling-delay-passive = <1000>;
polling-delay = <5000>;
thermal-sensors = <&tsens_apu>;
trips {
apu_passive: passive {
temperature = <93000>;
hysteresis = <3500>;
type = "passive";
};
apu_critical: critical {
temperature = <96500>;
hysteresis = <3500>;
type = "critical";
};
};
cooling-maps {
map {
trip = <&apu_passive>;
cooling-device =
<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
rpu-thermal {
polling-delay = <10000>;
thermal-sensors = <&tsens_rpu>;
trips {
critical {
temperature = <96500>;
hysteresis = <3500>;
type = "critical";
};
};
};
pl-thermal {
polling-delay = <10000>;
thermal-sensors = <&tsens_pl>;
trips {
critical {
temperature = <96500>;
hysteresis = <3500>;
type = "critical";
};
};
};
};
amba: axi {
compatible = "simple-bus";
bootph-all;
@@ -1153,7 +1253,6 @@
xilinx_ams: ams@ffa50000 {
compatible = "xlnx,zynqmp-ams";
status = "disabled";
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0 0xffa50000 0x0 0x800>;