From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 17 Mar 2014 10:07:25 +0000 (+0100)
Subject: Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dt
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=64d865f403914afc5cc661aa1412e46715a8d51b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Merge "mvebu dt changes for v3.15 (incremental #4)" from Jason Cooper:

 - dove
    - add system controller node
    - drop pinctrl PMU reg property _before_ it hits mainline and becomes ABI

 - mvebu
    - XP/370
       - change default PCIe apertures
       - switch GP and DB boards internal registers to 0xf1000000
       - correct RAM size on Matrix board
    - 385
       - correct phy connection type for DB board
       - add RD board

* tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu:
  ARM: dove: drop pinctrl PMU reg property
  ARM: mvebu: add Device Tree for the Armada 385 RD board
  ARM: mvebu: use the correct phy connection mode on Armada 385 DB
  ARM: mvebu: the Armada XP Matrix board has 4 GB
  ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000
  ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000
  ARM: mvebu: change the default PCIe apertures for Armada 370/XP
  ARM: dove: add system controller node

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

64d865f403914afc5cc661aa1412e46715a8d51b
diff --cc arch/arm/boot/dts/Makefile
index 3d34936fb476,52c501b0415b..9dfc2d44baaf
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -55,11 -54,11 +55,6 @@@ dtb-$(CONFIG_ARCH_BERLIN) += 
  	berlin2cd-google-chromecast.dtb
  dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
  	da850-evm.dtb
- dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
 -dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
--	dove-cubox.dtb \
--	dove-d2plug.dtb \
--	dove-d3plug.dtb \
--	dove-dove-db.dtb
  dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
  	exynos4210-smdkv310.dtb \
@@@ -369,23 -349,6 +364,29 @@@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv0
  dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
  	zynq-zc706.dtb \
  	zynq-zed.dtb
 +dtb-$(CONFIG_MACH_ARMADA_370) += \
 +	armada-370-db.dtb \
 +	armada-370-mirabox.dtb \
 +	armada-370-netgear-rn102.dtb \
 +	armada-370-netgear-rn104.dtb \
 +	armada-370-rd.dtb
 +dtb-$(CONFIG_MACH_ARMADA_375) += \
 +	armada-375-db.dtb
 +dtb-$(CONFIG_MACH_ARMADA_38X) += \
- 	armada-385-db.dtb
++	armada-385-db.dtb \
++	armada-385-rd.dtb
 +dtb-$(CONFIG_MACH_ARMADA_XP) += \
 +	armada-xp-axpwifiap.dtb \
 +	armada-xp-db.dtb \
 +	armada-xp-gp.dtb \
 +	armada-xp-netgear-rn2120.dtb \
 +	armada-xp-matrix.dtb \
 +	armada-xp-openblocks-ax3-4.dtb
++dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
++	dove-cubox.dtb \
++	dove-d2plug.dtb \
++	dove-d3plug.dtb \
++	dove-dove-db.dtb
  
  targets += dtbs
  targets += $(dtb-y)