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>

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 b4a90b31c759afe069780e61b20173d6b96bbfa9..7385f3402cffed5e3500e831a8db1fe832d254d0 100644 (file)
--- 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"