Skip to content

Commit 46c1351

Browse files
LegoLivesMatterbebarino
authored andcommitted
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>
1 parent 979663c commit 46c1351

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

drivers/clk/mmp/clk-audio.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
#define SSPA_AUD_PLL_CTRL1_DIV_OCLK_PATTERN_MASK (0x7ff << 0)
5656
#define SSPA_AUD_PLL_CTRL1_DIV_OCLK_PATTERN(x) ((x) << 0)
5757

58+
#define CLK_AUDIO_NR_CLKS 3
59+
5860
struct mmp2_audio_clk {
5961
void __iomem *mmio_base;
6062

@@ -336,7 +338,7 @@ static int register_clocks(struct mmp2_audio_clk *priv, struct device *dev)
336338
priv->clk_data.hws[MMP2_CLK_AUDIO_SYSCLK] = &priv->sysclk_gate.hw;
337339
priv->clk_data.hws[MMP2_CLK_AUDIO_SSPA0] = &priv->sspa0_gate.hw;
338340
priv->clk_data.hws[MMP2_CLK_AUDIO_SSPA1] = &priv->sspa1_gate.hw;
339-
priv->clk_data.num = MMP2_CLK_AUDIO_NR_CLKS;
341+
priv->clk_data.num = CLK_AUDIO_NR_CLKS;
340342

341343
return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
342344
&priv->clk_data);
@@ -349,7 +351,7 @@ static int mmp2_audio_clk_probe(struct platform_device *pdev)
349351

350352
priv = devm_kzalloc(&pdev->dev,
351353
struct_size(priv, clk_data.hws,
352-
MMP2_CLK_AUDIO_NR_CLKS),
354+
CLK_AUDIO_NR_CLKS),
353355
GFP_KERNEL);
354356
if (!priv)
355357
return -ENOMEM;

drivers/clk/mmp/clk-of-mmp2.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@
7878
#define MPMU_PLL_DIFF_CTRL 0x68
7979
#define MPMU_PLL2_CTRL1 0x414
8080

81+
#define NR_CLKS 200
82+
8183
enum mmp2_clk_model {
8284
CLK_MODEL_MMP2,
8385
CLK_MODEL_MMP3,
@@ -543,7 +545,7 @@ static void __init mmp2_clk_init(struct device_node *np)
543545

544546
mmp2_pm_domain_init(np, pxa_unit);
545547

546-
mmp_clk_init(np, &pxa_unit->unit, MMP2_NR_CLKS);
548+
mmp_clk_init(np, &pxa_unit->unit, NR_CLKS);
547549

548550
mmp2_main_clk_init(pxa_unit);
549551

include/dt-bindings/clock/marvell,mmp2-audio.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
#define MMP2_CLK_AUDIO_SSPA0 1
77
#define MMP2_CLK_AUDIO_SSPA1 2
88

9-
#define MMP2_CLK_AUDIO_NR_CLKS 3
109
#endif

include/dt-bindings/clock/marvell,mmp2.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,4 @@
9191
#define MMP3_CLK_SDH4 126
9292
#define MMP2_CLK_AUDIO 127
9393

94-
#define MMP2_NR_CLKS 200
9594
#endif

0 commit comments

Comments
 (0)