From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 17 Aug 2017 08:58:50 +0000 (+0200)
Subject: Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f042bdd6e6d6343930d7caefb0b7647f4dd57670;p=linux.git

Merge tag 'amlogic-dt' of git://git./linux/kernel/git/khilman/linux-amlogic into next/dt

Pull "Amlogic 32-bit DT changes for v4.14" from Kevin Hilman:

- update clock controler for use as reset controller
- misc. updates/fixups/improvements

* tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: meson6: use stable UART bindings
  ARM: dts: meson: mark the clock controller also as reset controller
  ARM: dts: meson: add a node which describes the SRAM
  ARM: dts: meson8b: use the existing wdt node to override the compatible
  ARM: dts: meson8: add the PWM controller nodes
  ARM: dts: move the pwm_ab and pwm_cd nodes to meson.dtsi
---

f042bdd6e6d6343930d7caefb0b7647f4dd57670