From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Oct 2017 13:32:45 +0000 (+0100)
Subject: Merge tag 'mvebu-dt64-4.15-1' of git://git.infradead.org/linux-mvebu into next/dt
X-Git-Tag: v4.15-rc1~75^2~16
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b295477e0026b92cceba642b111a3efd569d3cc5;p=linux.git

Merge tag 'mvebu-dt64-4.15-1' of git://git.infradead.org/linux-mvebu into next/dt

Pull "mvebu dt64 for 4.15 (part 1)" from Gregory CLEMENT:

On Armada 7K/8k:
- Improve network support at SoC and board level
- Enable watchdog
- Add UART muxing
- On 7040 DB: add CD SDIO and NAND support
- On 8040 DB: add PCIE more ports and SPI1

On Armada 37xx:
 - Fix UART register size
 - Add vmmc regulator for SD on 3720 DB

* tag 'mvebu-dt64-4.15-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: 7040-db: Add the carrier detect pin for SD card on CP
  arm64: dts: marvell: 7040-db: Document the gpio expander
  arm64: dts: marvell: enable additional PCIe ports on Armada 8040 DB
  arm64: dts: marvell: add NAND support on the 7040-DB board
  arm64: dts: marvell: Enable Armada-8040-DB CPS SPI1
  arm64: dts: marvell: 8040-db: enable the SFP ports
  arm64: dts: marvell: 7040-db: enable the SFP port
  arm64: dts: marvell: 7040-db: add comphy reference to Ethernet port
  arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
  arm64: dts: marvell: 37xx: remove empty line
  arm64: dts: marvell: cp110: add PPv2 port interrupts
  arm64: dts: marvell: add comphy nodes on cp110 master and slave
  arm64: dts: marvell: extend the cp110 syscon register area length
  arm64: dts: marvell: enable AP806 watchdog
  arm64: dts: marvell: Fix A37xx UART0 register size
  arm64: dts: marvell: armada-3720-db: Add vmmc regulator for SD slot
  arm64: dts: marvell: add UART muxing on Armada 7K/8K
---

b295477e0026b92cceba642b111a3efd569d3cc5
diff --cc arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 30d48ecf46e0,2446417a042d..1c4dd8ab9ad5
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@@ -263,9 -269,14 +269,14 @@@
  
  				ap_pinctrl: pinctrl {
  					compatible = "marvell,ap806-pinctrl";
+ 
+ 					uart0_pins: uart0-pins {
+ 						marvell,pins = "mpp11", "mpp19";
+ 						marvell,function = "uart0";
+ 					};
  				};
  
 -				ap_gpio: gpio {
 +				ap_gpio: gpio@1040 {
  					compatible = "marvell,armada-8k-gpio";
  					offset = <0x1040>;
  					ngpios = <20>;