diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 20:47:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 20:47:46 +0300 |
| commit | cc4f9c2a91b7be7b3590bb1cbe8148873556aa3f (patch) | |
| tree | 742062aabfe32c660261d16b9b3330d599f02c4f /arch/arm64/boot/dts/Makefile | |
| parent | 03a40e29941cf7b12d9eef92cd1a56e04affbc06 (diff) | |
| parent | 0d2fdcd76504535bd1721ba9e8d4d03bcbb10afd (diff) | |
| download | linux-cc4f9c2a91b7be7b3590bb1cbe8148873556aa3f.tar.xz | |
Merge tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC 64-bit changes and additions from Olof Johansson:
"The 64-bit set of updates this release cycle adds support for three
new platforms:
- Samsunc Exynos 7
- Freescale LS2085a
- Mediatek MT8173
For all these, the changes mostly consititude additions of DT
contents, but also some Kconfig entries to allow dependency/selection
of drivers per-platform, etc"
* tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm64: Kconfig: clean up two no-op Kconfig options from CONFIG_ARCH_TEGRA*
arm64: Fix sort of platform Kconfig entries
arm64: Add support for FSL's LS2085A SoC in Kconfig and defconfig
arm64: Add DTS support for FSL's LS2085A SoC
arm64: mediatek: Add MT8173 SoC Kconfig and defconfig
arm64: dts: Add mediatek MT8173 SoC and evaluation board dts and Makefile
Document: DT: Add bindings for mediatek MT8173 SoC Platform
arm64: Add Tegra132 support
arm64: Enable ARMv8 based exynos7 SoC support
arm64: dts: Add nodes for mmc, i2c, rtc, watchdog, adc on exynos7
arm64: dts: Add PMU DT node for exynos7 SoC
arm64: dts: Add initial pinctrl support to exynos7
arm64: dts: Add initial device tree support for exynos7
Diffstat (limited to 'arch/arm64/boot/dts/Makefile')
| -rw-r--r-- | arch/arm64/boot/dts/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile index c62b0f4d9ef6..e0350caf049e 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -2,5 +2,8 @@ dts-dirs += amd dts-dirs += apm dts-dirs += arm dts-dirs += cavium +dts-dirs += exynos +dts-dirs += freescale +dts-dirs += mediatek subdir-y := $(dts-dirs) |