Add MSTP clock definitions and fix aliases for the two MMCIF and four SDHI interfaces on r8a7790 (H2).
Unified · Split
| @@ -182,7 +182,7 @@ static struct clk div6_clks[DIV6_NR] = { · 181 unmodified lines | ||
| 182 | 182 | enum { |
| 183 | 183 | MSTP721, MSTP720, |
| 184 | 184 | MSTP717, MSTP716, |
| 185 | − MSTP304, | |
| 185 | + MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304, | |
| 186 | 186 | MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, |
| 187 | 187 | MSTP_NR |
| 188 | 188 | }; |
| @@ -190,6 +190,12 @@ enum { · 1 unmodified line | ||
| 190 | 190 | static struct clk mstp_clks[MSTP_NR] = { |
| 191 | 191 | [MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */ |
| 192 | 192 | [MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */ |
| 193 | + [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */ | |
| 194 | + [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */ | |
| 195 | + [MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */ | |
| 196 | + [MSTP312] = SH_CLK_MSTP32(&div6_clks[DIV6_SD2], SMSTPCR3, 12, 0), /* SDHI2 */ | |
| 197 | + [MSTP311] = SH_CLK_MSTP32(&div6_clks[DIV6_SD3], SMSTPCR3, 11, 0), /* SDHI3 */ | |
| 198 | + [MSTP305] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC1], SMSTPCR3, 5, 0), /* MMC1 */ | |
| 193 | 199 | [MSTP304] = SH_CLK_MSTP32(&cp_clk, SMSTPCR3, 4, 0), /* TPU0 */ |
| 194 | 200 | [MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */ |
| 195 | 201 | [MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */ |
| @@ -232,14 +238,8 @@ static struct clk_lookup lookups[] = { · 36 unmodified lines | ||
| 232 | 238 | |
| 233 | 239 | /* DIV4 */ |
| 234 | 240 | CLKDEV_CON_ID("sdh", &div4_clks[DIV4_SDH]), |
| 235 | − CLKDEV_CON_ID("sd0", &div4_clks[DIV4_SD0]), | |
| 236 | − CLKDEV_CON_ID("sd1", &div4_clks[DIV4_SD1]), | |
| 237 | 241 | |
| 238 | 242 | /* DIV6 */ |
| 239 | − CLKDEV_CON_ID("sd2", &div6_clks[DIV6_SD2]), | |
| 240 | − CLKDEV_CON_ID("sd3", &div6_clks[DIV6_SD3]), | |
| 241 | − CLKDEV_CON_ID("mmc0", &div6_clks[DIV6_MMC0]), | |
| 242 | − CLKDEV_CON_ID("mmc1", &div6_clks[DIV6_MMC1]), | |
| 243 | 243 | CLKDEV_CON_ID("ssp", &div6_clks[DIV6_SSP]), |
| 244 | 244 | CLKDEV_CON_ID("ssprs", &div6_clks[DIV6_SSPRS]), |
| 245 | 245 | |
| @@ -254,6 +254,18 @@ static struct clk_lookup lookups[] = { · 8 unmodified lines | ||
| 254 | 254 | CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]), |
| 255 | 255 | CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]), |
| 256 | 256 | CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]), |
| 257 | + CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]), | |
| 258 | + CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]), | |
| 259 | + CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]), | |
| 260 | + CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), | |
| 261 | + CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]), | |
| 262 | + CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), | |
| 263 | + CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]), | |
| 264 | + CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]), | |
| 265 | + CLKDEV_DEV_ID("ee160000.sdhi", &mstp_clks[MSTP311]), | |
| 266 | + CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]), | |
| 267 | + CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]), | |
| 268 | + CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]), | |
| 257 | 269 | }; |
| 258 | 270 | |
| 259 | 271 | #define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31) \ |