diff options
| author |   Feng Kan <fkan@apm.com> | 2015-05-18 17:56:16 -0700 |
|---|---|---|
| committer |   Duc Dang <dhdang@apm.com> | 2015-09-16 12:04:24 -0700 |
| commit | e144dc5b8fadb1ca6d4c429aeae51a9f51d88b0e (patch) | |
| tree | 28f49ad8641cf5fe30aef62636d1802d7929d069 /arch/arm64/boot/dts/apm/Makefile | |
| parent | power: reset: Add syscon poweroff device node for APM X-Gene platform (diff) | |
| download | wireguard-linux-e144dc5b8fadb1ca6d4c429aeae51a9f51d88b0e.tar.xz wireguard-linux-e144dc5b8fadb1ca6d4c429aeae51a9f51d88b0e.zip | |
arm64: dts: add APM Merlin Board device tree
This patch adds the support for APM Merlin board. The Merlin board
is based on the APM X-Gene Shadowcat SoC. This DTS enables PMU,
Ethernet, SATA and Serial.
[dhdang: remove pcie0 node]
Signed-off-by: Feng Kan <fkan@apm.com>
Signed-off-by: Duc Dang <dhdang@apm.com>
Diffstat (limited to 'arch/arm64/boot/dts/apm/Makefile')
| -rw-r--r-- | arch/arm64/boot/dts/apm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/apm/Makefile b/arch/arm64/boot/dts/apm/Makefile index a2afabbc1717..c75f17a49471 100644 --- a/arch/arm64/boot/dts/apm/Makefile +++ b/arch/arm64/boot/dts/apm/Makefile @@ -1,4 +1,5 @@ dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb +dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb always := $(dtb-y) subdir-y := $(dts-dirs) |