diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-19 03:17:45 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-19 03:17:45 +0300 |
| commit | 78d375b97ea3ec2d9bcbda3e34d12681fa5e3499 (patch) | |
| tree | ce5bab45c0c3ec96dba257ccb98b1393ec0550d9 /drivers/Makefile | |
| parent | 555b2b5d254d60c8b7b8ec566d2f8226f2441a5e (diff) | |
| parent | 7da33a37b48f11ffcb4a718f29a3d4552423fea1 (diff) | |
| download | linux-78d375b97ea3ec2d9bcbda3e34d12681fa5e3499.tar.xz | |
Merge tag 'reset-for-4.10' of git://git.pengutronix.de/git/pza/linux into next/drivers
Reset controller changes for v4.10
- remove obsolete STiH41[56] platform support
- add Oxford Semiconductor OX820 support
- add reset index include files for OX810SE and OX820
- make drivers with boolean Kconfig options explicitly
non-modular
- allow shared pulsed resets via reset_control_reset, which
in this case means that the reset must have been triggered
once, but possibly earlier, after the function returns, and
is never triggered again for the lifetime of the reset
control
* tag 'reset-for-4.10' of git://git.pengutronix.de/git/pza/linux:
reset: allow using reset_control_reset with shared reset
reset: lpc18xx: make it explicitly non-modular
reset: zynq: make it explicitly non-modular
reset: sunxi: make it explicitly non-modular
reset: socfpga: make it explicitly non-modular
reset: berlin: make it explicitly non-modular
dt-bindings: reset: oxnas: Update for OX820
dt-bindings: reset: oxnas: Add include file with reset indexes
reset: oxnas: Add OX820 support
reset: sti: softreset: Remove obsolete platforms from dt binding doc.
reset: sti: Remove STiH415/6 reset support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/Makefile')
0 files changed, 0 insertions, 0 deletions