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 /drivers/soc/fsl/qbman/qman_test.h | |
| parent | d5bd8507cf3f7fcb890b2c02bbfab26efac75795 (diff) | |
| parent | 542befbb18056c4fda7b458aa6146a52b2fd389c (diff) | |
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 'drivers/soc/fsl/qbman/qman_test.h')
0 files changed, 0 insertions, 0 deletions