]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge tag 'reset-for-v6.14-2' of git://git.pengutronix.de/pza/linux into soc/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 15 Jan 2025 17:05:37 +0000 (18:05 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 15 Jan 2025 17:05:41 +0000 (18:05 +0100)
commitf51df260e82b81c3e8ea2ab4554926bf475d926c
treef1611915b85bb20646020b8198416a79a233ab6f
parent677184d6e4300c1aed4221960b18d9c0598e4253
parent72bb8275a3b0784a817e0371c49c0110d68bb7fb
Merge tag 'reset-for-v6.14-2' of git://git.pengutronix.de/pza/linux into soc/drivers

Reset controller updates for v6.14 (v2)

* Add support for A1 SoC in amlogic reset driver.
* Drop aux registration helper from amlogic reset driver.

* tag 'reset-for-v6.14-2' of git://git.pengutronix.de/pza/linux:
  reset: amlogic: aux: drop aux registration helper
  reset: amlogic: aux: get regmap through parent device
  reset: amlogic: add support for A1 SoC in auxiliary reset driver
  dt-bindings: reset: add bindings for A1 SoC audio reset controller
  clk: amlogic: axg-audio: revert reset implementation
  Revert "clk: Fix invalid execution of clk_set_rate"

Link: https://lore.kernel.org/r/20250115170247.1303656-1-p.zabel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/clk/meson/axg-audio.c
drivers/reset/amlogic/reset-meson-aux.c