diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-08-19 00:04:27 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-19 00:04:27 +0200 |
commit | e517030e2689c3f04a5516c1b4c007c8a64c597b (patch) | |
tree | c65ad73020d3db15f71ac53e1dad8c79ea43000a /mm/percpu.c | |
parent | 03f89359929eee410cc9a73be094d717b33bb65c (diff) | |
parent | ac0c735ac3dd6697055299cac01617527aa6a695 (diff) |
Merge tag 'reset-for-4.14' of git://git.pengutronix.de/git/pza/linux into next/drivers
Pull "Reset controller changes for v4.14" from Philipp Zabel:
- constify zx2967 reset_ops
- add a convenience API to manage an array of resets
- let deassert report success and let assert report success for shared resets
if the reset controller driver does not implement (de)assert.
- add HSDKv1 reset driver
- remove Gemini reset controller, the driver is made obsolete
by a combined clock/reset driver in drivers/clk
- fix the total number of reset lines in the sunxi driver
- various uniphier updates and fixes:
- remove sLD3 SoC support
- simplify system reset register and bit definitions
- add audio systems, video input subsystem, and analog amplifiers reset
controls
* tag 'reset-for-4.14' of git://git.pengutronix.de/git/pza/linux:
reset: uniphier: add analog amplifiers reset control
reset: uniphier: add video input subsystem reset control
reset: uniphier: add audio systems reset control
reset: sunxi: fix number of reset lines
reset: uniphier: do not use per-SoC macro for system reset block
reset: uniphier: remove sLD3 SoC support
Revert "reset: Add a Gemini reset controller"
ARC: reset: introduce HSDKv1 reset driver
reset: make (de)assert report success for self-deasserting reset drivers
reset: Add APIs to manage array of resets
reset: zx2967: constify zx2967_reset_ops.
Diffstat (limited to 'mm/percpu.c')
0 files changed, 0 insertions, 0 deletions