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

clk: renesas: r9a08g045: Add clock and reset support for SDHI1 and SDHI2

Add clock and reset support for the SDHI1 and SDHI2 blocks on the
RZ/G3S (R9A08G045) SoC.

Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20231010132701.1658737-3-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

authored by

Claudiu Beznea and committed by
Geert Uytterhoeven
4bce4bed fd627207

+34
+34
drivers/clk/renesas/r9a08g045-cpg.c
··· 25 25 /* RZ/G3S Specific division configuration. */ 26 26 #define G3S_DIVPL2B DDIV_PACK(G3S_CPG_PL2_DDIV, 4, 3) 27 27 #define G3S_DIV_SDHI0 DDIV_PACK(G3S_CPG_SDHI_DDIV, 0, 1) 28 + #define G3S_DIV_SDHI1 DDIV_PACK(G3S_CPG_SDHI_DDIV, 4, 1) 29 + #define G3S_DIV_SDHI2 DDIV_PACK(G3S_CPG_SDHI_DDIV, 8, 1) 28 30 29 31 /* RZ/G3S Clock status configuration. */ 30 32 #define G3S_DIVPL1A_STS DDIV_PACK(G3S_CLKDIVSTATUS, 0, 1) ··· 35 33 #define G3S_DIVPL3B_STS DDIV_PACK(G3S_CLKDIVSTATUS, 9, 1) 36 34 #define G3S_DIVPL3C_STS DDIV_PACK(G3S_CLKDIVSTATUS, 10, 1) 37 35 #define G3S_DIV_SDHI0_STS DDIV_PACK(G3S_CLKDIVSTATUS, 24, 1) 36 + #define G3S_DIV_SDHI1_STS DDIV_PACK(G3S_CLKDIVSTATUS, 25, 1) 37 + #define G3S_DIV_SDHI2_STS DDIV_PACK(G3S_CLKDIVSTATUS, 26, 1) 38 38 39 39 #define G3S_SEL_PLL4_STS SEL_PLL_PACK(G3S_CLKSELSTATUS, 6, 1) 40 40 #define G3S_SEL_SDHI0_STS SEL_PLL_PACK(G3S_CLKSELSTATUS, 16, 1) 41 + #define G3S_SEL_SDHI1_STS SEL_PLL_PACK(G3S_CLKSELSTATUS, 17, 1) 42 + #define G3S_SEL_SDHI2_STS SEL_PLL_PACK(G3S_CLKSELSTATUS, 18, 1) 41 43 42 44 /* RZ/G3S Specific clocks select. */ 43 45 #define G3S_SEL_PLL4 SEL_PLL_PACK(G3S_CPG_PLL_DSEL, 6, 1) 44 46 #define G3S_SEL_SDHI0 SEL_PLL_PACK(G3S_CPG_SDHI_DSEL, 0, 2) 47 + #define G3S_SEL_SDHI1 SEL_PLL_PACK(G3S_CPG_SDHI_DSEL, 4, 2) 48 + #define G3S_SEL_SDHI2 SEL_PLL_PACK(G3S_CPG_SDHI_DSEL, 8, 2) 45 49 46 50 /* PLL 1/4/6 configuration registers macro. */ 47 51 #define G3S_PLL146_CONF(clk1, clk2) ((clk1) << 22 | (clk2) << 12) ··· 82 74 CLK_PLL6, 83 75 CLK_PLL6_DIV2, 84 76 CLK_SEL_SDHI0, 77 + CLK_SEL_SDHI1, 78 + CLK_SEL_SDHI2, 85 79 CLK_SEL_PLL4, 86 80 CLK_P1_DIV2, 87 81 CLK_P3_DIV2, 88 82 CLK_SD0_DIV4, 83 + CLK_SD1_DIV4, 84 + CLK_SD2_DIV4, 89 85 90 86 /* Module Clocks */ 91 87 MOD_CLK_BASE, ··· 148 136 DEF_FIXED(".pll6_div2", CLK_PLL6_DIV2, CLK_PLL6, 1, 2), 149 137 DEF_SD_MUX(".sel_sd0", CLK_SEL_SDHI0, G3S_SEL_SDHI0, G3S_SEL_SDHI0_STS, sel_sdhi, 150 138 mtable_sd, 0, NULL), 139 + DEF_SD_MUX(".sel_sd1", CLK_SEL_SDHI1, G3S_SEL_SDHI1, G3S_SEL_SDHI1_STS, sel_sdhi, 140 + mtable_sd, 0, NULL), 141 + DEF_SD_MUX(".sel_sd2", CLK_SEL_SDHI2, G3S_SEL_SDHI2, G3S_SEL_SDHI2_STS, sel_sdhi, 142 + mtable_sd, 0, NULL), 151 143 DEF_SD_MUX(".sel_pll4", CLK_SEL_PLL4, G3S_SEL_PLL4, G3S_SEL_PLL4_STS, sel_pll4, 152 144 mtable_pll4, CLK_SET_PARENT_GATE, NULL), 153 145 ··· 163 147 DEF_G3S_DIV("SD0", R9A08G045_CLK_SD0, CLK_SEL_SDHI0, G3S_DIV_SDHI0, G3S_DIV_SDHI0_STS, 164 148 dtable_1_2, 800000000UL, 500000000UL, CLK_SET_RATE_PARENT, 165 149 rzg3s_cpg_div_clk_notifier), 150 + DEF_G3S_DIV("SD1", R9A08G045_CLK_SD1, CLK_SEL_SDHI1, G3S_DIV_SDHI1, G3S_DIV_SDHI1_STS, 151 + dtable_1_2, 800000000UL, 500000000UL, CLK_SET_RATE_PARENT, 152 + rzg3s_cpg_div_clk_notifier), 153 + DEF_G3S_DIV("SD2", R9A08G045_CLK_SD2, CLK_SEL_SDHI2, G3S_DIV_SDHI2, G3S_DIV_SDHI2_STS, 154 + dtable_1_2, 800000000UL, 500000000UL, CLK_SET_RATE_PARENT, 155 + rzg3s_cpg_div_clk_notifier), 166 156 DEF_FIXED(".sd0_div4", CLK_SD0_DIV4, R9A08G045_CLK_SD0, 1, 4), 157 + DEF_FIXED(".sd1_div4", CLK_SD1_DIV4, R9A08G045_CLK_SD1, 1, 4), 158 + DEF_FIXED(".sd2_div4", CLK_SD2_DIV4, R9A08G045_CLK_SD2, 1, 4), 167 159 DEF_FIXED("M0", R9A08G045_CLK_M0, CLK_PLL3_DIV2_4, 1, 1), 168 160 DEF_G3S_DIV("P1", R9A08G045_CLK_P1, CLK_PLL3_DIV2_4, DIVPL3A, G3S_DIVPL3A_STS, 169 161 dtable_1_32, 0, 0, 0, NULL), ··· 194 170 DEF_MOD("sdhi0_imclk2", R9A08G045_SDHI0_IMCLK2, CLK_SD0_DIV4, 0x554, 1), 195 171 DEF_MOD("sdhi0_clk_hs", R9A08G045_SDHI0_CLK_HS, R9A08G045_CLK_SD0, 0x554, 2), 196 172 DEF_MOD("sdhi0_aclk", R9A08G045_SDHI0_ACLK, R9A08G045_CLK_P1, 0x554, 3), 173 + DEF_MOD("sdhi1_imclk", R9A08G045_SDHI1_IMCLK, CLK_SD1_DIV4, 0x554, 4), 174 + DEF_MOD("sdhi1_imclk2", R9A08G045_SDHI1_IMCLK2, CLK_SD1_DIV4, 0x554, 5), 175 + DEF_MOD("sdhi1_clk_hs", R9A08G045_SDHI1_CLK_HS, R9A08G045_CLK_SD1, 0x554, 6), 176 + DEF_MOD("sdhi1_aclk", R9A08G045_SDHI1_ACLK, R9A08G045_CLK_P1, 0x554, 7), 177 + DEF_MOD("sdhi2_imclk", R9A08G045_SDHI2_IMCLK, CLK_SD2_DIV4, 0x554, 8), 178 + DEF_MOD("sdhi2_imclk2", R9A08G045_SDHI2_IMCLK2, CLK_SD2_DIV4, 0x554, 9), 179 + DEF_MOD("sdhi2_clk_hs", R9A08G045_SDHI2_CLK_HS, R9A08G045_CLK_SD2, 0x554, 10), 180 + DEF_MOD("sdhi2_aclk", R9A08G045_SDHI2_ACLK, R9A08G045_CLK_P1, 0x554, 11), 197 181 DEF_MOD("scif0_clk_pck", R9A08G045_SCIF0_CLK_PCK, R9A08G045_CLK_P0, 0x584, 0), 198 182 DEF_MOD("gpio_hclk", R9A08G045_GPIO_HCLK, R9A08G045_OSCCLK, 0x598, 0), 199 183 }; ··· 210 178 DEF_RST(R9A08G045_GIC600_GICRESET_N, 0x814, 0), 211 179 DEF_RST(R9A08G045_GIC600_DBG_GICRESET_N, 0x814, 1), 212 180 DEF_RST(R9A08G045_SDHI0_IXRST, 0x854, 0), 181 + DEF_RST(R9A08G045_SDHI1_IXRST, 0x854, 1), 182 + DEF_RST(R9A08G045_SDHI2_IXRST, 0x854, 2), 213 183 DEF_RST(R9A08G045_SCIF0_RST_SYSTEM_N, 0x884, 0), 214 184 DEF_RST(R9A08G045_GPIO_RSTN, 0x898, 0), 215 185 DEF_RST(R9A08G045_GPIO_PORT_RESETN, 0x898, 1),