| Message ID | 20230808082738.122804-3-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | clk: samsung: remove number of clocks from bindings | expand |
> -----Original Message----- > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Sent: Tuesday, August 8, 2023 1:57 PM > To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>; Sylwester > Nawrocki <s.nawrocki@samsung.com>; Tomasz Figa > <tomasz.figa@gmail.com>; Chanwoo Choi <cw00.choi@samsung.com>; Alim > Akhtar <alim.akhtar@samsung.com>; Michael Turquette > <mturquette@baylibre.com>; Stephen Boyd <sboyd@kernel.org>; Rob > Herring <robh+dt@kernel.org>; Conor Dooley <conor+dt@kernel.org>; > linux-samsung-soc@vger.kernel.org; linux-clk@vger.kernel.org; linux-arm- > kernel@lists.infradead.org; linux-kernel@vger.kernel.org; > devicetree@vger.kernel.org > Subject: [PATCH 02/11] clk: samsung: exynos4: 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@linaro.org> > --- Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com> > drivers/clk/samsung/clk-exynos4.c | 5 ++++- > drivers/clk/samsung/clk-exynos4412-isp.c | 5 ++++- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk- > exynos4.c > index 43207257a9cc..4ec41221e68f 100644 > --- a/drivers/clk/samsung/clk-exynos4.c > +++ b/drivers/clk/samsung/clk-exynos4.c > @@ -135,6 +135,9 @@ > #define PWR_CTRL1_USE_CORE1_WFI (1 << 1) > #define PWR_CTRL1_USE_CORE0_WFI (1 << 0) > > +/* NOTE: Must be equal to the last clock ID increased by one */ > +#define CLKS_NR (CLK_DIV_CORE2 + 1) > + > /* the exynos4 soc type */ > enum exynos4_soc { > EXYNOS4210, > @@ -1275,7 +1278,7 @@ static void __init exynos4_clk_init(struct > device_node *np, > if (!reg_base) > panic("%s: failed to map registers\n", __func__); > > - ctx = samsung_clk_init(NULL, reg_base, CLK_NR_CLKS); > + ctx = samsung_clk_init(NULL, reg_base, CLKS_NR); > hws = ctx->clk_data.hws; > > samsung_clk_of_register_fixed_ext(ctx, > exynos4_fixed_rate_ext_clks, diff --git a/drivers/clk/samsung/clk- > exynos4412-isp.c b/drivers/clk/samsung/clk-exynos4412-isp.c > index 1470c15e95da..a70c2b06a61a 100644 > --- a/drivers/clk/samsung/clk-exynos4412-isp.c > +++ b/drivers/clk/samsung/clk-exynos4412-isp.c > @@ -22,6 +22,9 @@ > #define E4X12_GATE_ISP0 0x0800 > #define E4X12_GATE_ISP1 0x0804 > > +/* NOTE: Must be equal to the last clock ID increased by one */ > +#define CLKS_NR_ISP (CLK_ISP_DIV_MCUISP1 + 1) > + > /* > * Support for CMU save/restore across system suspends > */ > @@ -121,7 +124,7 @@ static int __init exynos4x12_isp_clk_probe(struct > platform_device *pdev) > if (!exynos4x12_save_isp) > return -ENOMEM; > > - ctx = samsung_clk_init(dev, reg_base, CLK_NR_ISP_CLKS); > + ctx = samsung_clk_init(dev, reg_base, CLKS_NR_ISP); > > platform_set_drvdata(pdev, ctx); > > -- > 2.34.1
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c index 43207257a9cc..4ec41221e68f 100644 --- a/drivers/clk/samsung/clk-exynos4.c +++ b/drivers/clk/samsung/clk-exynos4.c @@ -135,6 +135,9 @@ #define PWR_CTRL1_USE_CORE1_WFI (1 << 1) #define PWR_CTRL1_USE_CORE0_WFI (1 << 0) +/* NOTE: Must be equal to the last clock ID increased by one */ +#define CLKS_NR (CLK_DIV_CORE2 + 1) + /* the exynos4 soc type */ enum exynos4_soc { EXYNOS4210, @@ -1275,7 +1278,7 @@ static void __init exynos4_clk_init(struct device_node *np, if (!reg_base) panic("%s: failed to map registers\n", __func__); - ctx = samsung_clk_init(NULL, reg_base, CLK_NR_CLKS); + ctx = samsung_clk_init(NULL, reg_base, CLKS_NR); hws = ctx->clk_data.hws; samsung_clk_of_register_fixed_ext(ctx, exynos4_fixed_rate_ext_clks, diff --git a/drivers/clk/samsung/clk-exynos4412-isp.c b/drivers/clk/samsung/clk-exynos4412-isp.c index 1470c15e95da..a70c2b06a61a 100644 --- a/drivers/clk/samsung/clk-exynos4412-isp.c +++ b/drivers/clk/samsung/clk-exynos4412-isp.c @@ -22,6 +22,9 @@ #define E4X12_GATE_ISP0 0x0800 #define E4X12_GATE_ISP1 0x0804 +/* NOTE: Must be equal to the last clock ID increased by one */ +#define CLKS_NR_ISP (CLK_ISP_DIV_MCUISP1 + 1) + /* * Support for CMU save/restore across system suspends */ @@ -121,7 +124,7 @@ static int __init exynos4x12_isp_clk_probe(struct platform_device *pdev) if (!exynos4x12_save_isp) return -ENOMEM; - ctx = samsung_clk_init(dev, reg_base, CLK_NR_ISP_CLKS); + ctx = samsung_clk_init(dev, reg_base, CLKS_NR_ISP); platform_set_drvdata(pdev, ctx);
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@linaro.org> --- drivers/clk/samsung/clk-exynos4.c | 5 ++++- drivers/clk/samsung/clk-exynos4412-isp.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)