arm64: zynqmp: Expose AMS to userspace as HWMON

Expose the AMS to userspace, allowing monitoring of internal voltages
and temperatures. For compatibility, we keep the node name the same as
on the SM-K26, and we keep the ZCU100 Rev C. around (since it is named
differently).

Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Link: https://lore.kernel.org/r/20240812215129.3599832-3-sean.anderson@linux.dev
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
index 4e0e7fdf29cae71e3941efc825745c585c193ec2..bfa7ea6b9224aec5477b64d888f38a48117cecca 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
@@ -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";

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 256cff25071795707a6966cbbd7acf198ee526e9..21c1adbaf35f15f5755f8bbcb918e9b10f00e82f 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -392,6 +392,20 @@
                };
        };
 
+       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>;
+       };
+
        amba: axi {
                compatible = "simple-bus";
                bootph-all;