From: David Bauer <mail@david-bauer.net>
Date: Thu, 24 Mar 2022 21:53:43 +0000 (+0100)
Subject: mpc85xx: move Extreme WS-AP3825i GPIO extender
X-Git-Tag: v22.03.0-rc1~15
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a2c0de3b9581cda618dcca99d3c2fc2d2dc88210;p=openwrt%2Fstaging%2Fhauke.git

mpc85xx: move Extreme WS-AP3825i GPIO extender

Move the GPIO extender to the SoC node. Otherwise, the legacy PowerPC
init code will not populate the BUS and thus never probe spi-gpio.

Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit f0c09d0305835abc7bcc32285dc82c008159936d)
---

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts
index aba7739d0d..43c044b4fc 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts
@@ -26,29 +26,6 @@
 		device_type = "memory";
 	};
 
-	led_spi {
-		/*
-		 * This is currently non-functioning because the spi-gpio
-		 * driver refuses to register when presented with this node.
-		 */
-		compatible = "spi-gpio";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		sck-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
-		mosi-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-		num-chipselects = <0>;
-
-		spi_gpio: led_gpio@0 {
-			compatible = "fairchild,74hc595";
-			reg = <0>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			registers-number = <1>;
-			spi-max-frequency = <100000>;
-		};
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -246,4 +223,29 @@
 	};
 };
 
+&soc {
+	led_spi {
+		/*
+		 * This is currently non-functioning because the spi-gpio
+		 * driver refuses to register when presented with this node.
+		 */
+		compatible = "spi-gpio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		sck-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+		mosi-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+		num-chipselects = <0>;
+
+		spi_gpio: led_gpio@0 {
+			compatible = "fairchild,74hc595";
+			reg = <0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			registers-number = <1>;
+			spi-max-frequency = <100000>;
+		};
+	};
+};
+
 /include/ "fsl/p1020si-post.dtsi"