diff options
author | Arnd Bergmann <arnd@arndb.de> | 2024-06-27 16:43:17 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2024-06-27 16:43:17 +0200 |
commit | f42af02c0a9dadb32f766cf6afc11570f4d20ffd (patch) | |
tree | 1cda50047b17f4bde6a874e8a44e24ea9f52f99a /drivers/tee | |
parent | soc: add missing MODULE_DESCRIPTION() macros (diff) | |
parent | reset: RESET_IMX8MP_AUDIOMIX should depend on ARCH_MXC (diff) | |
download | linux-f42af02c0a9dadb32f766cf6afc11570f4d20ffd.tar.xz linux-f42af02c0a9dadb32f766cf6afc11570f4d20ffd.zip |
Merge tag 'reset-for-v6.11' of git://git.pengutronix.de/pza/linux into soc/drivers
Reset controller updates for v6.11
Move reset controller registration to the end in rzg2l-usbphy-ctrl, to
simplify the probe error path, add a new i.MX8MP AudioMix reset driver,
allow to build some drivers under COMPILE_TEST with fewer dependencies,
and use the devm_clk_get_enabled convenience wrapper in meson-audio-arb.
The latter causes a trivial merge conflict [1] with
b99e9c096148f ("reset: meson-audio-arb: Convert to platform remove callback returning void")
because I didn't manage to send that in last round. There is no overlap
though.
[1] https://lore.kernel.org/all/Znmufb9L78FCoSSS@sirena.org.uk/
* tag 'reset-for-v6.11' of git://git.pengutronix.de/pza/linux:
reset: RESET_IMX8MP_AUDIOMIX should depend on ARCH_MXC
reset: zynqmp: allow building under COMPILE_TEST
reset: imx8mp-audiomix: Add AudioMix Block Control reset driver
reset: meson-audio-arb: Use devm_clk_get_enabled()
reset: sti: allow building under COMPILE_TEST
reset: rzg2l-usbphy-ctrl: Move reset controller registration
Link: https://lore.kernel.org/r/20240626163258.61222-1-p.zabel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/tee')
0 files changed, 0 insertions, 0 deletions