diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:37:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:37:32 +0200 |
| commit | 8193d9ae379484cb9d36fb5f01053f5ca79fc9dd (patch) | |
| tree | dada8ccc8aaee7c9d55f6b4a4614f1bf344ed631 /MAINTAINERS | |
| parent | Merge tag 'gpmc-omap-for-v4.15' of https://github.com/rogerq/linux into next/... (diff) | |
| parent | Merge branch 'reset/arc' into reset/next (diff) | |
| download | linux-8193d9ae379484cb9d36fb5f01053f5ca79fc9dd.tar.xz linux-8193d9ae379484cb9d36fb5f01053f5ca79fc9dd.zip | |
Merge tag 'reset-for-4.15' of git://git.pengutronix.de/git/pza/linux into next/drivers
Pull "Reset controller changes for v4.15" from Philipp Zabel:
- add ARC AX10x support,
merged from a separate branch that is also included in the ARC tree
- add Stratix10 support via socfpga
- unify socfpga, stm32, sunxi, and zx2967 into simple-reset driver
- add Meson GX reset level control and remove an unneeded check
- add Uniphier PXs3 and ethernet reset controls
- add MT7622 reset control dt-bindings header
* tag 'reset-for-4.15' of git://git.pengutronix.de/git/pza/linux:
reset: zx2967: use the reset-simple driver
reset: stm32: use the reset-simple driver
reset: socfpga: use the reset-simple driver
reset: sunxi: use reset-simple driver
reset: add reset-simple to unify socfpga, stm32, sunxi, and zx2967
reset: meson: remove unneeded check in meson_reset_reset
reset: meson: add level reset support for GX SoC family
reset: uniphier: add PXs3 reset data
reset: mediatek: add reset controller dt-bindings required header for MT7622 SoC
reset: socfpga: build the reset-socfpga for Stratix10 SOC
reset: uniphier: add ethernet reset control support
reset: socfpga: fix for 64-bit compilation
ARC: reset: introduce AXS10x reset driver
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6faa96a64d8c..d3c6f54f90d1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2136,7 +2136,6 @@ F: drivers/gpio/gpio-zx.c F: drivers/i2c/busses/i2c-zx2967.c F: drivers/mmc/host/dw_mmc-zx.* F: drivers/pinctrl/zte/ -F: drivers/reset/reset-zx2967.c F: drivers/soc/zte/ F: drivers/thermal/zx2967_thermal.c F: drivers/watchdog/zx2967_wdt.c @@ -12914,6 +12913,12 @@ F: arch/arc/plat-axs10x F: arch/arc/boot/dts/ax* F: Documentation/devicetree/bindings/arc/axs10* +SYNOPSYS AXS10x RESET CONTROLLER DRIVER +M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> +S: Supported +F: drivers/reset/reset-axs10x.c +F: Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt + SYNOPSYS DESIGNWARE DMAC DRIVER M: Viresh Kumar <vireshk@kernel.org> M: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |