diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-28 17:02:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-28 17:02:22 +0200 |
| commit | 7f95de5e4a27d3cda21f7223c22f22ab6c5b3def (patch) | |
| tree | 37c91c02f6516c1870daf627a3ed264259064be3 /drivers/soc/mediatek/mtk-scpsys.c | |
| parent | Merge tag 'scmi-fixes-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Merge branch 'reset/lookup' into reset/next (diff) | |
| download | linux-7f95de5e4a27d3cda21f7223c22f22ab6c5b3def.tar.xz linux-7f95de5e4a27d3cda21f7223c22f22ab6c5b3def.zip | |
Merge tag 'reset-for-4.17-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
Pull "Reset controller changes for v4.17, part 2" from Philipp Zabel:
This tag contains reset lookup support, similar to pwm lookups, for legacy
non-DT platforms, a few new reset controls and a Kconfig fix for uniphier
SoCs, as well as a new driver for the STM32MP1 peripheral reset controller.
The reset lookups are merged from a separate, immutable branch, that may
also be merged into the davinci tree.
* tag 'reset-for-4.17-2' of git://git.pengutronix.de/git/pza/linux:
reset: uniphier: add ethernet reset control support for PXs3
reset: stm32mp1: Enable stm32mp1 reset driver
dt-bindings: reset: add STM32MP1 resets
reset: uniphier: add Pro4/Pro5/PXs2 audio systems reset control
reset: imx7: add 'depends on HAS_IOMEM' to fix unmet dependency
reset: modify the way reset lookup works for board files
reset: add support for non-DT systems
Diffstat (limited to 'drivers/soc/mediatek/mtk-scpsys.c')
0 files changed, 0 insertions, 0 deletions