| .. | .. |
|---|
| 2 | 2 | /* |
|---|
| 3 | 3 | * r8a77990 Clock Pulse Generator / Module Standby and Software Reset |
|---|
| 4 | 4 | * |
|---|
| 5 | | - * Copyright (C) 2018 Renesas Electronics Corp. |
|---|
| 5 | + * Copyright (C) 2018-2019 Renesas Electronics Corp. |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Based on r8a7795-cpg-mssr.c |
|---|
| 8 | 8 | * |
|---|
| .. | .. |
|---|
| 44 | 44 | CLK_S2, |
|---|
| 45 | 45 | CLK_S3, |
|---|
| 46 | 46 | CLK_SDSRC, |
|---|
| 47 | + CLK_RINT, |
|---|
| 48 | + CLK_OCO, |
|---|
| 47 | 49 | |
|---|
| 48 | 50 | /* Module Clocks */ |
|---|
| 49 | 51 | MOD_CLK_BASE |
|---|
| .. | .. |
|---|
| 72 | 74 | DEF_FIXED(".s3", CLK_S3, CLK_PLL1, 6, 1), |
|---|
| 73 | 75 | DEF_FIXED(".sdsrc", CLK_SDSRC, CLK_PLL1, 2, 1), |
|---|
| 74 | 76 | |
|---|
| 77 | + DEF_DIV6_RO(".r", CLK_RINT, CLK_EXTAL, CPG_RCKCR, 32), |
|---|
| 78 | + |
|---|
| 79 | + DEF_RATE(".oco", CLK_OCO, 8 * 1000 * 1000), |
|---|
| 80 | + |
|---|
| 75 | 81 | /* Core Clock Outputs */ |
|---|
| 76 | 82 | DEF_FIXED("za2", R8A77990_CLK_ZA2, CLK_PLL0D24, 1, 1), |
|---|
| 77 | 83 | DEF_FIXED("za8", R8A77990_CLK_ZA8, CLK_PLL0D8, 1, 1), |
|---|
| 84 | + DEF_GEN3_Z("z2", R8A77990_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL0, 4, 8), |
|---|
| 78 | 85 | DEF_FIXED("ztr", R8A77990_CLK_ZTR, CLK_PLL1, 6, 1), |
|---|
| 79 | 86 | DEF_FIXED("zt", R8A77990_CLK_ZT, CLK_PLL1, 4, 1), |
|---|
| 80 | 87 | DEF_FIXED("zx", R8A77990_CLK_ZX, CLK_PLL1, 3, 1), |
|---|
| .. | .. |
|---|
| 98 | 105 | DEF_GEN3_SD("sd3", R8A77990_CLK_SD3, CLK_SDSRC, 0x026c), |
|---|
| 99 | 106 | |
|---|
| 100 | 107 | DEF_FIXED("cl", R8A77990_CLK_CL, CLK_PLL1, 48, 1), |
|---|
| 108 | + DEF_FIXED("cr", R8A77990_CLK_CR, CLK_PLL1D2, 2, 1), |
|---|
| 101 | 109 | DEF_FIXED("cp", R8A77990_CLK_CP, CLK_EXTAL, 2, 1), |
|---|
| 102 | 110 | DEF_FIXED("cpex", R8A77990_CLK_CPEX, CLK_EXTAL, 4, 1), |
|---|
| 103 | | - DEF_FIXED("osc", R8A77990_CLK_OSC, CLK_EXTAL, 384, 1), |
|---|
| 104 | | - DEF_FIXED("r", R8A77990_CLK_R, CLK_EXTAL, 1536, 1), |
|---|
| 111 | + |
|---|
| 112 | + DEF_DIV6_RO("osc", R8A77990_CLK_OSC, CLK_EXTAL, CPG_RCKCR, 8), |
|---|
| 105 | 113 | |
|---|
| 106 | 114 | DEF_GEN3_PE("s0d6c", R8A77990_CLK_S0D6C, CLK_S0, 6, CLK_PE, 2), |
|---|
| 107 | 115 | DEF_GEN3_PE("s3d1c", R8A77990_CLK_S3D1C, CLK_S3, 1, CLK_PE, 1), |
|---|
| .. | .. |
|---|
| 111 | 119 | DEF_DIV6P1("canfd", R8A77990_CLK_CANFD, CLK_PLL0D6, 0x244), |
|---|
| 112 | 120 | DEF_DIV6P1("csi0", R8A77990_CLK_CSI0, CLK_PLL1D2, 0x00c), |
|---|
| 113 | 121 | DEF_DIV6P1("mso", R8A77990_CLK_MSO, CLK_PLL1D2, 0x014), |
|---|
| 122 | + |
|---|
| 123 | + DEF_GEN3_RCKSEL("r", R8A77990_CLK_R, CLK_RINT, 1, CLK_OCO, 61 * 4), |
|---|
| 114 | 124 | }; |
|---|
| 115 | 125 | |
|---|
| 116 | 126 | static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = { |
|---|
| .. | .. |
|---|
| 126 | 136 | DEF_MOD("sys-dmac2", 217, R8A77990_CLK_S3D1), |
|---|
| 127 | 137 | DEF_MOD("sys-dmac1", 218, R8A77990_CLK_S3D1), |
|---|
| 128 | 138 | DEF_MOD("sys-dmac0", 219, R8A77990_CLK_S3D1), |
|---|
| 139 | + DEF_MOD("sceg-pub", 229, R8A77990_CLK_CR), |
|---|
| 129 | 140 | |
|---|
| 130 | 141 | DEF_MOD("cmt3", 300, R8A77990_CLK_R), |
|---|
| 131 | 142 | DEF_MOD("cmt2", 301, R8A77990_CLK_R), |
|---|
| .. | .. |
|---|
| 144 | 155 | DEF_MOD("intc-ex", 407, R8A77990_CLK_CP), |
|---|
| 145 | 156 | DEF_MOD("intc-ap", 408, R8A77990_CLK_S0D3), |
|---|
| 146 | 157 | |
|---|
| 147 | | - DEF_MOD("audmac0", 502, R8A77990_CLK_S3D4), |
|---|
| 148 | | - DEF_MOD("drif7", 508, R8A77990_CLK_S3D2), |
|---|
| 149 | | - DEF_MOD("drif6", 509, R8A77990_CLK_S3D2), |
|---|
| 150 | | - DEF_MOD("drif5", 510, R8A77990_CLK_S3D2), |
|---|
| 151 | | - DEF_MOD("drif4", 511, R8A77990_CLK_S3D2), |
|---|
| 152 | | - DEF_MOD("drif3", 512, R8A77990_CLK_S3D2), |
|---|
| 153 | | - DEF_MOD("drif2", 513, R8A77990_CLK_S3D2), |
|---|
| 154 | | - DEF_MOD("drif1", 514, R8A77990_CLK_S3D2), |
|---|
| 155 | | - DEF_MOD("drif0", 515, R8A77990_CLK_S3D2), |
|---|
| 158 | + DEF_MOD("audmac0", 502, R8A77990_CLK_S1D2), |
|---|
| 159 | + DEF_MOD("drif31", 508, R8A77990_CLK_S3D2), |
|---|
| 160 | + DEF_MOD("drif30", 509, R8A77990_CLK_S3D2), |
|---|
| 161 | + DEF_MOD("drif21", 510, R8A77990_CLK_S3D2), |
|---|
| 162 | + DEF_MOD("drif20", 511, R8A77990_CLK_S3D2), |
|---|
| 163 | + DEF_MOD("drif11", 512, R8A77990_CLK_S3D2), |
|---|
| 164 | + DEF_MOD("drif10", 513, R8A77990_CLK_S3D2), |
|---|
| 165 | + DEF_MOD("drif01", 514, R8A77990_CLK_S3D2), |
|---|
| 166 | + DEF_MOD("drif00", 515, R8A77990_CLK_S3D2), |
|---|
| 156 | 167 | DEF_MOD("hscif4", 516, R8A77990_CLK_S3D1C), |
|---|
| 157 | 168 | DEF_MOD("hscif3", 517, R8A77990_CLK_S3D1C), |
|---|
| 158 | 169 | DEF_MOD("hscif2", 518, R8A77990_CLK_S3D1C), |
|---|
| .. | .. |
|---|
| 172 | 183 | DEF_MOD("vspb", 626, R8A77990_CLK_S0D1), |
|---|
| 173 | 184 | DEF_MOD("vspi0", 631, R8A77990_CLK_S0D1), |
|---|
| 174 | 185 | |
|---|
| 175 | | - DEF_MOD("ehci0", 703, R8A77990_CLK_S3D4), |
|---|
| 176 | | - DEF_MOD("hsusb", 704, R8A77990_CLK_S3D4), |
|---|
| 186 | + DEF_MOD("ehci0", 703, R8A77990_CLK_S3D2), |
|---|
| 187 | + DEF_MOD("hsusb", 704, R8A77990_CLK_S3D2), |
|---|
| 188 | + DEF_MOD("cmm1", 710, R8A77990_CLK_S1D1), |
|---|
| 189 | + DEF_MOD("cmm0", 711, R8A77990_CLK_S1D1), |
|---|
| 177 | 190 | DEF_MOD("csi40", 716, R8A77990_CLK_CSI0), |
|---|
| 178 | 191 | DEF_MOD("du1", 723, R8A77990_CLK_S1D1), |
|---|
| 179 | 192 | DEF_MOD("du0", 724, R8A77990_CLK_S1D1), |
|---|
| .. | .. |
|---|
| 202 | 215 | DEF_MOD("i2c1", 930, R8A77990_CLK_S3D2), |
|---|
| 203 | 216 | DEF_MOD("i2c0", 931, R8A77990_CLK_S3D2), |
|---|
| 204 | 217 | |
|---|
| 218 | + DEF_MOD("i2c7", 1003, R8A77990_CLK_S3D2), |
|---|
| 205 | 219 | DEF_MOD("ssi-all", 1005, R8A77990_CLK_S3D4), |
|---|
| 206 | 220 | DEF_MOD("ssi9", 1006, MOD_CLK_ID(1005)), |
|---|
| 207 | 221 | DEF_MOD("ssi8", 1007, MOD_CLK_ID(1005)), |
|---|
| .. | .. |
|---|
| 231 | 245 | }; |
|---|
| 232 | 246 | |
|---|
| 233 | 247 | static const unsigned int r8a77990_crit_mod_clks[] __initconst = { |
|---|
| 248 | + MOD_CLK_ID(402), /* RWDT */ |
|---|
| 234 | 249 | MOD_CLK_ID(408), /* INTC-AP (GIC) */ |
|---|
| 235 | 250 | }; |
|---|
| 236 | 251 | |
|---|
| .. | .. |
|---|
| 241 | 256 | /* |
|---|
| 242 | 257 | * MD19 EXTAL (MHz) PLL0 PLL1 PLL3 |
|---|
| 243 | 258 | *-------------------------------------------------------------------- |
|---|
| 244 | | - * 0 48 x 1 x100/4 x100/3 x100/3 |
|---|
| 245 | | - * 1 48 x 1 x100/4 x100/3 x58/3 |
|---|
| 259 | + * 0 48 x 1 x100/1 x100/3 x100/3 |
|---|
| 260 | + * 1 48 x 1 x100/1 x100/3 x58/3 |
|---|
| 246 | 261 | */ |
|---|
| 247 | 262 | #define CPG_PLL_CONFIG_INDEX(md) (((md) & BIT(19)) >> 19) |
|---|
| 248 | 263 | |
|---|