From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 11 Mar 2015 21:53:16 +0000 (+0100)
Subject: Merge tag 'mvebu-dt-4.1' of git://git.infradead.org/linux-mvebu into next/dt
X-Git-Tag: v4.1-rc1~50^2~39
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=094a29d023b9ef0947bdc98e8cfeafe6219eb00a;p=linux.git

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

Pull "mvebu dt changes for v4.1 (part #1)" from Gregory CLEMENT:

- fix SDHCI nodes on Armada 38x
- add Linksys WRT1900AC (Mamba) support (including the Ethernet switch)
- add several fixes and improvement for dove
- enable GPIO fan alarm support for 2Big Network v2
- add several fixes about unit address
- add support for Armada 39x SoC and board

* tag 'mvebu-dt-4.1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add Device Tree files for Armada 39x SoC and board
  ARM: mvebu: fix unit address of MPIC nodes
  ARM: mvebu: use stdout-path in all armada-*.dts
  ARM: mvebu: add serial port aliases on Armada 370/375/38x/XP
  ARM: mvebu: remove aliases for Ethernet devices on Armada 370/375/38x/XP
  ARM: mvebu: add UART labels to Armada 375
  ARM: mvebu: add missing UART labels on Armada 38x
  ARM: mvebu: fix usb@ unit address on Armada 38x to match register address
  ARM: mvebu: a385-db-ap: Enable the NAND
  ARM: ARMADA XP: WRT1900AC: Add support for the Ethernet switch
  ARM: Kirkwood: enable GPIO fan alarm support for 2Big Network v2
  ARM: mvebu: Fix MPIC unit address
  ARM: dts: dove: Add some more common pinctrl settings
  ARM: dts: dove: Add node labels for PCIe ports 0 and 1
  ARM: dts: dove: Always include gpio and interrupt-controller headers
  ARM: dts: dove: Fix uart[23] reg property
  ARM: mvebu: add Linksys WRT1900AC (Mamba) support
  ARM: mvebu: Add Device Tree description of SDHCI for Armada 388 RD
  ARM: mvebu: Update the SDHCI node on Armada 38x
  ARM: mvebu: Use macros for interrupt flags on Armada 38x sdhci node
---

094a29d023b9ef0947bdc98e8cfeafe6219eb00a