diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-03-17 11:07:25 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 12:20:27 +0100 |
| commit | 64d865f403914afc5cc661aa1412e46715a8d51b (patch) | |
| tree | 1b4b35a103d20225013326f7eefa22ab04c96be1 /arch/arm/boot/dts/Makefile | |
| parent | Merge branch 'mvebu/soc3' into next/dt (diff) | |
| parent | ARM: dove: drop pinctrl PMU reg property (diff) | |
| download | linux-dev-64d865f403914afc5cc661aa1412e46715a8d51b.tar.xz linux-dev-64d865f403914afc5cc661aa1412e46715a8d51b.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 3d34936fb476..9dfc2d44baaf 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -55,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 \ - 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 \ @@ -378,7 +373,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ 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 \ @@ -386,6 +382,11 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ 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) |