Merge tag 'socfpga_dts_for_v4.4_part_2' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / arm / boot / dts / bcm-cygnus.dtsi

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index 24e058c737005e95843c29286b7e968fa4a698dc..2778533502d9b7fcfdc1ac4ef074fafdd274c012 100644 (file)
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -41,10 +41,6 @@
        model = "Broadcom Cygnus SoC";
        interrupt-parent = <&gic>;
 
-       aliases {
-               serial0 = &uart3;
-       };
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -234,8 +230,7 @@
                };
 
                nand: nand@18046000 {
-                       compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1",
-                                    "brcm,brcmnand";
+                       compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x18046000 0x600>, <0xf8105408 0x600>,
                              <0x18046f00 0x20>;
                        reg-names = "nand", "iproc-idm", "iproc-ext";