Re: [PATCH 00/26] clk: amlogic: clock controllers clean-up and factorisation

[Jerome Brunet <jbrunet@baylibre.com>]

On Wed 02 Jul 2025 at 17:25, Jerome Brunet <jbrunet@baylibre.com> wrote:

> The work on this patchset started with the submission of the Amlogic t7
> peripheral clock controller [1]. This controller is fairly similar to
> existing controllers. Once again, it redefines the peripheral clock macro,
> the probe function and composite clock helpers, even if it is almost the
> same as in other controllers. This code duplication trend has been going on
> for too long and now is the time to properly address the problem.
>
> There is clearly 4 parts in this patchset. These are sent together for v1
> to show why what the ugly first part is useful. If more versions are
> needed, the patchset will be split in 4.
>
> While all controllers are doing more or less the same things, tiny and
> often pointless differences have emerged between the controllers. This
> makes it harder to exploit SoC commonalities.
>
> The first part of this series deals with that problem and realign things
> up. There is nothing complicated going on there beside renaming. It is the
> ugly stuff, yet necessary, we have to go through to get to the interesting
> stuff afterwards. There is one change per controller for the review, with
> the intent to squash this into a single change on application.
>
> Second is the factorisation of the probe functions so those stop being
> copy/pasted in each clock controller drivers.
>
> Then the clean-up and factorisation for the PCLK macros, again to stop
> copy/paste but also the silent use CLK_IGNORE_UNUSED.
>
> Finally the introduction of macros for composite clock definitions. The
> same pattern as the for the PCLKs started to appear on s4, c3 and t7. Done
> properly, this could also help reduce the verbosity of the older
> controllers.
>
> With this, the c3-peripherals controller may be used as an example of what
> future similar controllers should look like.
>
> After this, there is still some house keeping to be done in the amlogic
> clock drivers:
> - Moving remaining reset drivers to the reset subsystem
> - Proper decoupling of clk-regmap from the clock controllers
> - Reduce verbosity of older controllers with the composite macros, where it
>   makes sense.
>
> [1]: https://lore.kernel.org/linux-clk/20250108094025.2664201-6-jian.hu@amlogic.com/
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
> Jerome Brunet (26):
>       clk: amlogic: a1-peripherals: naming consistency alignment
>       clk: amlogic: a1-pll: naming consistency alignment
>       clk: amlogic: axg-ao: naming consistency alignment
>       clk: amlogic: axg: naming consistency alignment
>       clk: amlogic: c3-peripherals: naming consistency alignment
>       clk: amlogic: c3-pll: naming consistency alignment
>       clk: amlogic: g12a-ao: naming consistency alignment
>       clk: amlogic: g12a: naming consistency alignment
>       clk: amlogic: gxbb-ao: naming consistency alignment
>       clk: amlogic: gxbb: naming consistency alignment
>       clk: amlogic: meson8b: naming consistency alignment
>       clk: amlogic: s4-peripherals: naming consistency alignment
>       clk: amlogic: s4-pll: naming consistency alignment
>       clk: amlogic: meson8-ddr: naming consistency alignment

Applied and squashed the 14 changes above.

>       clk: amlogic: drop meson-clkcee
>       clk: amlogic: add probe helper for mmio based controllers
>       clk: amlogic: use probe helper in mmio based controllers
>       clk: amlogic: aoclk: use clkc-utils syscon probe
>       clk: amlogic: move PCLK definition to clkc-utils
>       clk: amlogic: drop CLK_SET_RATE_PARENT from peripheral clocks
>       clk: amlogic: pclk explicitly use CLK_IGNORE_UNUSED
>       clk: amlogic: introduce a common pclk definition
>       clk: amlogic: use the common pclk definition
>       clk: amlogic: add composite clock helpers
>       clk: amlogic: align s4 and c3 pwm clock descriptions
>       clk: amlogic: c3-peripherals: use helper for basic composite clocks
>
>  drivers/clk/meson/Kconfig            |   13 +-
>  drivers/clk/meson/Makefile           |    1 -
>  drivers/clk/meson/a1-peripherals.c   |  995 +++++-----
>  drivers/clk/meson/a1-pll.c           |  124 +-
>  drivers/clk/meson/axg-aoclk.c        |  153 +-
>  drivers/clk/meson/axg.c              |  237 +--
>  drivers/clk/meson/c3-peripherals.c   | 2055 ++++++---------------
>  drivers/clk/meson/c3-pll.c           |  245 ++-
>  drivers/clk/meson/clk-regmap.h       |   20 -
>  drivers/clk/meson/g12a-aoclk.c       |  238 +--
>  drivers/clk/meson/g12a.c             | 3316 +++++++++++++++++-----------------
>  drivers/clk/meson/gxbb-aoclk.c       |  123 +-
>  drivers/clk/meson/gxbb.c             |  611 ++++---
>  drivers/clk/meson/meson-aoclk.c      |   32 +-
>  drivers/clk/meson/meson-aoclk.h      |    2 +-
>  drivers/clk/meson/meson-clkc-utils.c |   89 +-
>  drivers/clk/meson/meson-clkc-utils.h |   89 +
>  drivers/clk/meson/meson-eeclk.c      |   60 -
>  drivers/clk/meson/meson-eeclk.h      |   24 -
>  drivers/clk/meson/meson8-ddr.c       |   62 +-
>  drivers/clk/meson/meson8b.c          |  746 ++++----
>  drivers/clk/meson/s4-peripherals.c   | 1160 ++++--------
>  drivers/clk/meson/s4-pll.c           |   82 +-
>  23 files changed, 4437 insertions(+), 6040 deletions(-)
> ---
> base-commit: 2c37e1c671428002519e7615d786b9b692261052
> change-id: 20241211-meson-clk-cleanup-24-41cbe1924619
>
> Best regards,

-- 
Jerome