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

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.