diff options
| author | Arnd Bergmann <[email protected]> | 2020-12-09 00:26:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2020-12-09 00:39:58 +0100 |
| commit | 5dd65cf78dc3be1a48223e83764ccbd14ded99f2 (patch) | |
| tree | 5ac5c57ec5e5d1166f32941f0c5d27b9005815cc /include/linux | |
| parent | e0839f3ea404138f0a48d861bb30d66d5cc7a6e2 (diff) | |
| parent | d06c4dec98b655e2808d2a59681ec24197c59c9d (diff) | |
Merge tag 'reset-for-v5.11' of git://git.pengutronix.de/pza/linux into arm/drivers
Reset controller updates for v5.11
This tag adds support for sharing pulsed resets under certain
conditions. For example, when multiple drivers go through a
suspend-resume cycle, a reset line they share can be triggered
again during resume.
Further, the reset-meson driver now can be built as a module, the
reset-socfpga driver properly releases its memory region in the
probe error path, and reset-ti-syscon driver uses regmap_write_bits()
instead of regmap_update_bits() to support devices without status
readback.
* tag 'reset-for-v5.11' of git://git.pengutronix.de/pza/linux:
reset-controller: ti: force the write operation when assert or deassert
reset: socfpga: add error handling and release mem-region
reset: meson: make it possible to build as a module
reset: make shared pulsed reset controls re-triggerable
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/reset.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/reset.h b/include/linux/reset.h index 05aa9f440f48..439fec7112a9 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -13,6 +13,7 @@ struct reset_control; #ifdef CONFIG_RESET_CONTROLLER int reset_control_reset(struct reset_control *rstc); +int reset_control_rearm(struct reset_control *rstc); int reset_control_assert(struct reset_control *rstc); int reset_control_deassert(struct reset_control *rstc); int reset_control_status(struct reset_control *rstc); |