Merge tag 'v4.14-rockchip-soc32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc · 7ee7b6663d - Gogs: Go Git Service GfA electronic

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

Arnd Bergmann 8 years ago

parent

9e3d3619e1 58ed5e5733

commit

7ee7b6663d

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/arm/mach-rockchip/Kconfig
							 
								View File
							
				@@ -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