diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:36:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:36:09 +0200 |
| commit | ac9ae4dfffab58a576de99c1ca8a92caf4a6a078 (patch) | |
| tree | 884a828331774f8ff773ac3e579ca9463630253a /arch/arm | |
| parent | Merge tag 'v4.14-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc (diff) | |
| parent | ARM: tegra: Select appropriate DMA options for LPAE (diff) | |
| download | linux-dev-ac9ae4dfffab58a576de99c1ca8a92caf4a6a078.tar.xz linux-dev-ac9ae4dfffab58a576de99c1ca8a92caf4a6a078.zip | |
Merge tag 'tegra-for-4.14-arm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
Pull "ARM: tegra: Changes for v4.14-rc1" from Thierry Reding:
Contains a single fix for platforms with more than 2 GiB of memory
running on a kernel with LPAE enabled.
* tag 'tegra-for-4.14-arm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Select appropriate DMA options for LPAE
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 329f01c5b6f8..c8368d647741 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -13,5 +13,7 @@ menuconfig ARCH_TEGRA select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER select SOC_BUS + select ZONE_DMA if ARM_LPAE + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE help This enables support for NVIDIA Tegra based systems. |