diff options
| author |   Olof Johansson <olof@lixom.net> | 2019-04-07 15:14:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-07 15:14:00 -0700 |
| commit | 57683e452b73d1f4f7fbe4627196139b9772c51a (patch) | |
| tree | aac059cf6cf4f6b9c673a7e71feefa3d0e12ec42 /drivers | |
| parent | dt-bindings: cpu: Fix JSON schema (diff) | |
| parent | reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev (diff) | |
| download | linux-dev-57683e452b73d1f4f7fbe4627196139b9772c51a.tar.xz linux-dev-57683e452b73d1f4f7fbe4627196139b9772c51a.zip | |
Merge tag 'reset-fixes-for-v5.1' of git://git.pengutronix.de/pza/linux into arm/fixes
Reset controller fixes for v5.1
This tag adds missing USB PHY reset lines to the Meson G12A reset
controller header and fixes the Meson Audio ARB driver to prevent
module unloading while it is in use.
* tag 'reset-fixes-for-v5.1' of git://git.pengutronix.de/pza/linux:
reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev
dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/reset/reset-meson-audio-arb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/reset-meson-audio-arb.c index 91751617b37a..c53a2185a039 100644 --- a/drivers/reset/reset-meson-audio-arb.c +++ b/drivers/reset/reset-meson-audio-arb.c @@ -130,6 +130,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev) arb->rstc.nr_resets = ARRAY_SIZE(axg_audio_arb_reset_bits); arb->rstc.ops = &meson_audio_arb_rstc_ops; arb->rstc.of_node = dev->of_node; + arb->rstc.owner = THIS_MODULE; /* * Enable general : |