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

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Duje Mihanović and committed by
Stephen Boyd 46c13513 979663c3

+7 -5
+4 -2
drivers/clk/mmp/clk-audio.c
··· 55 55 #define SSPA_AUD_PLL_CTRL1_DIV_OCLK_PATTERN_MASK (0x7ff << 0) 56 56 #define SSPA_AUD_PLL_CTRL1_DIV_OCLK_PATTERN(x) ((x) << 0) 57 57 58 + #define CLK_AUDIO_NR_CLKS 3 59 + 58 60 struct mmp2_audio_clk { 59 61 void __iomem *mmio_base; 60 62 ··· 338 336 priv->clk_data.hws[MMP2_CLK_AUDIO_SYSCLK] = &priv->sysclk_gate.hw; 339 337 priv->clk_data.hws[MMP2_CLK_AUDIO_SSPA0] = &priv->sspa0_gate.hw; 340 338 priv->clk_data.hws[MMP2_CLK_AUDIO_SSPA1] = &priv->sspa1_gate.hw; 341 - priv->clk_data.num = MMP2_CLK_AUDIO_NR_CLKS; 339 + priv->clk_data.num = CLK_AUDIO_NR_CLKS; 342 340 343 341 return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get, 344 342 &priv->clk_data); ··· 351 349 352 350 priv = devm_kzalloc(&pdev->dev, 353 351 struct_size(priv, clk_data.hws, 354 - MMP2_CLK_AUDIO_NR_CLKS), 352 + CLK_AUDIO_NR_CLKS), 355 353 GFP_KERNEL); 356 354 if (!priv) 357 355 return -ENOMEM;
+3 -1
drivers/clk/mmp/clk-of-mmp2.c
··· 78 78 #define MPMU_PLL_DIFF_CTRL 0x68 79 79 #define MPMU_PLL2_CTRL1 0x414 80 80 81 + #define NR_CLKS 200 82 + 81 83 enum mmp2_clk_model { 82 84 CLK_MODEL_MMP2, 83 85 CLK_MODEL_MMP3, ··· 545 543 546 544 mmp2_pm_domain_init(np, pxa_unit); 547 545 548 - mmp_clk_init(np, &pxa_unit->unit, MMP2_NR_CLKS); 546 + mmp_clk_init(np, &pxa_unit->unit, NR_CLKS); 549 547 550 548 mmp2_main_clk_init(pxa_unit); 551 549
-1
include/dt-bindings/clock/marvell,mmp2-audio.h
··· 6 6 #define MMP2_CLK_AUDIO_SSPA0 1 7 7 #define MMP2_CLK_AUDIO_SSPA1 2 8 8 9 - #define MMP2_CLK_AUDIO_NR_CLKS 3 10 9 #endif
-1
include/dt-bindings/clock/marvell,mmp2.h
··· 91 91 #define MMP3_CLK_SDH4 126 92 92 #define MMP2_CLK_AUDIO 127 93 93 94 - #define MMP2_NR_CLKS 200 95 94 #endif