> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> Sent: Tuesday, August 8, 2023 1:58 PM
> To: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>; Sylwester
> Nawrocki <s.nawrocki@xxxxxxxxxxx>; Tomasz Figa
> <tomasz.figa@xxxxxxxxx>; Chanwoo Choi <cw00.choi@xxxxxxxxxxx>; Alim
> Akhtar <alim.akhtar@xxxxxxxxxxx>; Michael Turquette
> <mturquette@xxxxxxxxxxxx>; Stephen Boyd <sboyd@xxxxxxxxxx>; Rob
> Herring <robh+dt@xxxxxxxxxx>; Conor Dooley <conor+dt@xxxxxxxxxx>;
> linux-samsung-soc@xxxxxxxxxxxxxxx; linux-clk@xxxxxxxxxxxxxxx; linux-arm-
> kernel@xxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx;
> devicetree@xxxxxxxxxxxxxxx
> Subject: [PATCH 07/11] clk: samsung: exynos5433: do not define number of
> clocks in bindings
>
> Number of clocks supported by Linux drivers might vary - sometimes we add
> new clocks, not exposed previously. Therefore this number of clocks
should
> not be in the bindings, because otherwise we should not change it.
>
> Define number of clocks per each clock controller inside the driver
directly.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> ---
Reviewed-by: Alim Akhtar <alim.akhtar@xxxxxxxxxxx>
> drivers/clk/samsung/clk-exynos5433.c | 65 +++++++++++++++++++---------
> 1 file changed, 44 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/clk/samsung/clk-exynos5433.c
b/drivers/clk/samsung/clk-
> exynos5433.c
> index ed43233649ae..6bfc5d0cd924 100644
> --- a/drivers/clk/samsung/clk-exynos5433.c
> +++ b/drivers/clk/samsung/clk-exynos5433.c
> @@ -21,6 +21,29 @@
> #include "clk-exynos-arm64.h"
> #include "clk-pll.h"
>
> +/* NOTE: Must be equal to the last clock ID increased by one */
> +#define CLKS_NR_TOP
> (CLK_SCLK_HDMI_SPDIF_DISP + 1)
> +#define CLKS_NR_CPIF (CLK_SCLK_UFS_MPHY + 1)
> +#define CLKS_NR_MIF (CLK_SCLK_BUS_PLL_ATLAS +
> 1)
> +#define CLKS_NR_PERIC (CLK_DIV_SCLK_SC_IN + 1)
> +#define CLKS_NR_PERIS (CLK_SCLK_OTP_CON + 1)
> +#define CLKS_NR_FSYS (CLK_PCIE + 1)
> +#define CLKS_NR_G2D (CLK_PCLK_SMMU_G2D + 1)
> +#define CLKS_NR_DISP
> (CLK_PHYCLK_MIPIDPHY0_RXCLKESC0_PHY + 1)
> +#define CLKS_NR_AUD (CLK_SCLK_AUD_I2S + 1)
> +#define CLKS_NR_BUSX (CLK_ACLK_BUS2RTND_400 +
> 1)
> +#define CLKS_NR_G3D (CLK_SCLK_HPM_G3D + 1)
> +#define CLKS_NR_GSCL (CLK_PCLK_SMMU_GSCL2 +
> 1)
> +#define CLKS_NR_APOLLO (CLK_SCLK_APOLLO + 1)
> +#define CLKS_NR_ATLAS (CLK_SCLK_ATLAS + 1)
> +#define CLKS_NR_MSCL (CLK_SCLK_JPEG + 1)
> +#define CLKS_NR_MFC (CLK_PCLK_SMMU_MFC_0 +
> 1)
> +#define CLKS_NR_HEVC (CLK_PCLK_SMMU_HEVC_0
> + 1)
> +#define CLKS_NR_ISP (CLK_SCLK_PIXELASYNCM_ISPC + 1)
> +#define CLKS_NR_CAM0
> (CLK_SCLK_PIXELASYNCS_LITE_C_INIT + 1)
> +#define CLKS_NR_CAM1 (CLK_SCLK_ISP_CA5 + 1)
> +#define CLKS_NR_IMEM (CLK_PCLK_SLIMSSS + 1)
> +
> /*
> * Register offset definitions for CMU_TOP
> */
> @@ -798,7 +821,7 @@ static const struct samsung_cmu_info top_cmu_info
> __initconst = {
> .nr_fixed_clks = ARRAY_SIZE(top_fixed_clks),
> .fixed_factor_clks = top_fixed_factor_clks,
> .nr_fixed_factor_clks = ARRAY_SIZE(top_fixed_factor_clks),
> - .nr_clk_ids = TOP_NR_CLK,
> + .nr_clk_ids = CLKS_NR_TOP,
> .clk_regs = top_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(top_clk_regs),
> .suspend_regs = top_suspend_regs,
> @@ -877,7 +900,7 @@ static const struct samsung_cmu_info cpif_cmu_info
> __initconst = {
> .nr_div_clks = ARRAY_SIZE(cpif_div_clks),
> .gate_clks = cpif_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(cpif_gate_clks),
> - .nr_clk_ids = CPIF_NR_CLK,
> + .nr_clk_ids = CLKS_NR_CPIF,
> .clk_regs = cpif_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(cpif_clk_regs),
> .suspend_regs = cpif_suspend_regs,
> @@ -1531,7 +1554,7 @@ static const struct samsung_cmu_info
> mif_cmu_info __initconst = {
> .nr_gate_clks = ARRAY_SIZE(mif_gate_clks),
> .fixed_factor_clks = mif_fixed_factor_clks,
> .nr_fixed_factor_clks = ARRAY_SIZE(mif_fixed_factor_clks),
> - .nr_clk_ids = MIF_NR_CLK,
> + .nr_clk_ids = CLKS_NR_MIF,
> .clk_regs = mif_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(mif_clk_regs),
> };
> @@ -1730,7 +1753,7 @@ static const struct samsung_cmu_info
> peric_cmu_info __initconst = {
> .nr_div_clks = ARRAY_SIZE(peric_div_clks),
> .gate_clks = peric_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(peric_gate_clks),
> - .nr_clk_ids = PERIC_NR_CLK,
> + .nr_clk_ids = CLKS_NR_PERIC,
> .clk_regs = peric_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(peric_clk_regs),
> .suspend_regs = peric_suspend_regs,
> @@ -1924,7 +1947,7 @@ static const struct samsung_gate_clock
> peris_gate_clks[] __initconst = { static const struct samsung_cmu_info
> peris_cmu_info __initconst = {
> .gate_clks = peris_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(peris_gate_clks),
> - .nr_clk_ids = PERIS_NR_CLK,
> + .nr_clk_ids = CLKS_NR_PERIS,
> .clk_regs = peris_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(peris_clk_regs),
> };
> @@ -2336,7 +2359,7 @@ static const struct samsung_cmu_info
> fsys_cmu_info __initconst = {
> .nr_gate_clks = ARRAY_SIZE(fsys_gate_clks),
> .fixed_clks = fsys_fixed_clks,
> .nr_fixed_clks = ARRAY_SIZE(fsys_fixed_clks),
> - .nr_clk_ids = FSYS_NR_CLK,
> + .nr_clk_ids = CLKS_NR_FSYS,
> .clk_regs = fsys_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(fsys_clk_regs),
> .suspend_regs = fsys_suspend_regs,
> @@ -2459,7 +2482,7 @@ static const struct samsung_cmu_info
> g2d_cmu_info __initconst = {
> .nr_div_clks = ARRAY_SIZE(g2d_div_clks),
> .gate_clks = g2d_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(g2d_gate_clks),
> - .nr_clk_ids = G2D_NR_CLK,
> + .nr_clk_ids = CLKS_NR_G2D,
> .clk_regs = g2d_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(g2d_clk_regs),
> .suspend_regs = g2d_suspend_regs,
> @@ -2887,7 +2910,7 @@ static const struct samsung_cmu_info
> disp_cmu_info __initconst = {
> .nr_fixed_clks = ARRAY_SIZE(disp_fixed_clks),
> .fixed_factor_clks = disp_fixed_factor_clks,
> .nr_fixed_factor_clks = ARRAY_SIZE(disp_fixed_factor_clks),
> - .nr_clk_ids = DISP_NR_CLK,
> + .nr_clk_ids = CLKS_NR_DISP,
> .clk_regs = disp_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(disp_clk_regs),
> .suspend_regs = disp_suspend_regs,
> @@ -3057,7 +3080,7 @@ static const struct samsung_cmu_info
> aud_cmu_info __initconst = {
> .nr_gate_clks = ARRAY_SIZE(aud_gate_clks),
> .fixed_clks = aud_fixed_clks,
> .nr_fixed_clks = ARRAY_SIZE(aud_fixed_clks),
> - .nr_clk_ids = AUD_NR_CLK,
> + .nr_clk_ids = CLKS_NR_AUD,
> .clk_regs = aud_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(aud_clk_regs),
> .suspend_regs = aud_suspend_regs,
> @@ -3189,7 +3212,7 @@ static const struct samsung_gate_clock
> bus2_gate_clks[] __initconst = {
> .nr_div_clks = ARRAY_SIZE(bus##id##_div_clks), \
> .gate_clks = bus##id##_gate_clks,
> \
> .nr_gate_clks = ARRAY_SIZE(bus##id##_gate_clks), \
> - .nr_clk_ids = BUSx_NR_CLK
> + .nr_clk_ids = CLKS_NR_BUSX
>
> static const struct samsung_cmu_info bus0_cmu_info __initconst = {
> CMU_BUS_INFO_CLKS(0),
> @@ -3340,7 +3363,7 @@ static const struct samsung_cmu_info
> g3d_cmu_info __initconst = {
> .nr_div_clks = ARRAY_SIZE(g3d_div_clks),
> .gate_clks = g3d_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(g3d_gate_clks),
> - .nr_clk_ids = G3D_NR_CLK,
> + .nr_clk_ids = CLKS_NR_G3D,
> .clk_regs = g3d_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(g3d_clk_regs),
> .suspend_regs = g3d_suspend_regs,
> @@ -3483,7 +3506,7 @@ static const struct samsung_cmu_info
> gscl_cmu_info __initconst = {
> .nr_mux_clks = ARRAY_SIZE(gscl_mux_clks),
> .gate_clks = gscl_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(gscl_gate_clks),
> - .nr_clk_ids = GSCL_NR_CLK,
> + .nr_clk_ids = CLKS_NR_GSCL,
> .clk_regs = gscl_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(gscl_clk_regs),
> .suspend_regs = gscl_suspend_regs,
> @@ -3693,7 +3716,7 @@ static const struct samsung_cmu_info
> apollo_cmu_info __initconst = {
> .nr_gate_clks = ARRAY_SIZE(apollo_gate_clks),
> .cpu_clks = apollo_cpu_clks,
> .nr_cpu_clks = ARRAY_SIZE(apollo_cpu_clks),
> - .nr_clk_ids = APOLLO_NR_CLK,
> + .nr_clk_ids = CLKS_NR_APOLLO,
> .clk_regs = apollo_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(apollo_clk_regs),
> };
> @@ -3938,7 +3961,7 @@ static const struct samsung_cmu_info
> atlas_cmu_info __initconst = {
> .nr_gate_clks = ARRAY_SIZE(atlas_gate_clks),
> .cpu_clks = atlas_cpu_clks,
> .nr_cpu_clks = ARRAY_SIZE(atlas_cpu_clks),
> - .nr_clk_ids = ATLAS_NR_CLK,
> + .nr_clk_ids = CLKS_NR_ATLAS,
> .clk_regs = atlas_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(atlas_clk_regs),
> };
> @@ -4112,7 +4135,7 @@ static const struct samsung_cmu_info
> mscl_cmu_info __initconst = {
> .nr_div_clks = ARRAY_SIZE(mscl_div_clks),
> .gate_clks = mscl_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(mscl_gate_clks),
> - .nr_clk_ids = MSCL_NR_CLK,
> + .nr_clk_ids = CLKS_NR_MSCL,
> .clk_regs = mscl_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(mscl_clk_regs),
> .suspend_regs = mscl_suspend_regs,
> @@ -4220,7 +4243,7 @@ static const struct samsung_cmu_info
> mfc_cmu_info __initconst = {
> .nr_div_clks = ARRAY_SIZE(mfc_div_clks),
> .gate_clks = mfc_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(mfc_gate_clks),
> - .nr_clk_ids = MFC_NR_CLK,
> + .nr_clk_ids = CLKS_NR_MFC,
> .clk_regs = mfc_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(mfc_clk_regs),
> .suspend_regs = mfc_suspend_regs,
> @@ -4330,7 +4353,7 @@ static const struct samsung_cmu_info
> hevc_cmu_info __initconst = {
> .nr_div_clks = ARRAY_SIZE(hevc_div_clks),
> .gate_clks = hevc_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(hevc_gate_clks),
> - .nr_clk_ids = HEVC_NR_CLK,
> + .nr_clk_ids = CLKS_NR_HEVC,
> .clk_regs = hevc_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(hevc_clk_regs),
> .suspend_regs = hevc_suspend_regs,
> @@ -4583,7 +4606,7 @@ static const struct samsung_cmu_info isp_cmu_info
> __initconst = {
> .nr_div_clks = ARRAY_SIZE(isp_div_clks),
> .gate_clks = isp_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(isp_gate_clks),
> - .nr_clk_ids = ISP_NR_CLK,
> + .nr_clk_ids = CLKS_NR_ISP,
> .clk_regs = isp_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(isp_clk_regs),
> .suspend_regs = isp_suspend_regs,
> @@ -5065,7 +5088,7 @@ static const struct samsung_cmu_info
> cam0_cmu_info __initconst = {
> .nr_gate_clks = ARRAY_SIZE(cam0_gate_clks),
> .fixed_clks = cam0_fixed_clks,
> .nr_fixed_clks = ARRAY_SIZE(cam0_fixed_clks),
> - .nr_clk_ids = CAM0_NR_CLK,
> + .nr_clk_ids = CLKS_NR_CAM0,
> .clk_regs = cam0_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(cam0_clk_regs),
> .suspend_regs = cam0_suspend_regs,
> @@ -5440,7 +5463,7 @@ static const struct samsung_cmu_info
> cam1_cmu_info __initconst = {
> .nr_gate_clks = ARRAY_SIZE(cam1_gate_clks),
> .fixed_clks = cam1_fixed_clks,
> .nr_fixed_clks = ARRAY_SIZE(cam1_fixed_clks),
> - .nr_clk_ids = CAM1_NR_CLK,
> + .nr_clk_ids = CLKS_NR_CAM1,
> .clk_regs = cam1_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(cam1_clk_regs),
> .suspend_regs = cam1_suspend_regs,
> @@ -5472,7 +5495,7 @@ static const struct samsung_gate_clock
> imem_gate_clks[] __initconst = { static const struct samsung_cmu_info
> imem_cmu_info __initconst = {
> .gate_clks = imem_gate_clks,
> .nr_gate_clks = ARRAY_SIZE(imem_gate_clks),
> - .nr_clk_ids = IMEM_NR_CLK,
> + .nr_clk_ids = CLKS_NR_IMEM,
> .clk_regs = imem_clk_regs,
> .nr_clk_regs = ARRAY_SIZE(imem_clk_regs),
> .clk_name = "aclk_imem_200",
> --
> 2.34.1
