diff options
| author | Arnd Bergmann | 2018-03-06 18:00:50 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2018-03-06 18:00:50 +0100 |
| commit | e107f4bb65e4ab55cf6a43af51254cd3e9c66066 (patch) | |
| tree | 8e2cf88752448bfe7ec857c5a0cf41063a0f3f3b /drivers/char/nwbutton.c | |
| parent | perf/arm-cci: Untangle global cci_ctrl_base (diff) | |
| parent | reset: simple: Enable for ASPEED systems (diff) | |
| download | kernel-qcow2-linux-e107f4bb65e4ab55cf6a43af51254cd3e9c66066.tar.gz kernel-qcow2-linux-e107f4bb65e4ab55cf6a43af51254cd3e9c66066.tar.xz kernel-qcow2-linux-e107f4bb65e4ab55cf6a43af51254cd3e9c66066.zip | |
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
Diffstat (limited to 'drivers/char/nwbutton.c')
0 files changed, 0 insertions, 0 deletions