Skip to content

Commit b5788b9

Browse files
committed
clk: renesas: r9a09g05[67]: Reduce differences
The clock drivers for RZ/V2H and RZ/V2N are very similar. Reduce the differences between them by: - Moving and reformatting the PLLCM33_GEAR clock definitions, - Replacing spaces by TABs. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://patch.msgid.link/2246d2263e8a24d1aaf653db2004cbf2263c9048.1757606097.git.geert+renesas@glider.be
1 parent 82e0aa9 commit b5788b9

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

drivers/clk/renesas/r9a09g056-cpg.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ enum clk_ids {
3636
CLK_PLLCM33_DIV4,
3737
CLK_PLLCM33_DIV5,
3838
CLK_PLLCM33_DIV16,
39+
CLK_PLLCM33_GEAR,
3940
CLK_SMUX2_XSPI_CLK0,
4041
CLK_SMUX2_XSPI_CLK1,
4142
CLK_PLLCM33_XSPI,
42-
CLK_PLLCM33_GEAR,
4343
CLK_PLLCLN_DIV2,
4444
CLK_PLLCLN_DIV8,
4545
CLK_PLLCLN_DIV16,
@@ -120,11 +120,11 @@ static const struct cpg_core_clk r9a09g056_core_clks[] __initconst = {
120120
DEF_FIXED(".pllcm33_div4", CLK_PLLCM33_DIV4, CLK_PLLCM33, 1, 4),
121121
DEF_FIXED(".pllcm33_div5", CLK_PLLCM33_DIV5, CLK_PLLCM33, 1, 5),
122122
DEF_FIXED(".pllcm33_div16", CLK_PLLCM33_DIV16, CLK_PLLCM33, 1, 16),
123+
DEF_DDIV(".pllcm33_gear", CLK_PLLCM33_GEAR, CLK_PLLCM33_DIV4, CDDIV0_DIVCTL1, dtable_2_64),
123124
DEF_SMUX(".smux2_xspi_clk0", CLK_SMUX2_XSPI_CLK0, SSEL1_SELCTL2, smux2_xspi_clk0),
124125
DEF_SMUX(".smux2_xspi_clk1", CLK_SMUX2_XSPI_CLK1, SSEL1_SELCTL3, smux2_xspi_clk1),
125126
DEF_CSDIV(".pllcm33_xspi", CLK_PLLCM33_XSPI, CLK_SMUX2_XSPI_CLK1, CSDIV0_DIVCTL3,
126127
dtable_2_16),
127-
DEF_DDIV(".pllcm33_gear", CLK_PLLCM33_GEAR, CLK_PLLCM33_DIV4, CDDIV0_DIVCTL1, dtable_2_64),
128128

129129
DEF_FIXED(".pllcln_div2", CLK_PLLCLN_DIV2, CLK_PLLCLN, 1, 2),
130130
DEF_FIXED(".pllcln_div8", CLK_PLLCLN_DIV8, CLK_PLLCLN, 1, 8),
@@ -325,8 +325,8 @@ static const struct rzv2h_reset r9a09g056_resets[] __initconst = {
325325
DEF_RST(9, 14, 4, 15), /* RIIC_6_MRST */
326326
DEF_RST(9, 15, 4, 16), /* RIIC_7_MRST */
327327
DEF_RST(10, 0, 4, 17), /* RIIC_8_MRST */
328-
DEF_RST(10, 3, 4, 20), /* SPI_HRESETN */
329-
DEF_RST(10, 4, 4, 21), /* SPI_ARESETN */
328+
DEF_RST(10, 3, 4, 20), /* SPI_HRESETN */
329+
DEF_RST(10, 4, 4, 21), /* SPI_ARESETN */
330330
DEF_RST(10, 7, 4, 24), /* SDHI_0_IXRST */
331331
DEF_RST(10, 8, 4, 25), /* SDHI_1_IXRST */
332332
DEF_RST(10, 9, 4, 26), /* SDHI_2_IXRST */

drivers/clk/renesas/r9a09g057-cpg.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,8 @@ static const struct cpg_core_clk r9a09g057_core_clks[] __initconst = {
134134
DEF_FIXED(".pllcm33_div3", CLK_PLLCM33_DIV3, CLK_PLLCM33, 1, 3),
135135
DEF_FIXED(".pllcm33_div4", CLK_PLLCM33_DIV4, CLK_PLLCM33, 1, 4),
136136
DEF_FIXED(".pllcm33_div5", CLK_PLLCM33_DIV5, CLK_PLLCM33, 1, 5),
137-
DEF_DDIV(".pllcm33_gear", CLK_PLLCM33_GEAR,
138-
CLK_PLLCM33_DIV4, CDDIV0_DIVCTL1, dtable_2_64),
139137
DEF_FIXED(".pllcm33_div16", CLK_PLLCM33_DIV16, CLK_PLLCM33, 1, 16),
138+
DEF_DDIV(".pllcm33_gear", CLK_PLLCM33_GEAR, CLK_PLLCM33_DIV4, CDDIV0_DIVCTL1, dtable_2_64),
140139
DEF_SMUX(".smux2_xspi_clk0", CLK_SMUX2_XSPI_CLK0, SSEL1_SELCTL2, smux2_xspi_clk0),
141140
DEF_SMUX(".smux2_xspi_clk1", CLK_SMUX2_XSPI_CLK1, SSEL1_SELCTL3, smux2_xspi_clk1),
142141
DEF_CSDIV(".pllcm33_xspi", CLK_PLLCM33_XSPI, CLK_SMUX2_XSPI_CLK1, CSDIV0_DIVCTL3,

0 commit comments

Comments
 (0)