diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-01-15 18:05:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-01-15 18:05:41 +0100 |
| commit | f51df260e82b81c3e8ea2ab4554926bf475d926c (patch) | |
| tree | f1611915b85bb20646020b8198416a79a233ab6f /include/soc | |
| parent | 677184d6e4300c1aed4221960b18d9c0598e4253 (diff) | |
| parent | 72bb8275a3b0784a817e0371c49c0110d68bb7fb (diff) | |
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>
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/amlogic/reset-meson-aux.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/soc/amlogic/reset-meson-aux.h b/include/soc/amlogic/reset-meson-aux.h deleted file mode 100644 index d8a15d48c984..000000000000 --- a/include/soc/amlogic/reset-meson-aux.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __SOC_RESET_MESON_AUX_H -#define __SOC_RESET_MESON_AUX_H - -#include <linux/err.h> - -struct device; -struct regmap; - -#if IS_ENABLED(CONFIG_RESET_MESON_AUX) -int devm_meson_rst_aux_register(struct device *dev, - struct regmap *map, - const char *adev_name); -#else -static inline int devm_meson_rst_aux_register(struct device *dev, - struct regmap *map, - const char *adev_name) -{ - return 0; -} -#endif - -#endif /* __SOC_RESET_MESON_AUX_H */ |