diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-24 15:54:33 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-24 15:54:33 +0200 |
| commit | 7ee7b6663d7057c4c34f81e1d6c13a5ad27c8f67 (patch) | |
| tree | 5511ad79a5e8853fd24713fdd10e049e5b69a573 /arch/arm | |
| parent | 9e3d3619e1f7b399100cfa9c59a4279c006a019b (diff) | |
| parent | 58ed5e5733b293f03a302612d395ac747021b946 (diff) | |
Merge tag 'v4.14-rockchip-soc32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Pull "second round of Rockchip soc32 changes for 4.14" from Heiko Stübner:
Enable the ARCH_DMA_ADDR_T_64BIT kconfig option for LPAE builds,
as some peripherals like the Mali gpu do support 64bit dma addresses.
* tag 'v4.14-rockchip-soc32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: select ARCH_DMA_ADDR_T_64BIT for LPAE
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index fafd3d7f9f8c..a4065966881a 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -3,6 +3,7 @@ config ARCH_ROCKCHIP depends on ARCH_MULTI_V7 select PINCTRL select PINCTRL_ROCKCHIP + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE select ARCH_HAS_RESET_CONTROLLER select ARM_AMBA select ARM_GIC |