[PATCH v2] powerpc/dts: Add Device Tree for WatchGuard Firebox T30

[Lefteris Koutrakis]

---
 arch/powerpc/boot/dts/fsl/Makefile        |  1 +
 arch/powerpc/boot/dts/fsl/firebox-t30.dts | 23 ++++-------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/arch/powerpc/boot/dts/fsl/Makefile 
b/arch/powerpc/boot/dts/fsl/Makefile
index ebbf301e1..0a5c8b596 100644
--- a/arch/powerpc/boot/dts/fsl/Makefile
+++ b/arch/powerpc/boot/dts/fsl/Makefile
@@ -45,3 +45,4 @@ dtb-$(CONFIG_GEF_SBC310) += gef_sbc310.dtb
 dtb-$(CONFIG_GEF_SBC610) += gef_sbc610.dtb
 dtb-$(CONFIG_GEF_PPC9A) += gef_ppc9a.dtb
 dtb-$(CONFIG_MVME7100) += mvme7100.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += firebox-t30.dtb
diff --git a/arch/powerpc/boot/dts/fsl/firebox-t30.dts 
b/arch/powerpc/boot/dts/fsl/firebox-t30.dts
index 546e98938..6e9ec7f90 100644
--- a/arch/powerpc/boot/dts/fsl/firebox-t30.dts
+++ b/arch/powerpc/boot/dts/fsl/firebox-t30.dts
@@ -4,30 +4,18 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
 
-/include/ "fsl/p1020si-pre.dtsi"
+/include/ "p1020si-pre.dtsi"
 
 / {
        model = "Watchguard Firebox T30";
-       compatible = "watchguard,firebox-t30";
-
-       chosen {
-               bootargs-override = "console=ttyS0,115200 rw 
root=/dev/mmcblk0p2 rootfstype=squashfs rootwait";
-       };
-
-       aliases {
-               label-mac-device = &enet0;
-               led-boot = &led0;
-               led-failsafe = &led1;
-               led-running = &led0;
-               led-upgrade = &led1;
-       };
+       compatible = "watchguard,firebox-t30", "fsl,P1020RDB";
 
        memory {
                device_type = "memory";
        };
 
        cpus {
-               /delete-property/ PowerPC,P1020@1;
+               /delete-node/ PowerPC,P1020@1;
        };
 
        lbc: localbus@ffe05000 {
@@ -158,9 +146,6 @@ sdhc@2e000 {
                        reg = <0x2e000 0x1000>;
                        interrupts = <0x48 0x2 0x0 0x0>;
                        interrupt-parent = <&mpic>;
-                       fsl,sdhci-dma-broken;
-                       fsl,sdhci-ahb2mag-irq-bypass;
-                       fsl,sdhci-adjust-timeout;
                        clock-frequency = <0>;
                };
 
@@ -410,4 +395,4 @@ ath10k: wifi@0,0 {
        };
 };
 
-/include/ "fsl/p1020si-post.dtsi"
+/include/ "p1020si-post.dtsi"
-- 
2.53.0