Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: clk: amlogic,a1-pll-clkc: expose all clock ids

Due to a policy change in clock ID bindings handling, expose
all the "private" clock IDs to the public clock dt-bindings
to move out of the previous maintenance scheme.

This refers to a discussion at [1] & [2] with Krzysztof about
the issue with the current maintenance.

It was decided to move every A1 pll ID to the public clock
dt-bindings headers to be merged in a single tree so we
can safely add new clocks without having merge issues.

[1] https://lore.kernel.org/all/c088e01c-0714-82be-8347-6140daf56640@linaro.org/
[2] https://lore.kernel.org/all/2fabe721-7434-43e7-bae5-088a42ba128d@app.fastmail.com/

Reviewed-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230607-topic-amlogic-upstream-clkid-public-migration-v2-13-38172d17c27a@linaro.org
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

authored by

Neil Armstrong and committed by
Jerome Brunet
09d65c02 57049a1c

+5 -15
-15
drivers/clk/meson/a1-pll.h
··· 28 28 /* include the CLKIDs that have been made part of the DT binding */ 29 29 #include <dt-bindings/clock/amlogic,a1-pll-clkc.h> 30 30 31 - /* 32 - * CLKID index values for internal clocks 33 - * 34 - * These indices are entirely contrived and do not map onto the hardware. 35 - * It has now been decided to expose everything by default in the DT header: 36 - * include/dt-bindings/clock/a1-pll-clkc.h. Only the clocks ids we don't want 37 - * to expose, such as the internal muxes and dividers of composite clocks, 38 - * will remain defined here. 39 - */ 40 - #define CLKID_FIXED_PLL_DCO 0 41 - #define CLKID_FCLK_DIV2_DIV 2 42 - #define CLKID_FCLK_DIV3_DIV 3 43 - #define CLKID_FCLK_DIV5_DIV 4 44 - #define CLKID_FCLK_DIV7_DIV 5 45 - 46 31 #endif /* __A1_PLL_H */
+5
include/dt-bindings/clock/amlogic,a1-pll-clkc.h
··· 10 10 #ifndef __A1_PLL_CLKC_H 11 11 #define __A1_PLL_CLKC_H 12 12 13 + #define CLKID_FIXED_PLL_DCO 0 13 14 #define CLKID_FIXED_PLL 1 15 + #define CLKID_FCLK_DIV2_DIV 2 16 + #define CLKID_FCLK_DIV3_DIV 3 17 + #define CLKID_FCLK_DIV5_DIV 4 18 + #define CLKID_FCLK_DIV7_DIV 5 14 19 #define CLKID_FCLK_DIV2 6 15 20 #define CLKID_FCLK_DIV3 7 16 21 #define CLKID_FCLK_DIV5 8