Skip to content

Commit 3e8008f

Browse files
claudiubezneageertu
authored andcommitted
clk: renesas: rzg2l: Remove CPG_SDHI_DSEL from generic header
Remove CPG_SDHI_DSEL and its bits from the generic header as RZ/G3S has different offset registers and bits for this, thus avoid mixing them. Signed-off-by: Claudiu Beznea <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent 97c1c4c commit 3e8008f

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

drivers/clk/renesas/r9a07g043-cpg.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414

1515
#include "rzg2l-cpg.h"
1616

17+
/* Specific registers. */
18+
#define CPG_PL2SDHI_DSEL (0x218)
19+
20+
/* Clock select configuration. */
21+
#define SEL_SDHI0 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 0, 2)
22+
#define SEL_SDHI1 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 4, 2)
23+
1724
enum clk_ids {
1825
/* Core Clock Outputs exported to DT */
1926
LAST_DT_CORE_CLK = R9A07G043_CLK_P0_DIV2,

drivers/clk/renesas/r9a07g044-cpg.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515

1616
#include "rzg2l-cpg.h"
1717

18+
/* Specific registers. */
19+
#define CPG_PL2SDHI_DSEL (0x218)
20+
21+
/* Clock select configuration. */
22+
#define SEL_SDHI0 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 0, 2)
23+
#define SEL_SDHI1 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 4, 2)
24+
1825
enum clk_ids {
1926
/* Core Clock Outputs exported to DT */
2027
LAST_DT_CORE_CLK = R9A07G054_CLK_DRP_A,

drivers/clk/renesas/rzg2l-cpg.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#define CPG_PL2_DDIV (0x204)
2020
#define CPG_PL3A_DDIV (0x208)
2121
#define CPG_PL6_DDIV (0x210)
22-
#define CPG_PL2SDHI_DSEL (0x218)
2322
#define CPG_CLKSTATUS (0x280)
2423
#define CPG_PL3_SSEL (0x408)
2524
#define CPG_PL6_SSEL (0x414)
@@ -69,9 +68,6 @@
6968
#define SEL_PLL6_2 SEL_PLL_PACK(CPG_PL6_ETH_SSEL, 0, 1)
7069
#define SEL_GPU2 SEL_PLL_PACK(CPG_PL6_SSEL, 12, 1)
7170

72-
#define SEL_SDHI0 DDIV_PACK(CPG_PL2SDHI_DSEL, 0, 2)
73-
#define SEL_SDHI1 DDIV_PACK(CPG_PL2SDHI_DSEL, 4, 2)
74-
7571
#define EXTAL_FREQ_IN_MEGA_HZ (24)
7672

7773
/**

0 commit comments

Comments
 (0)