From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Mar 2016 22:15:48 +0000 (-0700)
Subject: Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.14-rc1~3592
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a6b7e53d035db7941b27122365cca9f2e912596;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'armsoc-dt' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM DT updates from Arnd Bergmann:
 "These are all the updates to device tree files for 32-bit platforms,
  plus a couple of related 64-bit updates:

  New SoC support:
   - Allwinner A83T
   - Axis Artpec-6 SoC
   - Mediatek MT7623 SoC
   - TI Keystone K2G SoC
   - ST Microelectronics stm32f469

  New board or machine support:
   - ARM Juno R2
   - Buffalo Linkstation LS-QVL and LS-GL
   - Cubietruck plus
   - D-Link DIR-885L
   - DT support for ARM RealView PB1176 and PB11MPCore
   - Google Nexus 7
   - Homlet v2
   - Itead Ibox
   - Lamobo R1
   - LG Optimus Black
   - Logicpd dm3730
   - Raspberry Pi Model A

  Other changes include
   - Lots of updates for Qualcomm APQ8064, MSM8974 and others
   - Improved support for Nokia N900 and other OMAP machines
   - Common clk support for lpc32xx
   - HDLCD display on ARM
   - Improved stm32f429 support
   - Improved Renesas device support, r8a779x and others
   - Lots of Rockchip updates
   - Samsung cleanups
   - ADC support for Atmel SAMA5D2
   - BCM2835 (Raspberry Pi) improvements
   - Broadcom Northstar Plus enhancements
   - OMAP GPMC rework
   - Several improvements for Atmel SAMA5D2 / Xplained
   - Global change to remove inofficial "arm,amba-bus" compatible
     string"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (350 commits)
  ARM, ARM64: dts: drop "arm,amba-bus" in favor of "simple-bus"
  ARM: dts: artpec: dual-license on artpec6.dtsi
  ARM: dts: ux500: add synaptics RMI4 for Ux500 TVK DT
  arm64: dts: juno/vexpress: fix node name unit-address presence warnings
  arm64: dts: foundation-v8: add SBSA Generic Watchdog device node
  ARM: dts: at91: sama5d2 Xplained: add leds node
  ARM: dts: at91: sama5d2 Xplained: add user push button
  ARM: dts: at91: sama5d2 Xplained: set pin muxing for usb gadget and usb host
  ARM: dts: stm32f429: Enable Ethernet on Eval board
  ARM: dts: omap3-sniper: TWL4030 keypad support
  Revert "ARM: dts: DRA7: Add dt nodes for PWMSS"
  ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND
  ARM: dts: dm814x: dra62x: Fix NAND device nodes
  ARM: dts: stm32f429: Add Ethernet support
  ARM: dts: stm32f429: Add system config bank node
  ARM: dts: at91: sama5d2: add nand0 and nfc0 nodes
  ARM: dts: at91: sama5d2: add dma properties to UART nodes
  ARM: dts: at91: sama5d2 Xplained: Correct the macb irq pinctrl node
  ARM: dts: exynos: Don't overheat the Odroid XU3-Lite on high load
  ARM: dts: exynos: Add cooling levels for Exynos5422/5800 CPUs
  ...
---

5a6b7e53d035db7941b27122365cca9f2e912596
diff --cc arch/arm/boot/dts/armada-385-db-ap.dts
index 5f9451b,86fde0b..2d3fd6e
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@@ -139,20 -139,16 +140,22 @@@
  				status = "okay";
  				phy = <&phy2>;
  				phy-mode = "sgmii";
 +				buffer-manager = <&bm>;
 +				bm,pool-long = <1>;
 +				bm,pool-short = <3>;
  			};
  
+ 			/* CON2 */
  			ethernet@34000 {
  				status = "okay";
  				phy = <&phy1>;
  				phy-mode = "sgmii";
 +				buffer-manager = <&bm>;
 +				bm,pool-long = <2>;
 +				bm,pool-short = <3>;
  			};
  
+ 			/* CON4 */
  			ethernet@70000 {
  				pinctrl-names = "default";
  
diff --cc arch/arm/boot/dts/armada-xp-db.dts
index cca3665,96aaaed..62422a9
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@@ -242,10 -229,34 +242,38 @@@
  					spi-max-frequency = <20000000>;
  				};
  			};
+ 
+ 			nand@d0000 {
+ 				status = "okay";
+ 				num-cs = <1>;
+ 				marvell,nand-keep-config;
+ 				marvell,nand-enable-arbiter;
+ 				nand-on-flash-bbt;
+ 
+ 				partitions {
+ 					compatible = "fixed-partitions";
+ 					#address-cells = <1>;
+ 					#size-cells = <1>;
+ 
+ 					partition@0 {
+ 						label = "U-Boot";
+ 						reg = <0 0x800000>;
+ 					};
+ 					partition@800000 {
+ 						label = "Linux";
+ 						reg = <0x800000 0x800000>;
+ 					};
+ 					partition@1000000 {
+ 						label = "Filesystem";
+ 						reg = <0x1000000 0x3f000000>;
+ 
+ 					};
+ 				};
+ 			};
  		};
 +
 +		bm-bppi {
 +			status = "okay";
 +		};
  	};
  };