From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 31 Mar 2017 10:05:13 +0000 (+0200)
Subject: Merge tag 'gemini-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: v4.12-rc1~56^2~29
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f63c00bcd11bfec189958e85ad42eac34d931949;p=linux-block.git

Merge tag 'gemini-dts-2' of git://git./linux/kernel/git/linusw/linux-nomadik into next/dt

Pull "DTS updates for the Gemini on top of the multiplatform base" from Linus Walleij:

- Add the power controller to the DTS.
- Augment the GPIO nodes to also include the Faraday
  compatible.
- Add the PCI bus host and config to the Gemini device trees.

* tag 'gemini-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: add PCI to the Gemini device trees
  ARM: dts: augment Gemini GPIO nodes
  ARM: dts: add power controller to the Gemini DTS
---

f63c00bcd11bfec189958e85ad42eac34d931949