From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 19 Oct 2017 15:42:30 +0000 (+0200)
Subject: Merge tag 'v4.14-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~6738^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=611e91e15ef61e8c838c8695d593db919d9491c2;p=mirror_ubuntu-focal-kernel.git

Merge tag 'v4.14-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Pull "Rockchip dts64 Fixes for 4.14 part 2" from Heiko Stübner:

The vqmmc voltages on rk3399 pose a risk for the chip if they
exceed 3.0V, so they got fixed to not be at 3.3V
And Arnd found a typo in the recently added iommu nodes.

* tag 'v4.14-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: fix typo in iommu nodes
  arm64: dts: rockchip: correct vqmmc voltage for rk3399 platforms
---

611e91e15ef61e8c838c8695d593db919d9491c2