diff options
| author | Olof Johansson <olof@lixom.net> | 2019-01-12 22:06:54 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-01-12 22:06:54 -0800 |
| commit | 465612178b44840b2066e62c3bcfae80862011d4 (patch) | |
| tree | 044e2ee3f0ea3a6fbe8d349c31eac6bc4ee4d054 /drivers/reset/reset-hsdk.c | |
| parent | 56acb3ef76177a5aabe6613bf27348d34f1e65c0 (diff) | |
| parent | d0c2d2101b4c1a41e6ebeca6a28c70df43d2a6a3 (diff) | |
| download | linux-465612178b44840b2066e62c3bcfae80862011d4.tar.bz2 | |
Merge tag 'reset-for-5.0-rc2' of git://git.pengutronix.de/git/pza/linux into fixes
Late reset controller changes for v5.0
This adds missing deassert functionality to the ARC HSDK reset driver,
fixes some indentation and grammar issues in the kernel docs, adds a
helper to count the number of resets on a device for the non-DT case
as well, adds an early reset driver for SoCFPGA and simple reset driver
support for Stratix10, and generalizes the uniphier USB3 glue layer
reset to also cover AHCI.
* tag 'reset-for-5.0-rc2' of git://git.pengutronix.de/git/pza/linux:
reset: uniphier-glue: Add AHCI reset control support in glue layer
dt-bindings: reset: uniphier: Add AHCI core reset description
reset: uniphier-usb3: Rename to reset-uniphier-glue
dt-bindings: reset: uniphier: Replace the expression of USB3 with generic peripherals
ARM: socfpga: dts: document "altr,stratix10-rst-mgr" binding
reset: socfpga: add an early reset driver for SoCFPGA
reset: fix null pointer dereference on dev by dev_name
reset: Add reset_control_get_count()
reset: Improve reset controller kernel docs
ARC: HSDK: improve reset driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/reset/reset-hsdk.c')
| -rw-r--r-- | drivers/reset/reset-hsdk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c index 8bce391c6943..4c7b8647b49c 100644 --- a/drivers/reset/reset-hsdk.c +++ b/drivers/reset/reset-hsdk.c @@ -86,6 +86,7 @@ static int hsdk_reset_reset(struct reset_controller_dev *rcdev, static const struct reset_control_ops hsdk_reset_ops = { .reset = hsdk_reset_reset, + .deassert = hsdk_reset_reset, }; static int hsdk_reset_probe(struct platform_device *pdev) |