Commit 57683e45 authored by Olof Johansson's avatar Olof Johansson

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: default avatarOlof Johansson <olof@lixom.net>
parents ac0722f2 13e8a05b
...@@ -130,6 +130,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev) ...@@ -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.nr_resets = ARRAY_SIZE(axg_audio_arb_reset_bits);
arb->rstc.ops = &meson_audio_arb_rstc_ops; arb->rstc.ops = &meson_audio_arb_rstc_ops;
arb->rstc.of_node = dev->of_node; arb->rstc.of_node = dev->of_node;
arb->rstc.owner = THIS_MODULE;
/* /*
* Enable general : * Enable general :
......
...@@ -51,7 +51,10 @@ ...@@ -51,7 +51,10 @@
#define RESET_SD_EMMC_A 44 #define RESET_SD_EMMC_A 44
#define RESET_SD_EMMC_B 45 #define RESET_SD_EMMC_B 45
#define RESET_SD_EMMC_C 46 #define RESET_SD_EMMC_C 46
/* 47-60 */ /* 47 */
#define RESET_USB_PHY20 48
#define RESET_USB_PHY21 49
/* 50-60 */
#define RESET_AUDIO_CODEC 61 #define RESET_AUDIO_CODEC 61
/* 62-63 */ /* 62-63 */
/* RESET2 */ /* RESET2 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment