| commit | 7ee7b6663d7057c4c34f81e1d6c13a5ad27c8f67 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Aug 24 15:54:33 2017 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Aug 24 15:54:33 2017 +0200 |
| tree | 5511ad79a5e8853fd24713fdd10e049e5b69a573 | |
| 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