From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 6 Mar 2018 17:00:50 +0000 (+0100)
Subject: Merge tag 'reset-for-4.17' of git://git.pengutronix.de/git/pza/linux into next/drivers
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e107f4bb65e4ab55cf6a43af51254cd3e9c66066;p=linux.git

Merge tag 'reset-for-4.17' of git://git.pengutronix.de/git/pza/linux into next/drivers

Pull "Reset controller changes for v4.17" from Philipp Zabel:

This enables level resets on Meson8b SoCs. Level resets have been
previously implemented for the newer Meson GX SoCs, so this removes
the distinction between the two families in the meson-reset driver.

Also enables the ASPEED LPC reset controller on ASPEED AST2400 and
AST2500 SoCs, by adding compatibles to the simple-reset driver.

* tag 'reset-for-4.17' of git://git.pengutronix.de/git/pza/linux:
  reset: simple: Enable for ASPEED systems
  dt-bindings: aspeed-lpc: Add reset controller
  reset: meson: enable level reset support on Meson8b
---

e107f4bb65e4ab55cf6a43af51254cd3e9c66066