[PATCH] arm64: dts: amlogic: ad402: move thermal-zones to top node

Arnd Bergmann arnd at kernel.org
Tue May 28 06:31:59 PDT 2024


From: Arnd Bergmann <arnd at arndb.de>

It appears that this accidentally got added into the spi node, causing
a warning.

arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts:119.16-161.4: Warning (spi_bus_reg): /soc/spi at fd000400/thermal-zones: missing or empty reg property

Fixes: 593ab951232b ("arm64: dts: amlogic: ad402: setup thermal-zones")
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
---
 .../arm64/boot/dts/amlogic/meson-a1-ad402.dts | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
index c8579b6e67cf..6883471a93b4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
@@ -84,37 +84,6 @@ vddio_1v8: regulator-vddio-1v8 {
 		vin-supply = <&vddao_3v3>;
 		regulator-always-on;
 	};
-};
-
-/* Bluetooth HCI H4 */
-&uart_AO {
-	status = "okay";
-	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
-	pinctrl-names = "default";
-};
-
-&uart_AO_B {
-	status = "okay";
-};
-
-&saradc {
-	status = "okay";
-	vref-supply = <&vddio_1v8>;
-};
-
-&spifc {
-	status = "okay";
-	pinctrl-0 = <&spifc_pins>;
-	pinctrl-names = "default";
-
-	flash at 0 {
-		compatible = "spi-nand";
-		status = "okay";
-		reg = <0>;
-		spi-max-frequency = <96000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
 
 	thermal-zones {
 		soc_thermal: soc_thermal {
@@ -161,6 +130,37 @@ map1 {
 	};
 };
 
+/* Bluetooth HCI H4 */
+&uart_AO {
+	status = "okay";
+	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+	pinctrl-names = "default";
+};
+
+&uart_AO_B {
+	status = "okay";
+};
+
+&saradc {
+	status = "okay";
+	vref-supply = <&vddio_1v8>;
+};
+
+&spifc {
+	status = "okay";
+	pinctrl-0 = <&spifc_pins>;
+	pinctrl-names = "default";
+
+	flash at 0 {
+		compatible = "spi-nand";
+		status = "okay";
+		reg = <0>;
+		spi-max-frequency = <96000000>;
+		spi-tx-bus-width = <4>;
+		spi-rx-bus-width = <4>;
+	};
+};
+
 &usb2_phy1 {
 	phy-supply = <&vcc_3v3>;
 };
-- 
2.39.2




More information about the linux-amlogic mailing list