Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 094a29d0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 4d0b756e 538da83d

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -629,11 +629,14 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ 
	armada-388-db.dtb \

	armada-388-gp.dtb \

	armada-388-rd.dtb

dtb-$(CONFIG_MACH_ARMADA_39X) += \

	armada-398-db.dtb

dtb-$(CONFIG_MACH_ARMADA_XP) += \

	armada-xp-axpwifiap.dtb \

	armada-xp-db.dtb \

	armada-xp-gp.dtb \

	armada-xp-lenovo-ix4-300d.dtb \

	armada-xp-linksys-mamba.dtb \

	armada-xp-matrix.dtb \

	armada-xp-netgear-rn2120.dtb \

	armada-xp-openblocks-ax3-4.dtb \

arch/arm/boot/dts/armada-370-db.dts

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
	compatible = "marvell,a370-db", "marvell,armada370", "marvell,armada-370-xp";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	memory {

arch/arm/boot/dts/armada-370-mirabox.dts

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
	compatible = "globalscale,mirabox", "marvell,armada370", "marvell,armada-370-xp";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	memory {

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
	compatible = "netgear,readynas-102", "marvell,armada370", "marvell,armada-370-xp";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	memory {

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
	compatible = "netgear,readynas-104", "marvell,armada370", "marvell,armada-370-xp";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	memory {