Skip to content

Commit 6e26901

Browse files
committed
clk: renesas: rcar-gen3: Add CCREE clocks
Add the CryptoCell module clocks and their parents for the CryptoCell instances in the various Renesas R-Car Gen3 SoCs that do not have support for them yet in their clock drivers (M3-W/W+, M3-N, E3, D3). The R-Car H3 clock driver already supports these clocks. Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent bb6d3fb commit 6e26901

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

drivers/clk/renesas/r8a7796-cpg-mssr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {
105105
DEF_GEN3_SD("sd3", R8A7796_CLK_SD3, CLK_SDSRC, 0x26c),
106106

107107
DEF_FIXED("cl", R8A7796_CLK_CL, CLK_PLL1_DIV2, 48, 1),
108+
DEF_FIXED("cr", R8A7796_CLK_CR, CLK_PLL1_DIV4, 2, 1),
108109
DEF_FIXED("cp", R8A7796_CLK_CP, CLK_EXTAL, 2, 1),
109110
DEF_FIXED("cpex", R8A7796_CLK_CPEX, CLK_EXTAL, 2, 1),
110111

@@ -132,6 +133,7 @@ static struct mssr_mod_clk r8a7796_mod_clks[] __initdata = {
132133
DEF_MOD("sys-dmac2", 217, R8A7796_CLK_S3D1),
133134
DEF_MOD("sys-dmac1", 218, R8A7796_CLK_S3D1),
134135
DEF_MOD("sys-dmac0", 219, R8A7796_CLK_S0D3),
136+
DEF_MOD("sceg-pub", 229, R8A7796_CLK_CR),
135137
DEF_MOD("cmt3", 300, R8A7796_CLK_R),
136138
DEF_MOD("cmt2", 301, R8A7796_CLK_R),
137139
DEF_MOD("cmt1", 302, R8A7796_CLK_R),

drivers/clk/renesas/r8a77965-cpg-mssr.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ static const struct cpg_core_clk r8a77965_core_clks[] __initconst = {
9999
DEF_GEN3_SD("sd2", R8A77965_CLK_SD2, CLK_SDSRC, 0x268),
100100
DEF_GEN3_SD("sd3", R8A77965_CLK_SD3, CLK_SDSRC, 0x26c),
101101

102-
DEF_FIXED("cl", R8A77965_CLK_CL, CLK_PLL1_DIV2, 48, 1),
102+
DEF_FIXED("cl", R8A77965_CLK_CL, CLK_PLL1_DIV2, 48, 1),
103+
DEF_FIXED("cr", R8A77965_CLK_CR, CLK_PLL1_DIV4, 2, 1),
103104
DEF_FIXED("cp", R8A77965_CLK_CP, CLK_EXTAL, 2, 1),
104105
DEF_FIXED("cpex", R8A77965_CLK_CPEX, CLK_EXTAL, 2, 1),
105106

@@ -127,6 +128,7 @@ static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = {
127128
DEF_MOD("sys-dmac2", 217, R8A77965_CLK_S3D1),
128129
DEF_MOD("sys-dmac1", 218, R8A77965_CLK_S3D1),
129130
DEF_MOD("sys-dmac0", 219, R8A77965_CLK_S0D3),
131+
DEF_MOD("sceg-pub", 229, R8A77965_CLK_CR),
130132

131133
DEF_MOD("cmt3", 300, R8A77965_CLK_R),
132134
DEF_MOD("cmt2", 301, R8A77965_CLK_R),

drivers/clk/renesas/r8a77990-cpg-mssr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ static const struct cpg_core_clk r8a77990_core_clks[] __initconst = {
105105
DEF_GEN3_SD("sd3", R8A77990_CLK_SD3, CLK_SDSRC, 0x026c),
106106

107107
DEF_FIXED("cl", R8A77990_CLK_CL, CLK_PLL1, 48, 1),
108+
DEF_FIXED("cr", R8A77990_CLK_CR, CLK_PLL1D2, 2, 1),
108109
DEF_FIXED("cp", R8A77990_CLK_CP, CLK_EXTAL, 2, 1),
109110
DEF_FIXED("cpex", R8A77990_CLK_CPEX, CLK_EXTAL, 4, 1),
110111

@@ -135,6 +136,7 @@ static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = {
135136
DEF_MOD("sys-dmac2", 217, R8A77990_CLK_S3D1),
136137
DEF_MOD("sys-dmac1", 218, R8A77990_CLK_S3D1),
137138
DEF_MOD("sys-dmac0", 219, R8A77990_CLK_S3D1),
139+
DEF_MOD("sceg-pub", 229, R8A77990_CLK_CR),
138140

139141
DEF_MOD("cmt3", 300, R8A77990_CLK_R),
140142
DEF_MOD("cmt2", 301, R8A77990_CLK_R),

drivers/clk/renesas/r8a77995-cpg-mssr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ static const struct cpg_core_clk r8a77995_core_clks[] __initconst = {
9191
DEF_FIXED("s3d4", R8A77995_CLK_S3D4, CLK_S3, 4, 1),
9292

9393
DEF_FIXED("cl", R8A77995_CLK_CL, CLK_PLL1, 48, 1),
94+
DEF_FIXED("cr", R8A77995_CLK_CR, CLK_PLL1D2, 2, 1),
9495
DEF_FIXED("cp", R8A77995_CLK_CP, CLK_EXTAL, 2, 1),
9596
DEF_FIXED("cpex", R8A77995_CLK_CPEX, CLK_EXTAL, 4, 1),
9697

@@ -122,6 +123,7 @@ static const struct mssr_mod_clk r8a77995_mod_clks[] __initconst = {
122123
DEF_MOD("sys-dmac2", 217, R8A77995_CLK_S3D1),
123124
DEF_MOD("sys-dmac1", 218, R8A77995_CLK_S3D1),
124125
DEF_MOD("sys-dmac0", 219, R8A77995_CLK_S3D1),
126+
DEF_MOD("sceg-pub", 229, R8A77995_CLK_CR),
125127
DEF_MOD("cmt3", 300, R8A77995_CLK_R),
126128
DEF_MOD("cmt2", 301, R8A77995_CLK_R),
127129
DEF_MOD("cmt1", 302, R8A77995_CLK_R),

0 commit comments

Comments
 (0)