Merge tag 'arm-soc/for-4.11/devicetree-fixes' of http://github.com/Broadcom/stblinux...

There was a little conflict between the v4.11 bugfixes and the new changes for 4.12,
this merges the fixes into the 4.12 branch to avoid having to resolve it again.

* Broadcom fixes in mainline
  ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
  ARM: dts: BCM5301X: Fix memory start address
  ARM: dts: BCM5301X: Fix UARTs on bcm953012k

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/boot/dts/bcm953012k.dts
index fbc6219e977a8b63e9ecfd095f28f0d2d9b42d56,ae31a5826e918ec58fc1948df0f9998664b7064f..79c168e2714b7e6c3c4490f180d1c44ebd38f0ea
--- 1/arch/arm/boot/dts/bcm953012k.dts
--- 2/arch/arm/boot/dts/bcm953012k.dts
+++ b/arch/arm/boot/dts/bcm953012k.dts
@@@ -43,71 -43,17 +43,71 @@@
                serial1 = &uart1;
        };
  
 -      chosen {
 -              stdout-path = "serial0:115200n8";
 -      };
 -
        memory {
-               reg = <0x00000000 0x10000000>;
+               reg = <0x80000000 0x10000000>;
        };
  };
  
 +&nand {
 +      nandcs@0 {
 +              compatible = "brcm,nandcs";
 +              reg = <0>;
 +              nand-on-flash-bbt;
 +
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +
 +              nand-ecc-strength = <4>;
 +              nand-ecc-step-size = <512>;
 +
 +              partition@0 {
 +                      label = "nboot";
 +                      reg = <0x00000000 0x00200000>;
 +                      read-only;
 +              };
 +              partition@200000 {
 +                      label = "nenv";
 +                      reg = <0x00200000 0x00400000>;
 +              };
 +              partition@600000 {
 +                      label = "nsystem";
 +                      reg = <0x00600000 0x00a00000>;
 +              };
 +              partition@1000000 {
 +                      label = "nrootfs";
 +                      reg = <0x01000000 0x07000000>;
 +              };
 +      };
 +};
 +
 +&spi_nor {
 +      status = "okay";
 +      spi-max-frequency = <62500000>;
 +      m25p,default-addr-width = <3>;
 +
 +      #address-cells = <1>;
 +      #size-cells = <1>;
 +
 +      partition@0 {
 +              label = "boot";
 +              reg = <0x00000000 0x000d0000>;
 +      };
 +      partition@d000 {
 +              label = "env";
 +              reg = <0x000d0000 0x00030000>;
 +      };
 +      partition@100000 {
 +              label = "system";
 +              reg = <0x00100000 0x00600000>;
 +      };
 +      partition@700000 {
 +              label = "rootfs";
 +              reg = <0x00700000 0x00900000>;
 +      };
 +};
 +
  &uart0 {
-       clock-frequency = <62499840>;
+       status = "okay";
  };
  
  &uart1 {