diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2024-11-07 00:40:12 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2024-11-07 00:40:12 +0300 |
| commit | c601478bf02e124744308bca3618e07ad8a8208d (patch) | |
| tree | 0a7285a7162c5d23351cf33f3eaba1d6e867f30a /include | |
| parent | 9852d85ec9d492ebef56dc5f229416c925758edc (diff) | |
| parent | 664988eb47dd2d6ae1d9e4188ec91832562f8f26 (diff) | |
| download | linux-c601478bf02e124744308bca3618e07ad8a8208d.tar.xz | |
Merge tag 'clk-meson-v6.13-1' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk driver updates from Jerome Brunet:
- Fix hifi_pll rate calculation on Amlogic s4 and c3
- Move audio reset implementation from the Amlogic axg-audio clock
controller driver to the reset directory, using the auxiliary device
bus
- Remove the unnecessary spinlock in the Amlogic mpll driver
- Fix Amlogic meson8 clock controller DT bindings
* tag 'clk-meson-v6.13-1' of https://github.com/BayLibre/clk-meson:
clk: amlogic: axg-audio: use the auxiliary reset driver
reset: amlogic: Fix small whitespace issue
reset: amlogic: add auxiliary reset driver support
reset: amlogic: split the device core and platform probe
reset: amlogic: move drivers to a dedicated directory
reset: amlogic: add reset status support
reset: amlogic: use reset number instead of register count
reset: amlogic: add driver parameters
reset: amlogic: make parameters unsigned
reset: amlogic: use generic data matching function
reset: amlogic: convert driver to regmap
dt-bindings: clock: convert amlogic,meson8b-clkc.txt to dtschema
clk: meson: meson8b: remove spinlock
clk: meson: mpll: Delete a useless spinlock from the MPLL
clk: meson: s4: pll: fix frac maximum value for hifi_pll
clk: meson: c3: pll: fix frac maximum value for hifi_pll
clk: meson: Support PLL with fixed fractional denominators
clk: meson: s4: pll: hifi_pll support fractional multiplier
Diffstat (limited to 'include')
| -rw-r--r-- | include/soc/amlogic/reset-meson-aux.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/soc/amlogic/reset-meson-aux.h b/include/soc/amlogic/reset-meson-aux.h new file mode 100644 index 000000000000..d8a15d48c984 --- /dev/null +++ b/include/soc/amlogic/reset-meson-aux.h @@ -0,0 +1,23 @@ +/* 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 */ |
