From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 24 Aug 2017 13:54:33 +0000 (+0200)
Subject: Merge tag 'v4.14-rockchip-soc32-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~10454^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ee7b6663d7057c4c34f81e1d6c13a5ad27c8f67;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'v4.14-rockchip-soc32-2' of git://git./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
---

7ee7b6663d7057c4c34f81e1d6c13a5ad27c8f67