|
24 | 24 | #define RK3328_GRF_SOC_STATUS0 0x480 |
25 | 25 | #define RK3328_GRF_MAC_CON1 0x904 |
26 | 26 | #define RK3328_GRF_MAC_CON2 0x908 |
| 27 | +#define RK3328_I2S_FRAC_MAX_PRATE 600000000 |
27 | 28 |
|
28 | 29 | enum rk3328_plls { |
29 | 30 | apll, dpll, cpll, gpll, npll, |
@@ -217,6 +218,7 @@ PNAME(mux_mac2phy_src_p) = { "clk_mac2phy_src", |
217 | 218 | "phy_50m_out" }; |
218 | 219 | PNAME(mux_mac2io_ext_p) = { "clk_mac2io", |
219 | 220 | "gmac_clkin" }; |
| 221 | +PNAME(mux_i2s_plls_p) = { "cpll", "dummy_gpll" }; |
220 | 222 |
|
221 | 223 | static struct rockchip_pll_clock rk3328_pll_clks[] __initdata = { |
222 | 224 | [apll] = PLL(pll_rk3328, PLL_APLL, "apll", mux_pll_p, |
@@ -375,36 +377,36 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { |
375 | 377 | RK3328_CLKGATE_CON(17), 13, GFLAGS), |
376 | 378 |
|
377 | 379 | /* PD_I2S */ |
378 | | - COMPOSITE(0, "clk_i2s0_div", mux_2plls_p, 0, |
| 380 | + COMPOSITE(0, "clk_i2s0_div", mux_i2s_plls_p, 0, |
379 | 381 | RK3328_CLKSEL_CON(6), 15, 1, MFLAGS, 0, 7, DFLAGS, |
380 | 382 | RK3328_CLKGATE_CON(1), 1, GFLAGS), |
381 | 383 | COMPOSITE_FRACMUX(0, "clk_i2s0_frac", "clk_i2s0_div", CLK_SET_RATE_PARENT, |
382 | 384 | RK3328_CLKSEL_CON(7), 0, |
383 | 385 | RK3328_CLKGATE_CON(1), 2, GFLAGS, |
384 | | - &rk3328_i2s0_fracmux, 0), |
| 386 | + &rk3328_i2s0_fracmux, RK3328_I2S_FRAC_MAX_PRATE), |
385 | 387 | GATE(SCLK_I2S0, "clk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT, |
386 | 388 | RK3328_CLKGATE_CON(1), 3, GFLAGS), |
387 | 389 |
|
388 | | - COMPOSITE(0, "clk_i2s1_div", mux_2plls_p, 0, |
| 390 | + COMPOSITE(0, "clk_i2s1_div", mux_i2s_plls_p, 0, |
389 | 391 | RK3328_CLKSEL_CON(8), 15, 1, MFLAGS, 0, 7, DFLAGS, |
390 | 392 | RK3328_CLKGATE_CON(1), 4, GFLAGS), |
391 | 393 | COMPOSITE_FRACMUX(0, "clk_i2s1_frac", "clk_i2s1_div", CLK_SET_RATE_PARENT, |
392 | 394 | RK3328_CLKSEL_CON(9), 0, |
393 | 395 | RK3328_CLKGATE_CON(1), 5, GFLAGS, |
394 | | - &rk3328_i2s1_fracmux, 0), |
| 396 | + &rk3328_i2s1_fracmux, RK3328_I2S_FRAC_MAX_PRATE), |
395 | 397 | GATE(SCLK_I2S1, "clk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT, |
396 | 398 | RK3328_CLKGATE_CON(1), 6, GFLAGS), |
397 | 399 | COMPOSITE_NODIV(SCLK_I2S1_OUT, "i2s1_out", mux_i2s1out_p, 0, |
398 | 400 | RK3328_CLKSEL_CON(8), 12, 1, MFLAGS, |
399 | 401 | RK3328_CLKGATE_CON(1), 7, GFLAGS), |
400 | 402 |
|
401 | | - COMPOSITE(0, "clk_i2s2_div", mux_2plls_p, 0, |
| 403 | + COMPOSITE(0, "clk_i2s2_div", mux_i2s_plls_p, 0, |
402 | 404 | RK3328_CLKSEL_CON(10), 15, 1, MFLAGS, 0, 7, DFLAGS, |
403 | 405 | RK3328_CLKGATE_CON(1), 8, GFLAGS), |
404 | 406 | COMPOSITE_FRACMUX(0, "clk_i2s2_frac", "clk_i2s2_div", CLK_SET_RATE_PARENT, |
405 | 407 | RK3328_CLKSEL_CON(11), 0, |
406 | 408 | RK3328_CLKGATE_CON(1), 9, GFLAGS, |
407 | | - &rk3328_i2s2_fracmux, 0), |
| 409 | + &rk3328_i2s2_fracmux, RK3328_I2S_FRAC_MAX_PRATE), |
408 | 410 | GATE(SCLK_I2S2, "clk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT, |
409 | 411 | RK3328_CLKGATE_CON(1), 10, GFLAGS), |
410 | 412 | COMPOSITE_NODIV(SCLK_I2S2_OUT, "i2s2_out", mux_i2s2out_p, 0, |
|
0 commit comments