Merge tag 'v4.6-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next

Introduction of a factor type and a variant containing a gate
to be able to also declare factor clocks in their correct
place in the clock tree instead of having to register factor
clocks in the init callback separately. And as always some more
clock-ids and non-regression fixes for mistakes introduced in
past kernel releases.

9 files changed, 159 insertions, 154 deletions

diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 9fce91ffff6f..cb27a8f5a8e2 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -421,7 +421,7 @@
         status = "okay";
 
         assigned-clocks = <&cru SCLK_USBPHY480M_SRC>;
-        assigned-clock-parents = <&cru SCLK_OTGPHY0>;
+        assigned-clock-parents = <&usbphy0>;
         dr_mode = "host";
 };
 
diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c
index bc7fbac83ab7..0703c8f08ef8 100644
--- a/drivers/clk/rockchip/clk-rk3036.c
+++ b/drivers/clk/rockchip/clk-rk3036.c
@@ -177,6 +177,8 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
         GATE(0, "gpll_armclk", "gpll", CLK_IGNORE_UNUSED,
                         RK2928_CLKGATE_CON(0), 6, GFLAGS),
 
+        FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
+
         /*
          * Clock-Architecture Diagram 2
          */
@@ -187,6 +189,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
                         RK2928_CLKGATE_CON(0), 8, GFLAGS),
         COMPOSITE_NOGATE(0, "ddrphy2x", mux_ddrphy_p, CLK_IGNORE_UNUSED,
                         RK2928_CLKSEL_CON(26), 8, 1, MFLAGS, 0, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO),
+        FACTOR(0, "ddrphy", "ddrphy2x", 0, 1, 2),
 
         COMPOSITE_NOMUX(0, "pclk_dbg", "armclk", CLK_IGNORE_UNUSED,
                         RK2928_CLKSEL_CON(1), 0, 4, DFLAGS | CLK_DIVIDER_READ_ONLY,
@@ -263,6 +266,8 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
         COMPOSITE(0, "aclk_vcodec", mux_pll_src_3plls_p, 0,
                         RK2928_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS,
                         RK2928_CLKGATE_CON(3), 11, GFLAGS),
+        FACTOR_GATE(HCLK_VCODEC, "hclk_vcodec", "aclk_vcodec", 0, 1, 4,
+                        RK2928_CLKGATE_CON(3), 12, GFLAGS),
 
         COMPOSITE(0, "aclk_hvec", mux_pll_src_3plls_p, 0,
                         RK2928_CLKSEL_CON(20), 0, 2, MFLAGS, 2, 5, DFLAGS,
@@ -351,6 +356,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
         COMPOSITE_NOMUX(SCLK_MAC, "mac_clk", "mac_clk_ref", 0,
                         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),
@@ -376,11 +382,9 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
         GATE(ACLK_VIO, "aclk_vio", "aclk_disp1_pre", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(6), 13, GFLAGS),
         GATE(ACLK_LCDC, "aclk_lcdc", "aclk_disp1_pre", 0, RK2928_CLKGATE_CON(9), 6, GFLAGS),
 
-        GATE(HCLK_VIO_BUS, "hclk_vio_bus", "hclk_disp_pre", 0, RK2928_CLKGATE_CON(6), 12, GFLAGS),
+        GATE(HCLK_VIO_BUS, "hclk_vio_bus", "hclk_disp_pre", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(6), 12, GFLAGS),
         GATE(HCLK_LCDC, "hclk_lcdc", "hclk_disp_pre", 0, RK2928_CLKGATE_CON(9), 5, GFLAGS),
 
-        /* hclk_video gates */
-        GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_disp_pre", 0, RK2928_CLKGATE_CON(3), 12, GFLAGS),
 
         /* xin24m gates */
         GATE(SCLK_PVTM_CORE, "sclk_pvtm_core", "xin24m", 0, RK2928_CLKGATE_CON(10), 0, GFLAGS),
@@ -444,34 +448,11 @@ static void __init rk3036_clk_init(struct device_node *np)
 
         rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
 
-        /* xin12m is created by an cru-internal divider */
-        clk = clk_register_fixed_factor(NULL, "xin12m", "xin24m", 0, 1, 2);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock xin12m: %ld\n",
-                        __func__, PTR_ERR(clk));
-
         clk = clk_register_fixed_factor(NULL, "usb480m", "xin24m", 0, 20, 1);
         if (IS_ERR(clk))
                 pr_warn("%s: could not register clock usb480m: %ld\n",
                         __func__, PTR_ERR(clk));
 
-        clk = clk_register_fixed_factor(NULL, "ddrphy", "ddrphy2x", 0, 1, 2);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock ddrphy: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-        clk = clk_register_fixed_factor(NULL, "hclk_vcodec_pre",
-                                        "aclk_vcodec", 0, 1, 4);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock hclk_vcodec_pre: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-        clk = clk_register_fixed_factor(NULL, "sclk_macref_out",
-                                        "hclk_peri_src", 0, 1, 2);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock sclk_macref_out: %ld\n",
-                        __func__, PTR_ERR(clk));
-
         rockchip_clk_register_plls(rk3036_pll_clks,
                                    ARRAY_SIZE(rk3036_pll_clks),
                                    RK3036_GRF_SOC_STATUS0);
diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
index 7f7444cbf6fc..40bab3901491 100644
--- a/drivers/clk/rockchip/clk-rk3188.c
+++ b/drivers/clk/rockchip/clk-rk3188.c
@@ -339,13 +339,15 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = {
         INVERTER(0, "pclk_cif0", "pclkin_cif0",
                         RK2928_CLKSEL_CON(30), 8, IFLAGS),
 
+        FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
+
         /*
          * the 480m are generated inside the usb block from these clocks,
          * but they are also a source for the hsicphy clock.
          */
-        GATE(SCLK_OTGPHY0, "sclk_otgphy0", "usb480m", CLK_IGNORE_UNUSED,
+        GATE(SCLK_OTGPHY0, "sclk_otgphy0", "xin24m", CLK_IGNORE_UNUSED,
                         RK2928_CLKGATE_CON(1), 5, GFLAGS),
-        GATE(SCLK_OTGPHY1, "sclk_otgphy1", "usb480m", CLK_IGNORE_UNUSED,
+        GATE(SCLK_OTGPHY1, "sclk_otgphy1", "xin24m", CLK_IGNORE_UNUSED,
                         RK2928_CLKGATE_CON(1), 6, GFLAGS),
 
         COMPOSITE(0, "mac_src", mux_mac_p, 0,
@@ -605,7 +607,7 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = {
         GATE(SCLK_TIMER2, "timer2", "xin24m", 0,
                         RK2928_CLKGATE_CON(3), 2, GFLAGS),
 
-        COMPOSITE_NOMUX(0, "sclk_tsadc", "xin24m", 0,
+        COMPOSITE_NOMUX(SCLK_TSADC, "sclk_tsadc", "xin24m", 0,
                         RK2928_CLKSEL_CON(34), 0, 16, DFLAGS,
                         RK2928_CLKGATE_CON(2), 15, GFLAGS),
 
@@ -662,11 +664,11 @@ static struct clk_div_table div_rk3188_aclk_core_t[] = {
         { /* sentinel */ },
 };
 
-PNAME(mux_hsicphy_p)            = { "sclk_otgphy0", "sclk_otgphy1",
+PNAME(mux_hsicphy_p)            = { "sclk_otgphy0_480m", "sclk_otgphy1_480m",
                                     "gpll", "cpll" };
 
 static struct rockchip_clk_branch rk3188_i2s0_fracmux __initdata =
-        MUX(SCLK_I2S0, "sclk_i2s0", mux_sclk_i2s0_p, 0,
+        MUX(SCLK_I2S0, "sclk_i2s0", mux_sclk_i2s0_p, CLK_SET_RATE_PARENT,
                         RK2928_CLKSEL_CON(3), 8, 2, MFLAGS);
 
 static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = {
@@ -722,7 +724,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = {
         COMPOSITE_NOMUX(0, "i2s0_pre", "i2s_src", 0,
                         RK2928_CLKSEL_CON(3), 0, 7, DFLAGS,
                         RK2928_CLKGATE_CON(0), 9, GFLAGS),
-        COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_pre", 0,
+        COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_pre", CLK_SET_RATE_PARENT,
                         RK2928_CLKSEL_CON(7), 0,
                         RK2928_CLKGATE_CON(0), 10, GFLAGS,
                         &rk3188_i2s0_fracmux),
@@ -748,12 +750,12 @@ static const char *const rk3188_critical_clocks[] __initconst = {
         "hclk_peri",
         "pclk_cpu",
         "pclk_peri",
+        "hclk_cpubus"
 };
 
 static void __init rk3188_common_clk_init(struct device_node *np)
 {
         void __iomem *reg_base;
-        struct clk *clk;
 
         reg_base = of_iomap(np, 0);
         if (!reg_base) {
@@ -763,17 +765,6 @@ static void __init rk3188_common_clk_init(struct device_node *np)
 
         rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
 
-        /* xin12m is created by an cru-internal divider */
-        clk = clk_register_fixed_factor(NULL, "xin12m", "xin24m", 0, 1, 2);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock xin12m: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-        clk = clk_register_fixed_factor(NULL, "usb480m", "xin24m", 0, 20, 1);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock usb480m: %ld\n",
-                        __func__, PTR_ERR(clk));
-
         rockchip_clk_register_branches(common_clk_branches,
                                   ARRAY_SIZE(common_clk_branches));
 
diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c
index 981a50205339..c515915850a1 100644
--- a/drivers/clk/rockchip/clk-rk3228.c
+++ b/drivers/clk/rockchip/clk-rk3228.c
@@ -187,7 +187,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
                         RK2928_CLKGATE_CON(7), 1, GFLAGS),
         GATE(0, "ddrc", "ddrphy_pre", CLK_IGNORE_UNUSED,
                         RK2928_CLKGATE_CON(8), 5, GFLAGS),
-        GATE(0, "ddrphy", "ddrphy_pre", CLK_IGNORE_UNUSED,
+        FACTOR_GATE(0, "ddrphy", "ddrphy4x", CLK_IGNORE_UNUSED, 1, 4,
                         RK2928_CLKGATE_CON(7), 0, GFLAGS),
 
         /* PD_CORE */
@@ -240,13 +240,13 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
         COMPOSITE(0, "aclk_vpu_pre", mux_pll_src_4plls_p, 0,
                         RK2928_CLKSEL_CON(32), 5, 2, MFLAGS, 0, 5, DFLAGS,
                         RK2928_CLKGATE_CON(3), 11, GFLAGS),
-        GATE(0, "hclk_vpu_src", "aclk_vpu_pre", 0,
+        FACTOR_GATE(0, "hclk_vpu_pre", "aclk_vpu_pre", 0, 1, 4,
                         RK2928_CLKGATE_CON(4), 4, GFLAGS),
 
         COMPOSITE(0, "aclk_rkvdec_pre", mux_pll_src_4plls_p, 0,
                         RK2928_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 5, DFLAGS,
                         RK2928_CLKGATE_CON(3), 2, GFLAGS),
-        GATE(0, "hclk_rkvdec_src", "aclk_rkvdec_pre", 0,
+        FACTOR_GATE(0, "hclk_rkvdec_pre", "aclk_rkvdec_pre", 0, 1, 4,
                         RK2928_CLKGATE_CON(4), 5, GFLAGS),
 
         COMPOSITE(0, "sclk_vdec_cabac", mux_pll_src_4plls_p, 0,
@@ -371,6 +371,8 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
         MUX(0, "dclk_vop", mux_dclk_vop_p, 0,
                         RK2928_CLKSEL_CON(27), 1, 1, MFLAGS),
 
+        FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
+
         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),
@@ -605,13 +607,13 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
 
         /* PD_MMC */
         MMC(SCLK_SDMMC_DRV,    "sdmmc_drv",    "sclk_sdmmc", RK3228_SDMMC_CON0, 1),
-        MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc", RK3228_SDMMC_CON1, 1),
+        MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc", RK3228_SDMMC_CON1, 0),
 
         MMC(SCLK_SDIO_DRV,     "sdio_drv",     "sclk_sdio",  RK3228_SDIO_CON0,  1),
-        MMC(SCLK_SDIO_SAMPLE,  "sdio_sample",  "sclk_sdio",  RK3228_SDIO_CON1,  1),
+        MMC(SCLK_SDIO_SAMPLE,  "sdio_sample",  "sclk_sdio",  RK3228_SDIO_CON1,  0),
 
         MMC(SCLK_EMMC_DRV,     "emmc_drv",     "sclk_emmc",  RK3228_EMMC_CON0,  1),
-        MMC(SCLK_EMMC_SAMPLE,  "emmc_sample",  "sclk_emmc",  RK3228_EMMC_CON1,  1),
+        MMC(SCLK_EMMC_SAMPLE,  "emmc_sample",  "sclk_emmc",  RK3228_EMMC_CON1,  0),
 };
 
 static const char *const rk3228_critical_clocks[] __initconst = {
@@ -624,7 +626,6 @@ static const char *const rk3228_critical_clocks[] __initconst = {
 static void __init rk3228_clk_init(struct device_node *np)
 {
         void __iomem *reg_base;
-        struct clk *clk;
 
         reg_base = of_iomap(np, 0);
         if (!reg_base) {
@@ -634,29 +635,6 @@ static void __init rk3228_clk_init(struct device_node *np)
 
         rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
 
-        /* xin12m is created by an cru-internal divider */
-        clk = clk_register_fixed_factor(NULL, "xin12m", "xin24m", 0, 1, 2);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock xin12m: %ld\n",
-                                __func__, PTR_ERR(clk));
-
-        clk = clk_register_fixed_factor(NULL, "ddrphy_pre", "ddrphy4x", 0, 1, 4);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock ddrphy_pre: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-        clk = clk_register_fixed_factor(NULL, "hclk_vpu_pre",
-                                        "hclk_vpu_src", 0, 1, 4);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock hclk_vpu_pre: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-        clk = clk_register_fixed_factor(NULL, "hclk_rkvdec_pre",
-                                        "hclk_rkvdec_src", 0, 1, 4);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock hclk_rkvdec_pre: %ld\n",
-                        __func__, PTR_ERR(clk));
-
         rockchip_clk_register_plls(rk3228_pll_clks,
                                    ARRAY_SIZE(rk3228_pll_clks),
                                    RK3228_GRF_SOC_STATUS0);
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index 984fc187d12e..3cb72163a512 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -195,8 +195,8 @@ PNAME(mux_hsadcout_p)	= { "hsadc_src", "ext_hsadc" };
 PNAME(mux_edp_24m_p)    = { "ext_edp_24m", "xin24m" };
 PNAME(mux_tspout_p)     = { "cpll", "gpll", "npll", "xin27m" };
 
-PNAME(mux_usbphy480m_p)         = { "sclk_otgphy1", "sclk_otgphy2",
-                                    "sclk_otgphy0" };
+PNAME(mux_usbphy480m_p)         = { "sclk_otgphy1_480m", "sclk_otgphy2_480m",
+                                    "sclk_otgphy0_480m" };
 PNAME(mux_hsicphy480m_p)        = { "cpll", "gpll", "usbphy480m_src" };
 PNAME(mux_hsicphy12m_p)         = { "hsicphy12m_xin12m", "hsicphy12m_usbphy" };
 
@@ -333,6 +333,8 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
         GATE(0, "aclk_bus_2pmu", "aclk_cpu_pre", CLK_IGNORE_UNUSED,
                         RK3288_CLKGATE_CON(0), 7, GFLAGS),
 
+        FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
+
         COMPOSITE(0, "i2s_src", mux_pll_src_cpll_gpll_p, 0,
                         RK3288_CLKSEL_CON(4), 15, 1, MFLAGS, 0, 7, DFLAGS,
                         RK3288_CLKGATE_CON(4), 1, GFLAGS),
@@ -399,12 +401,10 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
          */
         GATE(ACLK_VCODEC, "aclk_vcodec", "aclk_vdpu", 0,
                 RK3288_CLKGATE_CON(9), 0, GFLAGS),
-        /*
-         * We introduce a virtul node of hclk_vodec_pre_v to split one clock
-         * struct with a gate and a fix divider into two node in software.
-         */
-        GATE(0, "hclk_vcodec_pre_v", "aclk_vdpu", 0,
+
+        FACTOR_GATE(0, "hclk_vcodec_pre", "aclk_vdpu", 0, 1, 4,
                 RK3288_CLKGATE_CON(3), 10, GFLAGS),
+
         GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre", 0,
                 RK3288_CLKGATE_CON(9), 1, GFLAGS),
 
@@ -537,11 +537,11 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
                         RK3288_CLKSEL_CON(35), 6, 2, MFLAGS, 0, 5, DFLAGS,
                         RK3288_CLKGATE_CON(4), 10, GFLAGS),
 
-        GATE(SCLK_OTGPHY0, "sclk_otgphy0", "usb480m", CLK_IGNORE_UNUSED,
+        GATE(SCLK_OTGPHY0, "sclk_otgphy0", "xin24m", CLK_IGNORE_UNUSED,
                         RK3288_CLKGATE_CON(13), 4, GFLAGS),
-        GATE(SCLK_OTGPHY1, "sclk_otgphy1", "usb480m", CLK_IGNORE_UNUSED,
+        GATE(SCLK_OTGPHY1, "sclk_otgphy1", "xin24m", CLK_IGNORE_UNUSED,
                         RK3288_CLKGATE_CON(13), 5, GFLAGS),
-        GATE(SCLK_OTGPHY2, "sclk_otgphy2", "usb480m", CLK_IGNORE_UNUSED,
+        GATE(SCLK_OTGPHY2, "sclk_otgphy2", "xin24m", CLK_IGNORE_UNUSED,
                         RK3288_CLKGATE_CON(13), 6, GFLAGS),
         GATE(SCLK_OTG_ADP, "sclk_otg_adp", "xin32k", CLK_IGNORE_UNUSED,
                         RK3288_CLKGATE_CON(13), 7, GFLAGS),
@@ -888,24 +888,6 @@ static void __init rk3288_clk_init(struct device_node *np)
 
         rockchip_clk_init(np, rk3288_cru_base, CLK_NR_CLKS);
 
-        /* xin12m is created by an cru-internal divider */
-        clk = clk_register_fixed_factor(NULL, "xin12m", "xin24m", 0, 1, 2);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock xin12m: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-
-        clk = clk_register_fixed_factor(NULL, "usb480m", "xin24m", 0, 20, 1);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock usb480m: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-        clk = clk_register_fixed_factor(NULL, "hclk_vcodec_pre",
-                                        "hclk_vcodec_pre_v", 0, 1, 4);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock hclk_vcodec_pre: %ld\n",
-                        __func__, PTR_ERR(clk));
-
         /* Watchdog pclk is controlled by RK3288_SGRF_SOC_CON0[1]. */
         clk = clk_register_fixed_factor(NULL, "pclk_wdt", "pclk_pd_alive", 0, 1, 1);
         if (IS_ERR(clk))
diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c
index 21f3ea909fab..c2b0421f2076 100644
--- a/drivers/clk/rockchip/clk-rk3368.c
+++ b/drivers/clk/rockchip/clk-rk3368.c
@@ -121,7 +121,7 @@ PNAME(mux_i2s_2ch_p)		= { "i2s_2ch_src", "i2s_2ch_frac",
                                     "dummy", "xin12m" };
 PNAME(mux_spdif_8ch_p)          = { "spdif_8ch_pre", "spdif_8ch_frac",
                                     "ext_i2s", "xin12m" };
-PNAME(mux_edp_24m_p)            = { "dummy", "xin24m" };
+PNAME(mux_edp_24m_p)            = { "xin24m", "dummy" };
 PNAME(mux_vip_out_p)            = { "vip_src", "xin24m" };
 PNAME(mux_usbphy480m_p)         = { "usbotg_out", "xin24m" };
 PNAME(mux_hsic_usbphy480m_p)    = { "usbotg_out", "dummy" };
@@ -165,7 +165,7 @@ static const struct rockchip_cpuclk_reg_data rk3368_cpuclkb_data = {
         .core_reg = RK3368_CLKSEL_CON(0),
         .div_core_shift = 0,
         .div_core_mask = 0x1f,
-        .mux_core_shift = 15,
+        .mux_core_shift = 7,
 };
 
 static const struct rockchip_cpuclk_reg_data rk3368_cpuclkl_data = {
@@ -218,29 +218,29 @@ static const struct rockchip_cpuclk_reg_data rk3368_cpuclkl_data = {
         }
 
 static struct rockchip_cpuclk_rate_table rk3368_cpuclkb_rates[] __initdata = {
-        RK3368_CPUCLKB_RATE(1512000000, 2, 6, 6),
-        RK3368_CPUCLKB_RATE(1488000000, 2, 5, 5),
-        RK3368_CPUCLKB_RATE(1416000000, 2, 5, 5),
-        RK3368_CPUCLKB_RATE(1200000000, 2, 4, 4),
-        RK3368_CPUCLKB_RATE(1008000000, 2, 4, 4),
-        RK3368_CPUCLKB_RATE( 816000000, 2, 3, 3),
-        RK3368_CPUCLKB_RATE( 696000000, 2, 3, 3),
-        RK3368_CPUCLKB_RATE( 600000000, 2, 2, 2),
-        RK3368_CPUCLKB_RATE( 408000000, 2, 2, 2),
-        RK3368_CPUCLKB_RATE( 312000000, 2, 2, 2),
+        RK3368_CPUCLKB_RATE(1512000000, 1, 5, 5),
+        RK3368_CPUCLKB_RATE(1488000000, 1, 4, 4),
+        RK3368_CPUCLKB_RATE(1416000000, 1, 4, 4),
+        RK3368_CPUCLKB_RATE(1200000000, 1, 3, 3),
+        RK3368_CPUCLKB_RATE(1008000000, 1, 3, 3),
+        RK3368_CPUCLKB_RATE( 816000000, 1, 2, 2),
+        RK3368_CPUCLKB_RATE( 696000000, 1, 2, 2),
+        RK3368_CPUCLKB_RATE( 600000000, 1, 1, 1),
+        RK3368_CPUCLKB_RATE( 408000000, 1, 1, 1),
+        RK3368_CPUCLKB_RATE( 312000000, 1, 1, 1),
 };
 
 static struct rockchip_cpuclk_rate_table rk3368_cpuclkl_rates[] __initdata = {
-        RK3368_CPUCLKL_RATE(1512000000, 2, 7, 7),
-        RK3368_CPUCLKL_RATE(1488000000, 2, 6, 6),
-        RK3368_CPUCLKL_RATE(1416000000, 2, 6, 6),
-        RK3368_CPUCLKL_RATE(1200000000, 2, 5, 5),
-        RK3368_CPUCLKL_RATE(1008000000, 2, 5, 5),
-        RK3368_CPUCLKL_RATE( 816000000, 2, 4, 4),
-        RK3368_CPUCLKL_RATE( 696000000, 2, 3, 3),
-        RK3368_CPUCLKL_RATE( 600000000, 2, 3, 3),
-        RK3368_CPUCLKL_RATE( 408000000, 2, 2, 2),
-        RK3368_CPUCLKL_RATE( 312000000, 2, 2, 2),
+        RK3368_CPUCLKL_RATE(1512000000, 1, 6, 6),
+        RK3368_CPUCLKL_RATE(1488000000, 1, 5, 5),
+        RK3368_CPUCLKL_RATE(1416000000, 1, 5, 5),
+        RK3368_CPUCLKL_RATE(1200000000, 1, 4, 4),
+        RK3368_CPUCLKL_RATE(1008000000, 1, 4, 4),
+        RK3368_CPUCLKL_RATE( 816000000, 1, 3, 3),
+        RK3368_CPUCLKL_RATE( 696000000, 1, 2, 2),
+        RK3368_CPUCLKL_RATE( 600000000, 1, 2, 2),
+        RK3368_CPUCLKL_RATE( 408000000, 1, 1, 1),
+        RK3368_CPUCLKL_RATE( 312000000, 1, 1, 1),
 };
 
 static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
@@ -248,6 +248,8 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
          * Clock-Architecture Diagram 2
          */
 
+        FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
+
         MUX(SCLK_USBPHY480M, "usbphy_480m", mux_usbphy480m_p, CLK_SET_RATE_PARENT,
                         RK3368_CLKSEL_CON(13), 8, 1, MFLAGS),
 
@@ -299,7 +301,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
         COMPOSITE_NOGATE_DIVTBL(0, "ddrphy_src", mux_ddrphy_p, CLK_IGNORE_UNUSED,
                         RK3368_CLKSEL_CON(13), 4, 1, MFLAGS, 0, 2, DFLAGS, div_ddrphy_t),
 
-        GATE(0, "sclk_ddr", "ddrphy_div4", CLK_IGNORE_UNUSED,
+        FACTOR_GATE(0, "sclk_ddr", "ddrphy_src", CLK_IGNORE_UNUSED, 1, 4,
                         RK3368_CLKGATE_CON(6), 14, GFLAGS),
         GATE(0, "sclk_ddr4x", "ddrphy_src", CLK_IGNORE_UNUSED,
                         RK3368_CLKGATE_CON(6), 15, GFLAGS),
@@ -353,7 +355,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
         COMPOSITE_FRAC(0, "spdif_8ch_frac", "spdif_8ch_src", CLK_SET_RATE_PARENT,
                         RK3368_CLKSEL_CON(32), 0,
                         RK3368_CLKGATE_CON(6), 5, GFLAGS),
-        COMPOSITE_NODIV(SCLK_SPDIF_8CH, "sclk_spdif_8ch", mux_spdif_8ch_p, 0,
+        COMPOSITE_NODIV(SCLK_SPDIF_8CH, "sclk_spdif_8ch", mux_spdif_8ch_p, CLK_SET_RATE_PARENT,
                         RK3368_CLKSEL_CON(31), 8, 2, MFLAGS,
                         RK3368_CLKGATE_CON(6), 6, GFLAGS),
         COMPOSITE(0, "i2s_2ch_src", mux_pll_src_cpll_gpll_p, 0,
@@ -362,7 +364,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
         COMPOSITE_FRAC(0, "i2s_2ch_frac", "i2s_2ch_src", CLK_SET_RATE_PARENT,
                         RK3368_CLKSEL_CON(54), 0,
                         RK3368_CLKGATE_CON(5), 14, GFLAGS),
-        COMPOSITE_NODIV(SCLK_I2S_2CH, "sclk_i2s_2ch", mux_i2s_2ch_p, 0,
+        COMPOSITE_NODIV(SCLK_I2S_2CH, "sclk_i2s_2ch", mux_i2s_2ch_p, CLK_SET_RATE_PARENT,
                         RK3368_CLKSEL_CON(53), 8, 2, MFLAGS,
                         RK3368_CLKGATE_CON(5), 15, GFLAGS),
 
@@ -384,18 +386,18 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
          * Clock-Architecture Diagram 3
          */
 
-        COMPOSITE(0, "aclk_vepu", mux_pll_src_cpll_gpll_usb_p, 0,
+        COMPOSITE(0, "aclk_vepu", mux_pll_src_cpll_gpll_npll_usb_p, 0,
                         RK3368_CLKSEL_CON(15), 6, 2, MFLAGS, 0, 5, DFLAGS,
                         RK3368_CLKGATE_CON(4), 6, GFLAGS),
-        COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_usb_p, 0,
+        COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_npll_usb_p, 0,
                         RK3368_CLKSEL_CON(15), 14, 2, MFLAGS, 8, 5, DFLAGS,
                         RK3368_CLKGATE_CON(4), 7, GFLAGS),
 
         /*
-         * We introduce a virtual node of hclk_vodec_pre_v to split one clock
-         * struct with a gate and a fix divider into two node in software.
+         * We use aclk_vdpu by default ---GRF_SOC_CON0[7] setting in system,
+         * so we ignore the mux and make clocks nodes as following,
          */
-        GATE(0, "hclk_video_pre_v", "aclk_vdpu", 0,
+        FACTOR_GATE(0, "hclk_video_pre", "aclk_vdpu", 0, 1, 4,
                 RK3368_CLKGATE_CON(4), 8, GFLAGS),
 
         COMPOSITE(0, "sclk_hevc_cabac_src", mux_pll_src_cpll_gpll_npll_usb_p, 0,
@@ -442,7 +444,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
         GATE(SCLK_HDMI_HDCP, "sclk_hdmi_hdcp", "xin24m", 0,
                         RK3368_CLKGATE_CON(4), 13, GFLAGS),
         GATE(SCLK_HDMI_CEC, "sclk_hdmi_cec", "xin32k", 0,
-                        RK3368_CLKGATE_CON(5), 12, GFLAGS),
+                        RK3368_CLKGATE_CON(4), 12, GFLAGS),
 
         COMPOSITE_NODIV(0, "vip_src", mux_pll_src_cpll_gpll_p, 0,
                         RK3368_CLKSEL_CON(21), 15, 1, MFLAGS,
@@ -842,24 +844,6 @@ static void __init rk3368_clk_init(struct device_node *np)
 
         rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
 
-        /* xin12m is created by a cru-internal divider */
-        clk = clk_register_fixed_factor(NULL, "xin12m", "xin24m", 0, 1, 2);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock xin12m: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-        /* ddrphy_div4 is created by a cru-internal divider */
-        clk = clk_register_fixed_factor(NULL, "ddrphy_div4", "ddrphy_src", 0, 1, 4);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock xin12m: %ld\n",
-                        __func__, PTR_ERR(clk));
-
-        clk = clk_register_fixed_factor(NULL, "hclk_video_pre",
-                                        "hclk_video_pre_v", 0, 1, 4);
-        if (IS_ERR(clk))
-                pr_warn("%s: could not register clock hclk_vcodec_pre: %ld\n",
-                        __func__, PTR_ERR(clk));
-
         /* Watchdog pclk is controlled by sgrf_soc_con3[7]. */
         clk = clk_register_fixed_factor(NULL, "pclk_wdt", "pclk_pd_alive", 0, 1, 1);
         if (IS_ERR(clk))
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index f7e8693ad28b..ec06350c78c4 100644
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -70,7 +70,7 @@ static struct clk *rockchip_clk_register_branch(const char *name,
         if (gate_offset >= 0) {
                 gate = kzalloc(sizeof(*gate), GFP_KERNEL);
                 if (!gate)
-                        return ERR_PTR(-ENOMEM);
+                        goto err_gate;
 
                 gate->flags = gate_flags;
                 gate->reg = base + gate_offset;
@@ -82,7 +82,7 @@ static struct clk *rockchip_clk_register_branch(const char *name,
         if (div_width > 0) {
                 div = kzalloc(sizeof(*div), GFP_KERNEL);
                 if (!div)
-                        return ERR_PTR(-ENOMEM);
+                        goto err_div;
 
                 div->flags = div_flags;
                 div->reg = base + muxdiv_offset;
@@ -102,6 +102,11 @@ static struct clk *rockchip_clk_register_branch(const char *name,
                                      flags);
 
         return clk;
+err_div:
+        kfree(gate);
+err_gate:
+        kfree(mux);
+        return ERR_PTR(-ENOMEM);
 }
 
 struct rockchip_clk_frac {
@@ -262,6 +267,53 @@ static struct clk *rockchip_clk_register_frac_branch(const char *name,
         return clk;
 }
 
+static struct clk *rockchip_clk_register_factor_branch(const char *name,
+                const char *const *parent_names, u8 num_parents,
+                void __iomem *base, unsigned int mult, unsigned int div,
+                int gate_offset, u8 gate_shift, u8 gate_flags,
+                unsigned long flags, spinlock_t *lock)
+{
+        struct clk *clk;
+        struct clk_gate *gate = NULL;
+        struct clk_fixed_factor *fix = NULL;
+
+        /* without gate, register a simple factor clock */
+        if (gate_offset == 0) {
+                return clk_register_fixed_factor(NULL, name,
+                                parent_names[0], flags, mult,
+                                div);
+        }
+
+        gate = kzalloc(sizeof(*gate), GFP_KERNEL);
+        if (!gate)
+                return ERR_PTR(-ENOMEM);
+
+        gate->flags = gate_flags;
+        gate->reg = base + gate_offset;
+        gate->bit_idx = gate_shift;
+        gate->lock = lock;
+
+        fix = kzalloc(sizeof(*fix), GFP_KERNEL);
+        if (!fix) {
+                kfree(gate);
+                return ERR_PTR(-ENOMEM);
+        }
+
+        fix->mult = mult;
+        fix->div = div;
+
+        clk = clk_register_composite(NULL, name, parent_names, num_parents,
+                                     NULL, NULL,
+                                     &fix->hw, &clk_fixed_factor_ops,
+                                     &gate->hw, &clk_gate_ops, flags);
+        if (IS_ERR(clk)) {
+                kfree(fix);
+                kfree(gate);
+        }
+
+        return clk;
+}
+
 static DEFINE_SPINLOCK(clk_lock);
 static struct clk **clk_table;
 static void __iomem *reg_base;
@@ -397,6 +449,14 @@ void __init rockchip_clk_register_branches(
                                 reg_base + list->muxdiv_offset,
                                 list->div_shift, list->div_flags, &clk_lock);
                         break;
+                case branch_factor:
+                        clk = rockchip_clk_register_factor_branch(
+                                list->name, list->parent_names,
+                                list->num_parents, reg_base,
+                                list->div_shift, list->div_width,
+                                list->gate_offset, list->gate_shift,
+                                list->gate_flags, flags, &clk_lock);
+                        break;
                 }
 
                 /* none of the cases above matched */
diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
index ff8bd23a93ec..39c198bbcbee 100644
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@ -254,6 +254,7 @@ enum rockchip_clk_branch_type {
         branch_gate,
         branch_mmc,
         branch_inverter,
+        branch_factor,
 };
 
 struct rockchip_clk_branch {
@@ -508,6 +509,33 @@ struct rockchip_clk_branch {
                 .div_flags      = if,                           \
         }
 
+#define FACTOR(_id, cname, pname,  f, fm, fd)                   \
+        {                                                       \
+                .id             = _id,                          \
+                .branch_type    = branch_factor,                \
+                .name           = cname,                        \
+                .parent_names   = (const char *[]){ pname },    \
+                .num_parents    = 1,                            \
+                .flags          = f,                            \
+                .div_shift      = fm,                           \
+                .div_width      = fd,                           \
+        }
+
+#define FACTOR_GATE(_id, cname, pname,  f, fm, fd, go, gb, gf)  \
+        {                                                       \
+                .id             = _id,                          \
+                .branch_type    = branch_factor,                \
+                .name           = cname,                        \
+                .parent_names   = (const char *[]){ pname },    \
+                .num_parents    = 1,                            \
+                .flags          = f,                            \
+                .div_shift      = fm,                           \
+                .div_width      = fd,                           \
+                .gate_offset    = go,                           \
+                .gate_shift     = gb,                           \
+                .gate_flags     = gf,                           \
+        }
+
 void rockchip_clk_init(struct device_node *np, void __iomem *base,
                        unsigned long nr_clks);
 struct regmap *rockchip_clk_get_grf(void);
diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h
index 8df77a7c030b..4f53e70f68ee 100644
--- a/include/dt-bindings/clock/rk3188-cru-common.h
+++ b/include/dt-bindings/clock/rk3188-cru-common.h
@@ -55,6 +55,7 @@
 #define SCLK_TIMER6             90
 #define SCLK_JTAG               91
 #define SCLK_SMC                92
+#define SCLK_TSADC              93
 
 #define DCLK_LCDC0              190
 #define DCLK_LCDC1              191