clk: mmp2: Move number of clocks to driver source

The number of clocks should not be in the dt binding as it is not used
by the respective device tree and thus needlessly bloats the ABI.

Move this number of clocks into the driver source.

Signed-off-by: Duje Mihanović <duje.mihanovic@skole.hr>
Link: https://lore.kernel.org/r/20230812-mmp-nr-clks-v2-1-f9271bd7eaa5@skole.hr
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/mmp/clk-audio.c b/drivers/clk/mmp/clk-audio.c
index 6fb1aa9..ae521aa 100644 (file)
--- a/drivers/clk/mmp/clk-audio.c
+++ b/drivers/clk/mmp/clk-audio.c
@@ -55,6 +55,8 @@
 #define SSPA_AUD_PLL_CTRL1_DIV_OCLK_PATTERN_MASK (0x7ff << 0)
 #define SSPA_AUD_PLL_CTRL1_DIV_OCLK_PATTERN(x) ((x) << 0)
 
+#define CLK_AUDIO_NR_CLKS                      3
+
 struct mmp2_audio_clk {
        void __iomem *mmio_base;
 
@@ -336,7 +338,7 @@ static int register_clocks(struct mmp2_audio_clk *priv, struct device *dev)
        priv->clk_data.hws[MMP2_CLK_AUDIO_SYSCLK] = &priv->sysclk_gate.hw;
        priv->clk_data.hws[MMP2_CLK_AUDIO_SSPA0] = &priv->sspa0_gate.hw;
        priv->clk_data.hws[MMP2_CLK_AUDIO_SSPA1] = &priv->sspa1_gate.hw;
-       priv->clk_data.num = MMP2_CLK_AUDIO_NR_CLKS;
+       priv->clk_data.num = CLK_AUDIO_NR_CLKS;
 
        return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
                                      &priv->clk_data);
@@ -349,7 +351,7 @@ static int mmp2_audio_clk_probe(struct platform_device *pdev)
 
        priv = devm_kzalloc(&pdev->dev,
                            struct_size(priv, clk_data.hws,
-                                       MMP2_CLK_AUDIO_NR_CLKS),
+                                       CLK_AUDIO_NR_CLKS),
                            GFP_KERNEL);
        if (!priv)
                return -ENOMEM;

diff --git a/drivers/clk/mmp/clk-of-mmp2.c b/drivers/clk/mmp/clk-of-mmp2.c
index bcf60f4..eaad36e 100644 (file)
--- a/drivers/clk/mmp/clk-of-mmp2.c
+++ b/drivers/clk/mmp/clk-of-mmp2.c
@@ -78,6 +78,8 @@
 #define MPMU_PLL_DIFF_CTRL     0x68
 #define MPMU_PLL2_CTRL1                0x414
 
+#define NR_CLKS                200
+
 enum mmp2_clk_model {
        CLK_MODEL_MMP2,
        CLK_MODEL_MMP3,
@@ -543,7 +545,7 @@ static void __init mmp2_clk_init(struct device_node *np)
 
        mmp2_pm_domain_init(np, pxa_unit);
 
-       mmp_clk_init(np, &pxa_unit->unit, MMP2_NR_CLKS);
+       mmp_clk_init(np, &pxa_unit->unit, NR_CLKS);
 
        mmp2_main_clk_init(pxa_unit);
 

diff --git a/include/dt-bindings/clock/marvell,mmp2-audio.h b/include/dt-bindings/clock/marvell,mmp2-audio.h
index 2066477..9653e04 100644 (file)
--- a/include/dt-bindings/clock/marvell,mmp2-audio.h
+++ b/include/dt-bindings/clock/marvell,mmp2-audio.h
@@ -6,5 +6,4 @@
 #define MMP2_CLK_AUDIO_SSPA0           1
 #define MMP2_CLK_AUDIO_SSPA1           2
 
-#define MMP2_CLK_AUDIO_NR_CLKS         3
 #endif

diff --git a/include/dt-bindings/clock/marvell,mmp2.h b/include/dt-bindings/clock/marvell,mmp2.h
index f0819d6..88c2d71 100644 (file)
--- a/include/dt-bindings/clock/marvell,mmp2.h
+++ b/include/dt-bindings/clock/marvell,mmp2.h
@@ -91,5 +91,4 @@
 #define MMP3_CLK_SDH4                  126
 #define MMP2_CLK_AUDIO                 127
 
-#define MMP2_NR_CLKS                   200
 #endif