diff options
author | Doug Anderson <dianders@chromium.org> | 2014-12-04 16:33:05 -0500 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2014-12-21 08:15:26 -0500 |
commit | 221dfbae2b33868267d979a113079678dcd4dab3 (patch) | |
tree | b7212cc740653ce2342edc3e1390e30727f7b4d1 /drivers/clk/rockchip/clk-rk3288.c | |
parent | 97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff) |
clk: rockchip: Add CLK_SET_RATE_PARENT to sclk_uart clocks
We'd like to be able to set the clock rate of the sclk_uart clocks and
actually be able to achieve clock rates greater than 24MHz. To do
this we need to be able to pass rate changes upward.
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'drivers/clk/rockchip/clk-rk3288.c')
-rw-r--r-- | drivers/clk/rockchip/clk-rk3288.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index ac6be7c0132d..1b48f35d1247 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c | |||
@@ -535,44 +535,44 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { | |||
535 | COMPOSITE(0, "uart0_src", mux_pll_src_cpll_gll_usb_npll_p, 0, | 535 | COMPOSITE(0, "uart0_src", mux_pll_src_cpll_gll_usb_npll_p, 0, |
536 | RK3288_CLKSEL_CON(13), 13, 2, MFLAGS, 0, 7, DFLAGS, | 536 | RK3288_CLKSEL_CON(13), 13, 2, MFLAGS, 0, 7, DFLAGS, |
537 | RK3288_CLKGATE_CON(1), 8, GFLAGS), | 537 | RK3288_CLKGATE_CON(1), 8, GFLAGS), |
538 | COMPOSITE_FRAC(0, "uart0_frac", "uart0_src", 0, | 538 | COMPOSITE_FRAC(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT, |
539 | RK3288_CLKSEL_CON(17), 0, | 539 | RK3288_CLKSEL_CON(17), 0, |
540 | RK3288_CLKGATE_CON(1), 9, GFLAGS), | 540 | RK3288_CLKGATE_CON(1), 9, GFLAGS), |
541 | MUX(SCLK_UART0, "sclk_uart0", mux_uart0_p, 0, | 541 | MUX(SCLK_UART0, "sclk_uart0", mux_uart0_p, CLK_SET_RATE_PARENT, |
542 | RK3288_CLKSEL_CON(13), 8, 2, MFLAGS), | 542 | RK3288_CLKSEL_CON(13), 8, 2, MFLAGS), |
543 | MUX(0, "uart_src", mux_pll_src_cpll_gpll_p, 0, | 543 | MUX(0, "uart_src", mux_pll_src_cpll_gpll_p, 0, |
544 | RK3288_CLKSEL_CON(13), 15, 1, MFLAGS), | 544 | RK3288_CLKSEL_CON(13), 15, 1, MFLAGS), |
545 | COMPOSITE_NOMUX(0, "uart1_src", "uart_src", 0, | 545 | COMPOSITE_NOMUX(0, "uart1_src", "uart_src", 0, |
546 | RK3288_CLKSEL_CON(14), 0, 7, DFLAGS, | 546 | RK3288_CLKSEL_CON(14), 0, 7, DFLAGS, |
547 | RK3288_CLKGATE_CON(1), 10, GFLAGS), | 547 | RK3288_CLKGATE_CON(1), 10, GFLAGS), |
548 | COMPOSITE_FRAC(0, "uart1_frac", "uart1_src", 0, | 548 | COMPOSITE_FRAC(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT, |
549 | RK3288_CLKSEL_CON(18), 0, | 549 | RK3288_CLKSEL_CON(18), 0, |
550 | RK3288_CLKGATE_CON(1), 11, GFLAGS), | 550 | RK3288_CLKGATE_CON(1), 11, GFLAGS), |
551 | MUX(SCLK_UART1, "sclk_uart1", mux_uart1_p, 0, | 551 | MUX(SCLK_UART1, "sclk_uart1", mux_uart1_p, CLK_SET_RATE_PARENT, |
552 | RK3288_CLKSEL_CON(14), 8, 2, MFLAGS), | 552 | RK3288_CLKSEL_CON(14), 8, 2, MFLAGS), |
553 | COMPOSITE_NOMUX(0, "uart2_src", "uart_src", 0, | 553 | COMPOSITE_NOMUX(0, "uart2_src", "uart_src", 0, |
554 | RK3288_CLKSEL_CON(15), 0, 7, DFLAGS, | 554 | RK3288_CLKSEL_CON(15), 0, 7, DFLAGS, |
555 | RK3288_CLKGATE_CON(1), 12, GFLAGS), | 555 | RK3288_CLKGATE_CON(1), 12, GFLAGS), |
556 | COMPOSITE_FRAC(0, "uart2_frac", "uart2_src", 0, | 556 | COMPOSITE_FRAC(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT, |
557 | RK3288_CLKSEL_CON(19), 0, | 557 | RK3288_CLKSEL_CON(19), 0, |
558 | RK3288_CLKGATE_CON(1), 13, GFLAGS), | 558 | RK3288_CLKGATE_CON(1), 13, GFLAGS), |
559 | MUX(SCLK_UART2, "sclk_uart2", mux_uart2_p, 0, | 559 | MUX(SCLK_UART2, "sclk_uart2", mux_uart2_p, CLK_SET_RATE_PARENT, |
560 | RK3288_CLKSEL_CON(15), 8, 2, MFLAGS), | 560 | RK3288_CLKSEL_CON(15), 8, 2, MFLAGS), |
561 | COMPOSITE_NOMUX(0, "uart3_src", "uart_src", 0, | 561 | COMPOSITE_NOMUX(0, "uart3_src", "uart_src", 0, |
562 | RK3288_CLKSEL_CON(16), 0, 7, DFLAGS, | 562 | RK3288_CLKSEL_CON(16), 0, 7, DFLAGS, |
563 | RK3288_CLKGATE_CON(1), 14, GFLAGS), | 563 | RK3288_CLKGATE_CON(1), 14, GFLAGS), |
564 | COMPOSITE_FRAC(0, "uart3_frac", "uart3_src", 0, | 564 | COMPOSITE_FRAC(0, "uart3_frac", "uart3_src", CLK_SET_RATE_PARENT, |
565 | RK3288_CLKSEL_CON(20), 0, | 565 | RK3288_CLKSEL_CON(20), 0, |
566 | RK3288_CLKGATE_CON(1), 15, GFLAGS), | 566 | RK3288_CLKGATE_CON(1), 15, GFLAGS), |
567 | MUX(SCLK_UART3, "sclk_uart3", mux_uart3_p, 0, | 567 | MUX(SCLK_UART3, "sclk_uart3", mux_uart3_p, CLK_SET_RATE_PARENT, |
568 | RK3288_CLKSEL_CON(16), 8, 2, MFLAGS), | 568 | RK3288_CLKSEL_CON(16), 8, 2, MFLAGS), |
569 | COMPOSITE_NOMUX(0, "uart4_src", "uart_src", 0, | 569 | COMPOSITE_NOMUX(0, "uart4_src", "uart_src", 0, |
570 | RK3288_CLKSEL_CON(3), 0, 7, DFLAGS, | 570 | RK3288_CLKSEL_CON(3), 0, 7, DFLAGS, |
571 | RK3288_CLKGATE_CON(2), 12, GFLAGS), | 571 | RK3288_CLKGATE_CON(2), 12, GFLAGS), |
572 | COMPOSITE_FRAC(0, "uart4_frac", "uart4_src", 0, | 572 | COMPOSITE_FRAC(0, "uart4_frac", "uart4_src", CLK_SET_RATE_PARENT, |
573 | RK3288_CLKSEL_CON(7), 0, | 573 | RK3288_CLKSEL_CON(7), 0, |
574 | RK3288_CLKGATE_CON(2), 13, GFLAGS), | 574 | RK3288_CLKGATE_CON(2), 13, GFLAGS), |
575 | MUX(SCLK_UART4, "sclk_uart4", mux_uart4_p, 0, | 575 | MUX(SCLK_UART4, "sclk_uart4", mux_uart4_p, CLK_SET_RATE_PARENT, |
576 | RK3288_CLKSEL_CON(3), 8, 2, MFLAGS), | 576 | RK3288_CLKSEL_CON(3), 8, 2, MFLAGS), |
577 | 577 | ||
578 | COMPOSITE(0, "mac_src", mux_pll_src_npll_cpll_gpll_p, 0, | 578 | COMPOSITE(0, "mac_src", mux_pll_src_npll_cpll_gpll_p, 0, |