From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Oct 2017 12:43:36 +0000 (+0100)
Subject: Merge tag 'uniphier-dt-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahi... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0292f8a8f8e9d74ad8519c92d712039edb8f08b4;p=linux.git

Merge tag 'uniphier-dt-v4.15' of git://git./linux/kernel/git/masahiroy/linux-uniphier into next/dt

Pull "UniPhier ARM SoC DT updates for v4.15" from Masahiro Yamada:

- add thermal monitor and thermal zone nodes
- fix W=2 warnings
- add GPIO controller nodes and related properties
- add resets properties

* tag 'uniphier-dt-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add resets properties
  ARM: dts: uniphier: add GPIO hog definition
  ARM: dts: uniphier: route on-board device IRQ to GPIO controller
  ARM: dts: uniphier: add GPIO controller nodes
  ARM: dts: uniphier: fix W=2 build warnings
  ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
---

0292f8a8f8e9d74ad8519c92d712039edb8f08b4