UPSTREAM: clk: rockchip: include rk3288 downstream muxes into fractional dividers

During the initial conversion to the newly introduced combined fractional
dividers+muxes the rk3228 clocks were left out, so convert them now.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
v4.8-clk/next commit c73f689eea9f1e1706a600a506ba89f82bd84349)

Change-Id: Iea91d23ec1fa09c4777f7ccdb016514c301f90ec
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>

diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c
index 62c68346f3d7ec79447d70e824015eeef1bdfcbf..72bcdbacecfdb7583f12cf7c77ec6f5eb7ee4251 100644 (file)
--- a/drivers/clk/rockchip/clk-rk3228.c
+++ b/drivers/clk/rockchip/clk-rk3228.c
@@ -170,6 +170,34 @@ static struct rockchip_pll_clock rk3228_pll_clks[] __initdata = {
 #define DFLAGS CLK_DIVIDER_HIWORD_MASK
 #define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE)
 
+static struct rockchip_clk_branch rk3228_i2s0_fracmux __initdata =
+       MUX(0, "i2s0_pre", mux_i2s0_p, CLK_SET_RATE_PARENT,
+                       RK2928_CLKSEL_CON(9), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rk3228_i2s1_fracmux __initdata =
+       MUX(0, "i2s1_pre", mux_i2s1_pre_p, CLK_SET_RATE_PARENT,
+                       RK2928_CLKSEL_CON(3), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rk3228_i2s2_fracmux __initdata =
+       MUX(0, "i2s2_pre", mux_i2s2_p, CLK_SET_RATE_PARENT,
+                       RK2928_CLKSEL_CON(16), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rk3228_spdif_fracmux __initdata =
+       MUX(SCLK_SPDIF, "sclk_spdif", mux_sclk_spdif_p, CLK_SET_RATE_PARENT,
+                       RK2928_CLKSEL_CON(6), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rk3228_uart0_fracmux __initdata =
+       MUX(SCLK_UART0, "sclk_uart0", mux_uart0_p, CLK_SET_RATE_PARENT,
+                       RK2928_CLKSEL_CON(13), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rk3228_uart1_fracmux __initdata =
+       MUX(SCLK_UART1, "sclk_uart1", mux_uart1_p, CLK_SET_RATE_PARENT,
+                       RK2928_CLKSEL_CON(14), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rk3228_uart2_fracmux __initdata =
+       MUX(SCLK_UART2, "sclk_uart2", mux_uart2_p, CLK_SET_RATE_PARENT,
+                       RK2928_CLKSEL_CON(15), 8, 2, MFLAGS);
+
 static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
        /*
         * Clock-Architecture Diagram 1
@@ -379,22 +407,21 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
        COMPOSITE(0, "i2s0_src", mux_pll_src_2plls_p, 0,
                        RK2928_CLKSEL_CON(9), 15, 1, MFLAGS, 0, 7, DFLAGS,
                        RK2928_CLKGATE_CON(0), 3, GFLAGS),
-       COMPOSITE_FRAC(0, "i2s0_frac", "i2s0_src", CLK_SET_RATE_PARENT,
+       COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_src", CLK_SET_RATE_PARENT,
                        RK2928_CLKSEL_CON(8), 0,
-                       RK2928_CLKGATE_CON(0), 4, GFLAGS),
-       COMPOSITE_NODIV(SCLK_I2S0, "sclk_i2s0", mux_i2s0_p, 0,
-                       RK2928_CLKSEL_CON(9), 8, 2, MFLAGS,
+                       RK2928_CLKGATE_CON(0), 4, GFLAGS,
+                       &rk3228_i2s0_fracmux),
+       GATE(SCLK_I2S0, "sclk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT,
                        RK2928_CLKGATE_CON(0), 5, GFLAGS),
 
        COMPOSITE(0, "i2s1_src", mux_pll_src_2plls_p, 0,
                        RK2928_CLKSEL_CON(3), 15, 1, MFLAGS, 0, 7, DFLAGS,
                        RK2928_CLKGATE_CON(0), 10, GFLAGS),
-       COMPOSITE_FRAC(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT,
+       COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT,
                        RK2928_CLKSEL_CON(7), 0,
-                       RK2928_CLKGATE_CON(0), 11, GFLAGS),
-       MUX(0, "i2s1_pre", mux_i2s1_pre_p, 0,
-                       RK2928_CLKSEL_CON(3), 8, 2, MFLAGS),
-       GATE(SCLK_I2S1, "sclk_i2s1", "i2s1_pre", 0,
+                       RK2928_CLKGATE_CON(0), 11, GFLAGS,
+                       &rk3228_i2s1_fracmux),
+       GATE(SCLK_I2S1, "sclk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT,
                        RK2928_CLKGATE_CON(0), 14, GFLAGS),
        COMPOSITE_NODIV(SCLK_I2S_OUT, "i2s_out", mux_i2s_out_p, 0,
                        RK2928_CLKSEL_CON(3), 12, 1, MFLAGS,
@@ -403,21 +430,20 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
        COMPOSITE(0, "i2s2_src", mux_pll_src_2plls_p, 0,
                        RK2928_CLKSEL_CON(16), 15, 1, MFLAGS, 0, 7, DFLAGS,
                        RK2928_CLKGATE_CON(0), 7, GFLAGS),
-       COMPOSITE_FRAC(0, "i2s2_frac", "i2s2_src", CLK_SET_RATE_PARENT,
+       COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_src", CLK_SET_RATE_PARENT,
                        RK2928_CLKSEL_CON(30), 0,
-                       RK2928_CLKGATE_CON(0), 8, GFLAGS),
-       COMPOSITE_NODIV(SCLK_I2S2, "sclk_i2s2", mux_i2s2_p, 0,
-                       RK2928_CLKSEL_CON(16), 8, 2, MFLAGS,
+                       RK2928_CLKGATE_CON(0), 8, GFLAGS,
+                       &rk3228_i2s2_fracmux),
+       GATE(SCLK_I2S2, "sclk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT,
                        RK2928_CLKGATE_CON(0), 9, GFLAGS),
 
        COMPOSITE(0, "sclk_spdif_src", mux_pll_src_2plls_p, 0,
                        RK2928_CLKSEL_CON(6), 15, 1, MFLAGS, 0, 7, DFLAGS,
                        RK2928_CLKGATE_CON(2), 10, GFLAGS),
-       COMPOSITE_FRAC(0, "spdif_frac", "sclk_spdif_src", CLK_SET_RATE_PARENT,
+       COMPOSITE_FRACMUX(0, "spdif_frac", "sclk_spdif_src", CLK_SET_RATE_PARENT,
                        RK2928_CLKSEL_CON(20), 0,
-                       RK2928_CLKGATE_CON(2), 12, GFLAGS),
-       MUX(SCLK_SPDIF, "sclk_spdif", mux_sclk_spdif_p, 0,
-                       RK2928_CLKSEL_CON(6), 8, 2, MFLAGS),
+                       RK2928_CLKGATE_CON(2), 12, GFLAGS,
+                       &rk3228_spdif_fracmux),
 
        GATE(0, "jtag", "ext_jtag", 0,
                        RK2928_CLKGATE_CON(1), 3, GFLAGS),
@@ -456,21 +482,18 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
        COMPOSITE(0, "uart2_src", mux_pll_src_cpll_gpll_usb480m_p,
                        0, RK2928_CLKSEL_CON(15), 12, 2,
                        MFLAGS, 0, 7, DFLAGS, RK2928_CLKGATE_CON(1), 12, GFLAGS),
-       COMPOSITE_FRAC(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT,
+       COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT,
                        RK2928_CLKSEL_CON(17), 0,
-                       RK2928_CLKGATE_CON(1), 9, GFLAGS),
-       COMPOSITE_FRAC(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT,
+                       RK2928_CLKGATE_CON(1), 9, GFLAGS,
+                       &rk3228_uart0_fracmux),
+       COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT,
                        RK2928_CLKSEL_CON(18), 0,
-                       RK2928_CLKGATE_CON(1), 11, GFLAGS),
-       COMPOSITE_FRAC(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT,
+                       RK2928_CLKGATE_CON(1), 11, GFLAGS,
+                       &rk3228_uart1_fracmux),
+       COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT,
                        RK2928_CLKSEL_CON(19), 0,
-                       RK2928_CLKGATE_CON(1), 13, GFLAGS),
-       MUX(SCLK_UART0, "sclk_uart0", mux_uart0_p, CLK_SET_RATE_PARENT,
-                       RK2928_CLKSEL_CON(13), 8, 2, MFLAGS),
-       MUX(SCLK_UART1, "sclk_uart1", mux_uart1_p, CLK_SET_RATE_PARENT,
-                       RK2928_CLKSEL_CON(14), 8, 2, MFLAGS),
-       MUX(SCLK_UART2, "sclk_uart2", mux_uart2_p, CLK_SET_RATE_PARENT,
-                       RK2928_CLKSEL_CON(15), 8, 2, MFLAGS),
+                       RK2928_CLKGATE_CON(1), 13, GFLAGS,
+                       &rk3228_uart2_fracmux),
 
        COMPOSITE(SCLK_NANDC, "sclk_nandc", mux_pll_src_2plls_p, 0,
                        RK2928_CLKSEL_CON(2), 14, 1, MFLAGS, 8, 5, DFLAGS,