From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 31 Mar 2017 10:19:39 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.11/devicetree-fixes' of http://github.com/Broadcom/stblinux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3f5099f0c7677d2f1710408530d2d6ab114aad32;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

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>
---

3f5099f0c7677d2f1710408530d2d6ab114aad32
diff --cc arch/arm/boot/dts/bcm953012k.dts
index fbc6219e977a,ae31a5826e91..79c168e2714b
--- a/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 {