Merge remote-tracking branch 'clk/clk-next'

diff --cc drivers/clk/rockchip/clk-rk3036.c
index 5759d75780cf70b4d30becc7fc442dd8cad1e4d1,bc7fbac83ab74dfca9e534401bc430f629d01357..0703c8f08ef869638f8c2672827a1eea34e406e0
--- 1/drivers/clk/rockchip/clk-rk3036.c
--- 2/drivers/clk/rockchip/clk-rk3036.c
+++ b/drivers/clk/rockchip/clk-rk3036.c
@@@ -354,9 -349,8 +354,9 @@@ static struct rockchip_clk_branch rk303
                        RK2928_CLKSEL_CON(21), 3, 1, MFLAGS),
  
        COMPOSITE_NOMUX(SCLK_MAC, "mac_clk", "mac_clk_ref", 0,
-                       RK2928_CLKSEL_CON(21), 9, 5, DFLAGS,
+                       RK2928_CLKSEL_CON(21), 4, 5, DFLAGS,
                        RK2928_CLKGATE_CON(2), 6, GFLAGS),
 +      FACTOR(0, "sclk_macref_out", "hclk_peri_src", 0, 1, 2),
  
        MUX(SCLK_HDMI, "dclk_hdmi", mux_dclk_p, 0,
                        RK2928_CLKSEL_CON(31), 0, 1, MFLAGS),

diff --cc drivers/clk/rockchip/clk-rk3368.c
Simple merge

diff --cc drivers/clk/rockchip/clk.c
Simple merge

diff --cc include/linux/device.h
Simple merge