| Message ID | 1jy11w307q.fsf@starbuckisacylon.baylibre.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [GIT,PULL] clk: meson: amlogic clock updates for v6.13 | expand |
Quoting Jerome Brunet (2024-11-06 06:28:57) > > Hi Stephen, > > Here is the Amlogic clock update for v6.13. > > This is one is a bit out of the ordinary. You'll notice a fair amount > change in drivers/reset. We completed the rework to take the resets of > the axg controller out of drivers/clk/meson. This code will now be > maintained where it belongs. This will also allow to not duplicate reset > driver with the new audio clock controllers coming up. > > The reset change present in this PR come from the following tag provided > by Philipp: > > https://git.pengutronix.de/cgit/pza/linux/tag/?h=reset-amlogic-aux > > One of the change present in this PR depends on these reset changes > which is why I pulled it. > > The rest of the PR is business as usual. > > The following changes since commit 9852d85ec9d492ebef56dc5f229416c925758edc: > > Linux 6.12-rc1 (2024-09-29 15:06:19 -0700) > > are available in the Git repository at: > > https://github.com/BayLibre/clk-meson.git tags/clk-meson-v6.13-1 > > for you to fetch changes up to 664988eb47dd2d6ae1d9e4188ec91832562f8f26: > > clk: amlogic: axg-audio: use the auxiliary reset driver (2024-10-14 10:11:05 +0200) > > ---------------------------------------------------------------- Thanks. Pulled into clk-next
Hi Stephen, Here is the Amlogic clock update for v6.13. This is one is a bit out of the ordinary. You'll notice a fair amount change in drivers/reset. We completed the rework to take the resets of the axg controller out of drivers/clk/meson. This code will now be maintained where it belongs. This will also allow to not duplicate reset driver with the new audio clock controllers coming up. The reset change present in this PR come from the following tag provided by Philipp: https://git.pengutronix.de/cgit/pza/linux/tag/?h=reset-amlogic-aux One of the change present in this PR depends on these reset changes which is why I pulled it. The rest of the PR is business as usual. The following changes since commit 9852d85ec9d492ebef56dc5f229416c925758edc: Linux 6.12-rc1 (2024-09-29 15:06:19 -0700) are available in the Git repository at: https://github.com/BayLibre/clk-meson.git tags/clk-meson-v6.13-1 for you to fetch changes up to 664988eb47dd2d6ae1d9e4188ec91832562f8f26: clk: amlogic: axg-audio: use the auxiliary reset driver (2024-10-14 10:11:05 +0200) ---------------------------------------------------------------- Amlogic clock updates for v6.13 * Fix hifi_pll rate calculation on s4 and c3 * Move audio reset implementation from the axg-audio clock controller driver to the reset directory, using the auxiliary device bus. * Remove the unnecessary spinlock in the mpll driver * Fix meson8 clock controller DT bindings ---------------------------------------------------------------- Chuan Liu (5): clk: meson: s4: pll: hifi_pll support fractional multiplier clk: meson: Support PLL with fixed fractional denominators clk: meson: c3: pll: fix frac maximum value for hifi_pll clk: meson: s4: pll: fix frac maximum value for hifi_pll clk: meson: mpll: Delete a useless spinlock from the MPLL Jerome Brunet (14): clk: meson: meson8b: remove spinlock Merge tag 'v6.12-rc1' into clk-meson-next Merge branch 'v6.13/bindings' into clk-meson-next reset: amlogic: convert driver to regmap reset: amlogic: use generic data matching function reset: amlogic: make parameters unsigned reset: amlogic: add driver parameters reset: amlogic: use reset number instead of register count reset: amlogic: add reset status support reset: amlogic: move drivers to a dedicated directory reset: amlogic: split the device core and platform probe reset: amlogic: add auxiliary reset driver support Merge tag 'reset-amlogic-aux' into clk-meson-next clk: amlogic: axg-audio: use the auxiliary reset driver Neil Armstrong (1): dt-bindings: clock: convert amlogic,meson8b-clkc.txt to dtschema Philipp Zabel (1): reset: amlogic: Fix small whitespace issue .../bindings/clock/amlogic,meson8-clkc.yaml | 45 ++++++ .../bindings/clock/amlogic,meson8b-clkc.txt | 51 ------- drivers/clk/meson/Kconfig | 1 + drivers/clk/meson/axg-audio.c | 109 ++------------ drivers/clk/meson/axg.c | 6 - drivers/clk/meson/c3-pll.c | 1 + drivers/clk/meson/clk-mpll.c | 11 -- drivers/clk/meson/clk-mpll.h | 1 - drivers/clk/meson/clk-pll.c | 8 +- drivers/clk/meson/clk-pll.h | 1 + drivers/clk/meson/g12a.c | 6 - drivers/clk/meson/gxbb.c | 6 - drivers/clk/meson/meson8b.c | 10 -- drivers/clk/meson/s4-pll.c | 13 +- drivers/reset/Kconfig | 15 +- drivers/reset/Makefile | 3 +- drivers/reset/amlogic/Kconfig | 27 ++++ drivers/reset/amlogic/Makefile | 4 + .../reset/{ => amlogic}/reset-meson-audio-arb.c | 0 drivers/reset/amlogic/reset-meson-aux.c | 136 ++++++++++++++++++ drivers/reset/amlogic/reset-meson-common.c | 142 ++++++++++++++++++ drivers/reset/amlogic/reset-meson.c | 105 ++++++++++++++ drivers/reset/amlogic/reset-meson.h | 28 ++++ drivers/reset/reset-meson.c | 159 --------------------- include/soc/amlogic/reset-meson-aux.h | 23 +++ 25 files changed, 535 insertions(+), 376 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/amlogic,meson8-clkc.yaml delete mode 100644 Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt create mode 100644 drivers/reset/amlogic/Kconfig create mode 100644 drivers/reset/amlogic/Makefile rename drivers/reset/{ => amlogic}/reset-meson-audio-arb.c (100%) create mode 100644 drivers/reset/amlogic/reset-meson-aux.c create mode 100644 drivers/reset/amlogic/reset-meson-common.c create mode 100644 drivers/reset/amlogic/reset-meson.c create mode 100644 drivers/reset/amlogic/reset-meson.h delete mode 100644 drivers/reset/reset-meson.c create mode 100644 include/soc/amlogic/reset-meson-aux.h