Merge branch 'clk-qcom-sdm845' into clk-next

* clk-qcom-sdm845:
  clk: qcom: Export clk_fabia_pll_configure()
  clk: qcom: Add video clock controller driver for SDM845
  dt-bindings: clock: Introduce QCOM Video clock bindings
  clk: qcom: Add Global Clock controller (GCC) driver for SDM845
  clk: qcom: Add DT bindings for SDM845 gcc clock controller
  clk: qcom: Configure the RCGs to a safe source as needed
  clk: qcom: Add support for BRANCH_HALT_SKIP flag for branch clocks
  clk: qcom: Simplify gdsc status checking logic
  clk: qcom: gdsc: Add support to poll CFG register to check GDSC state
  clk: qcom: gdsc: Add support to poll for higher timeout value
  clk: qcom: gdsc: Add support to reset AON and block reset logic
  clk: qcom: Add support for controlling Fabia PLL
  clk: qcom: Clear hardware clock control bit of RCG

Also fixup the Kconfig mess where SDM845 GCC has msm8998 in the
description and also the video Kconfig says things slightly differently
from the GCC one so just make it the same.

16 files changed, 4689 insertions, 62 deletions

diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
index d1fb8b213dde..664ea1fd6c76 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
@@ -19,6 +19,7 @@ Required properties :
                         "qcom,gcc-msm8996"
                         "qcom,gcc-msm8998"
                         "qcom,gcc-mdm9615"
+                        "qcom,gcc-sdm845"
 
 - reg : shall contain base register location and length
 - #clock-cells : shall contain 1
diff --git a/Documentation/devicetree/bindings/clock/qcom,videocc.txt b/Documentation/devicetree/bindings/clock/qcom,videocc.txt
new file mode 100644
index 000000000000..e7c035afa778
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/qcom,videocc.txt
@@ -0,0 +1,19 @@
+Qualcomm Video Clock & Reset Controller Binding
+-----------------------------------------------
+
+Required properties :
+- compatible : shall contain "qcom,sdm845-videocc"
+- reg : shall contain base register location and length
+- #clock-cells : from common clock binding, shall contain 1.
+- #power-domain-cells : from generic power domain binding, shall contain 1.
+
+Optional properties :
+- #reset-cells : from common reset binding, shall contain 1.
+
+Example:
+        videocc: clock-controller@ab00000 {
+                compatible = "qcom,sdm845-videocc";
+                reg = <0xab00000 0x10000>;
+                #clock-cells = <1>;
+                #power-domain-cells = <1>;
+        };
diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
index e42e1afb0c51..9c3480dcc38a 100644
--- a/drivers/clk/qcom/Kconfig
+++ b/drivers/clk/qcom/Kconfig
@@ -226,6 +226,25 @@ config MSM_GCC_8998
           Say Y if you want to use peripheral devices such as UART, SPI,
           i2c, USB, UFS, SD/eMMC, PCIe, etc.
 
+config SDM_GCC_845
+        tristate "SDM845 Global Clock Controller"
+        select QCOM_GDSC
+        depends on COMMON_CLK_QCOM
+        help
+          Support for the global clock controller on SDM845 devices.
+          Say Y if you want to use peripheral devices such as UART, SPI,
+          i2C, USB, UFS, SDDC, PCIe, etc.
+
+config SDM_VIDEOCC_845
+        tristate "SDM845 Video Clock Controller"
+        depends on COMMON_CLK_QCOM
+        select SDM_GCC_845
+        select QCOM_GDSC
+        help
+          Support for the video clock controller on SDM845 devices.
+          Say Y if you want to support video devices and functionality such as
+          video encode and decode.
+
 config SPMI_PMIC_CLKDIV
         tristate "SPMI PMIC clkdiv Support"
         depends on (COMMON_CLK_QCOM && SPMI) || COMPILE_TEST
diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
index 7c09ab1a640c..762c01137c2f 100644
--- a/drivers/clk/qcom/Makefile
+++ b/drivers/clk/qcom/Makefile
@@ -38,4 +38,6 @@ obj-$(CONFIG_QCOM_A53PLL) += a53-pll.o
 obj-$(CONFIG_QCOM_CLK_APCS_MSM8916) += apcs-msm8916.o
 obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o
 obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o
+obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o
+obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o
 obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o
diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
index 6d04cd96482a..3c49a60072f1 100644
--- a/drivers/clk/qcom/clk-alpha-pll.c
+++ b/drivers/clk/qcom/clk-alpha-pll.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015, 2018, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -58,6 +58,8 @@
 #define PLL_TEST_CTL(p)         ((p)->offset + (p)->regs[PLL_OFF_TEST_CTL])
 #define PLL_TEST_CTL_U(p)       ((p)->offset + (p)->regs[PLL_OFF_TEST_CTL_U])
 #define PLL_STATUS(p)           ((p)->offset + (p)->regs[PLL_OFF_STATUS])
+#define PLL_OPMODE(p)           ((p)->offset + (p)->regs[PLL_OFF_OPMODE])
+#define PLL_FRAC(p)             ((p)->offset + (p)->regs[PLL_OFF_FRAC])
 
 const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = {
         [CLK_ALPHA_PLL_TYPE_DEFAULT] =  {
@@ -90,6 +92,18 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = {
                 [PLL_OFF_TEST_CTL] = 0x1c,
                 [PLL_OFF_STATUS] = 0x24,
         },
+        [CLK_ALPHA_PLL_TYPE_FABIA] =  {
+                [PLL_OFF_L_VAL] = 0x04,
+                [PLL_OFF_USER_CTL] = 0x0c,
+                [PLL_OFF_USER_CTL_U] = 0x10,
+                [PLL_OFF_CONFIG_CTL] = 0x14,
+                [PLL_OFF_CONFIG_CTL_U] = 0x18,
+                [PLL_OFF_TEST_CTL] = 0x1c,
+                [PLL_OFF_TEST_CTL_U] = 0x20,
+                [PLL_OFF_STATUS] = 0x24,
+                [PLL_OFF_OPMODE] = 0x2c,
+                [PLL_OFF_FRAC] = 0x38,
+        },
 };
 EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);
 
@@ -108,6 +122,12 @@ EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);
 #define PLL_HUAYRA_N_MASK               0xff
 #define PLL_HUAYRA_ALPHA_WIDTH          16
 
+#define FABIA_OPMODE_STANDBY    0x0
+#define FABIA_OPMODE_RUN        0x1
+
+#define FABIA_PLL_OUT_MASK      0x7
+#define FABIA_PLL_RATE_MARGIN   500
+
 #define pll_alpha_width(p)                                      \
                 ((PLL_ALPHA_VAL_U(p) - PLL_ALPHA_VAL(p) == 4) ? \
                                  ALPHA_REG_BITWIDTH : ALPHA_REG_16BIT_WIDTH)
@@ -441,16 +461,12 @@ clk_alpha_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)
         return alpha_pll_calc_rate(prate, l, a, alpha_width);
 }
 
-static int clk_alpha_pll_update_latch(struct clk_alpha_pll *pll,
-                                      int (*is_enabled)(struct clk_hw *))
+
+static int __clk_alpha_pll_update_latch(struct clk_alpha_pll *pll)
 {
         int ret;
         u32 mode;
 
-        if (!is_enabled(&pll->clkr.hw) ||
-            !(pll->flags & SUPPORTS_DYNAMIC_UPDATE))
-                return 0;
-
         regmap_read(pll->clkr.regmap, PLL_MODE(pll), &mode);
 
         /* Latch the input to the PLL */
@@ -489,6 +505,16 @@ static int clk_alpha_pll_update_latch(struct clk_alpha_pll *pll,
         return 0;
 }
 
+static int clk_alpha_pll_update_latch(struct clk_alpha_pll *pll,
+                                      int (*is_enabled)(struct clk_hw *))
+{
+        if (!is_enabled(&pll->clkr.hw) ||
+            !(pll->flags & SUPPORTS_DYNAMIC_UPDATE))
+                return 0;
+
+        return __clk_alpha_pll_update_latch(pll);
+}
+
 static int __clk_alpha_pll_set_rate(struct clk_hw *hw, unsigned long rate,
                                     unsigned long prate,
                                     int (*is_enabled)(struct clk_hw *))
@@ -832,3 +858,265 @@ const struct clk_ops clk_alpha_pll_postdiv_ro_ops = {
         .recalc_rate = clk_alpha_pll_postdiv_recalc_rate,
 };
 EXPORT_SYMBOL_GPL(clk_alpha_pll_postdiv_ro_ops);
+
+void clk_fabia_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,
+                             const struct alpha_pll_config *config)
+{
+        u32 val, mask;
+
+        if (config->l)
+                regmap_write(regmap, PLL_L_VAL(pll), config->l);
+
+        if (config->alpha)
+                regmap_write(regmap, PLL_FRAC(pll), config->alpha);
+
+        if (config->config_ctl_val)
+                regmap_write(regmap, PLL_CONFIG_CTL(pll),
+                                                config->config_ctl_val);
+
+        if (config->post_div_mask) {
+                mask = config->post_div_mask;
+                val = config->post_div_val;
+                regmap_update_bits(regmap, PLL_USER_CTL(pll), mask, val);
+        }
+
+        regmap_update_bits(regmap, PLL_MODE(pll), PLL_UPDATE_BYPASS,
+                                                        PLL_UPDATE_BYPASS);
+
+        regmap_update_bits(regmap, PLL_MODE(pll), PLL_RESET_N, PLL_RESET_N);
+}
+EXPORT_SYMBOL_GPL(clk_fabia_pll_configure);
+
+static int alpha_pll_fabia_enable(struct clk_hw *hw)
+{
+        int ret;
+        struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);
+        u32 val, opmode_val;
+        struct regmap *regmap = pll->clkr.regmap;
+
+        ret = regmap_read(regmap, PLL_MODE(pll), &val);
+        if (ret)
+                return ret;
+
+        /* If in FSM mode, just vote for it */
+        if (val & PLL_VOTE_FSM_ENA) {
+                ret = clk_enable_regmap(hw);
+                if (ret)
+                        return ret;
+                return wait_for_pll_enable_active(pll);
+        }
+
+        ret = regmap_read(regmap, PLL_OPMODE(pll), &opmode_val);
+        if (ret)
+                return ret;
+
+        /* Skip If PLL is already running */
+        if ((opmode_val & FABIA_OPMODE_RUN) && (val & PLL_OUTCTRL))
+                return 0;
+
+        ret = regmap_update_bits(regmap, PLL_MODE(pll), PLL_OUTCTRL, 0);
+        if (ret)
+                return ret;
+
+        ret = regmap_write(regmap, PLL_OPMODE(pll), FABIA_OPMODE_STANDBY);
+        if (ret)
+                return ret;
+
+        ret = regmap_update_bits(regmap, PLL_MODE(pll), PLL_RESET_N,
+                                 PLL_RESET_N);
+        if (ret)
+                return ret;
+
+        ret = regmap_write(regmap, PLL_OPMODE(pll), FABIA_OPMODE_RUN);
+        if (ret)
+                return ret;
+
+        ret = wait_for_pll_enable_lock(pll);
+        if (ret)
+                return ret;
+
+        ret = regmap_update_bits(regmap, PLL_USER_CTL(pll),
+                                 FABIA_PLL_OUT_MASK, FABIA_PLL_OUT_MASK);
+        if (ret)
+                return ret;
+
+        return regmap_update_bits(regmap, PLL_MODE(pll), PLL_OUTCTRL,
+                                 PLL_OUTCTRL);
+}
+
+static void alpha_pll_fabia_disable(struct clk_hw *hw)
+{
+        int ret;
+        struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);
+        u32 val;
+        struct regmap *regmap = pll->clkr.regmap;
+
+        ret = regmap_read(regmap, PLL_MODE(pll), &val);
+        if (ret)
+                return;
+
+        /* If in FSM mode, just unvote it */
+        if (val & PLL_FSM_ENA) {
+                clk_disable_regmap(hw);
+                return;
+        }
+
+        ret = regmap_update_bits(regmap, PLL_MODE(pll), PLL_OUTCTRL, 0);
+        if (ret)
+                return;
+
+        /* Disable main outputs */
+        ret = regmap_update_bits(regmap, PLL_USER_CTL(pll), FABIA_PLL_OUT_MASK,
+                                 0);
+        if (ret)
+                return;
+
+        /* Place the PLL in STANDBY */
+        regmap_write(regmap, PLL_OPMODE(pll), FABIA_OPMODE_STANDBY);
+}
+
+static unsigned long alpha_pll_fabia_recalc_rate(struct clk_hw *hw,
+                                                unsigned long parent_rate)
+{
+        struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);
+        u32 l, frac, alpha_width = pll_alpha_width(pll);
+
+        regmap_read(pll->clkr.regmap, PLL_L_VAL(pll), &l);
+        regmap_read(pll->clkr.regmap, PLL_FRAC(pll), &frac);
+
+        return alpha_pll_calc_rate(parent_rate, l, frac, alpha_width);
+}
+
+static int alpha_pll_fabia_set_rate(struct clk_hw *hw, unsigned long rate,
+                                                unsigned long prate)
+{
+        struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);
+        u32 val, l, alpha_width = pll_alpha_width(pll);
+        u64 a;
+        unsigned long rrate;
+        int ret = 0;
+
+        ret = regmap_read(pll->clkr.regmap, PLL_MODE(pll), &val);
+        if (ret)
+                return ret;
+
+        rrate = alpha_pll_round_rate(rate, prate, &l, &a, alpha_width);
+
+        /*
+         * Due to limited number of bits for fractional rate programming, the
+         * rounded up rate could be marginally higher than the requested rate.
+         */
+        if (rrate > (rate + FABIA_PLL_RATE_MARGIN) || rrate < rate) {
+                pr_err("Call set rate on the PLL with rounded rates!\n");
+                return -EINVAL;
+        }
+
+        regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l);
+        regmap_write(pll->clkr.regmap, PLL_FRAC(pll), a);
+
+        return __clk_alpha_pll_update_latch(pll);
+}
+
+const struct clk_ops clk_alpha_pll_fabia_ops = {
+        .enable = alpha_pll_fabia_enable,
+        .disable = alpha_pll_fabia_disable,
+        .is_enabled = clk_alpha_pll_is_enabled,
+        .set_rate = alpha_pll_fabia_set_rate,
+        .recalc_rate = alpha_pll_fabia_recalc_rate,
+        .round_rate = clk_alpha_pll_round_rate,
+};
+EXPORT_SYMBOL_GPL(clk_alpha_pll_fabia_ops);
+
+const struct clk_ops clk_alpha_pll_fixed_fabia_ops = {
+        .enable = alpha_pll_fabia_enable,
+        .disable = alpha_pll_fabia_disable,
+        .is_enabled = clk_alpha_pll_is_enabled,
+        .recalc_rate = alpha_pll_fabia_recalc_rate,
+        .round_rate = clk_alpha_pll_round_rate,
+};
+EXPORT_SYMBOL_GPL(clk_alpha_pll_fixed_fabia_ops);
+
+static unsigned long clk_alpha_pll_postdiv_fabia_recalc_rate(struct clk_hw *hw,
+                                        unsigned long parent_rate)
+{
+        struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
+        u32 i, div = 1, val;
+        int ret;
+
+        if (!pll->post_div_table) {
+                pr_err("Missing the post_div_table for the PLL\n");
+                return -EINVAL;
+        }
+
+        ret = regmap_read(pll->clkr.regmap, PLL_USER_CTL(pll), &val);
+        if (ret)
+                return ret;
+
+        val >>= pll->post_div_shift;
+        val &= BIT(pll->width) - 1;
+
+        for (i = 0; i < pll->num_post_div; i++) {
+                if (pll->post_div_table[i].val == val) {
+                        div = pll->post_div_table[i].div;
+                        break;
+                }
+        }
+
+        return (parent_rate / div);
+}
+
+static long clk_alpha_pll_postdiv_fabia_round_rate(struct clk_hw *hw,
+                                unsigned long rate, unsigned long *prate)
+{
+        struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
+
+        if (!pll->post_div_table) {
+                pr_err("Missing the post_div_table for the PLL\n");
+                return -EINVAL;
+        }
+
+        return divider_round_rate(hw, rate, prate, pll->post_div_table,
+                                pll->width, CLK_DIVIDER_ROUND_CLOSEST);
+}
+
+static int clk_alpha_pll_postdiv_fabia_set_rate(struct clk_hw *hw,
+                                unsigned long rate, unsigned long parent_rate)
+{
+        struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
+        int i, val = 0, div, ret;
+
+        /*
+         * If the PLL is in FSM mode, then treat set_rate callback as a
+         * no-operation.
+         */
+        ret = regmap_read(pll->clkr.regmap, PLL_MODE(pll), &val);
+        if (ret)
+                return ret;
+
+        if (val & PLL_VOTE_FSM_ENA)
+                return 0;
+
+        if (!pll->post_div_table) {
+                pr_err("Missing the post_div_table for the PLL\n");
+                return -EINVAL;
+        }
+
+        div = DIV_ROUND_UP_ULL((u64)parent_rate, rate);
+        for (i = 0; i < pll->num_post_div; i++) {
+                if (pll->post_div_table[i].div == div) {
+                        val = pll->post_div_table[i].val;
+                        break;
+                }
+        }
+
+        return regmap_update_bits(pll->clkr.regmap, PLL_USER_CTL(pll),
+                                (BIT(pll->width) - 1) << pll->post_div_shift,
+                                val << pll->post_div_shift);
+}
+
+const struct clk_ops clk_alpha_pll_postdiv_fabia_ops = {
+        .recalc_rate = clk_alpha_pll_postdiv_fabia_recalc_rate,
+        .round_rate = clk_alpha_pll_postdiv_fabia_round_rate,
+        .set_rate = clk_alpha_pll_postdiv_fabia_set_rate,
+};
+EXPORT_SYMBOL_GPL(clk_alpha_pll_postdiv_fabia_ops);
diff --git a/drivers/clk/qcom/clk-alpha-pll.h b/drivers/clk/qcom/clk-alpha-pll.h
index 7593e8a56cf2..f981b486c468 100644
--- a/drivers/clk/qcom/clk-alpha-pll.h
+++ b/drivers/clk/qcom/clk-alpha-pll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015, 2018, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -22,6 +22,7 @@ enum {
         CLK_ALPHA_PLL_TYPE_DEFAULT,
         CLK_ALPHA_PLL_TYPE_HUAYRA,
         CLK_ALPHA_PLL_TYPE_BRAMMO,
+        CLK_ALPHA_PLL_TYPE_FABIA,
         CLK_ALPHA_PLL_TYPE_MAX,
 };
 
@@ -36,6 +37,8 @@ enum {
         PLL_OFF_TEST_CTL,
         PLL_OFF_TEST_CTL_U,
         PLL_OFF_STATUS,
+        PLL_OFF_OPMODE,
+        PLL_OFF_FRAC,
         PLL_OFF_MAX_REGS
 };
 
@@ -73,6 +76,10 @@ struct clk_alpha_pll {
  * @offset: base address of registers
  * @regs: alpha pll register map (see @clk_alpha_pll_regs)
  * @width: width of post-divider
+ * @post_div_shift: shift to differentiate between odd & even post-divider
+ * @post_div_table: table with PLL odd and even post-divider settings
+ * @num_post_div: Number of PLL post-divider settings
+ *
  * @clkr: regmap clock handle
  */
 struct clk_alpha_pll_postdiv {
@@ -81,6 +88,9 @@ struct clk_alpha_pll_postdiv {
         const u8 *regs;
 
         struct clk_regmap clkr;
+        int post_div_shift;
+        const struct clk_div_table *post_div_table;
+        size_t num_post_div;
 };
 
 struct alpha_pll_config {
@@ -109,7 +119,13 @@ extern const struct clk_ops clk_alpha_pll_postdiv_ops;
 extern const struct clk_ops clk_alpha_pll_huayra_ops;
 extern const struct clk_ops clk_alpha_pll_postdiv_ro_ops;
 
+extern const struct clk_ops clk_alpha_pll_fabia_ops;
+extern const struct clk_ops clk_alpha_pll_fixed_fabia_ops;
+extern const struct clk_ops clk_alpha_pll_postdiv_fabia_ops;
+
 void clk_alpha_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,
                              const struct alpha_pll_config *config);
+void clk_fabia_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,
+                                const struct alpha_pll_config *config);
 
 #endif
diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c
index 26f7af315066..c58c5538b1b6 100644
--- a/drivers/clk/qcom/clk-branch.c
+++ b/drivers/clk/qcom/clk-branch.c
@@ -77,8 +77,11 @@ static int clk_branch_wait(const struct clk_branch *br, bool enabling,
         bool voted = br->halt_check & BRANCH_VOTED;
         const char *name = clk_hw_get_name(&br->clkr.hw);
 
-        /* Skip checking halt bit if the clock is in hardware gated mode */
-        if (clk_branch_in_hwcg_mode(br))
+        /*
+         * Skip checking halt bit if we're explicitly ignoring the bit or the
+         * clock is in hardware gated mode
+         */
+        if (br->halt_check == BRANCH_HALT_SKIP || clk_branch_in_hwcg_mode(br))
                 return 0;
 
         if (br->halt_check == BRANCH_HALT_DELAY || (!enabling && voted)) {
diff --git a/drivers/clk/qcom/clk-branch.h b/drivers/clk/qcom/clk-branch.h
index 284df3f3c55f..1702efb1c511 100644
--- a/drivers/clk/qcom/clk-branch.h
+++ b/drivers/clk/qcom/clk-branch.h
@@ -42,6 +42,7 @@ struct clk_branch {
 #define BRANCH_HALT_ENABLE              1 /* pol: 0 = halt */
 #define BRANCH_HALT_ENABLE_VOTED        (BRANCH_HALT_ENABLE | BRANCH_VOTED)
 #define BRANCH_HALT_DELAY               2 /* No bit to check; just delay */
+#define BRANCH_HALT_SKIP                3 /* Don't check halt bit */
 
         struct clk_regmap clkr;
 };
diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h
index 2a7489a84e69..b209a2fe86b9 100644
--- a/drivers/clk/qcom/clk-rcg.h
+++ b/drivers/clk/qcom/clk-rcg.h
@@ -1,15 +1,5 @@
-/*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2013, 2018, The Linux Foundation. All rights reserved. */
 
 #ifndef __QCOM_CLK_RCG_H__
 #define __QCOM_CLK_RCG_H__
@@ -144,6 +134,7 @@ extern const struct clk_ops clk_dyn_rcg_ops;
  * @cmd_rcgr: corresponds to *_CMD_RCGR
  * @mnd_width: number of bits in m/n/d values
  * @hid_width: number of bits in half integer divider
+ * @safe_src_index: safe src index value
  * @parent_map: map from software's parent index to hardware's src_sel field
  * @freq_tbl: frequency table
  * @clkr: regmap clock handle
@@ -153,6 +144,7 @@ struct clk_rcg2 {
         u32                     cmd_rcgr;
         u8                      mnd_width;
         u8                      hid_width;
+        u8                      safe_src_index;
         const struct parent_map *parent_map;
         const struct freq_tbl   *freq_tbl;
         struct clk_regmap       clkr;
@@ -167,5 +159,6 @@ extern const struct clk_ops clk_byte_ops;
 extern const struct clk_ops clk_byte2_ops;
 extern const struct clk_ops clk_pixel_ops;
 extern const struct clk_ops clk_gfx3d_ops;
+extern const struct clk_ops clk_rcg2_shared_ops;
 
 #endif
diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
index ec6cee8ff1bc..52208d4165f4 100644
--- a/drivers/clk/qcom/clk-rcg2.c
+++ b/drivers/clk/qcom/clk-rcg2.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Copyright (c) 2013, 2018, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/kernel.h>
@@ -42,6 +34,7 @@
 #define CFG_MODE_SHIFT          12
 #define CFG_MODE_MASK           (0x3 << CFG_MODE_SHIFT)
 #define CFG_MODE_DUAL_EDGE      (0x2 << CFG_MODE_SHIFT)
+#define CFG_HW_CLK_CTRL_MASK    BIT(20)
 
 #define M_REG                   0x8
 #define N_REG                   0xc
@@ -249,7 +242,7 @@ static int clk_rcg2_determine_floor_rate(struct clk_hw *hw,
         return _freq_tbl_determine_rate(hw, rcg->freq_tbl, req, FLOOR);
 }
 
-static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
+static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
 {
         u32 cfg, mask;
         struct clk_hw *hw = &rcg->clkr.hw;
@@ -277,13 +270,21 @@ static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
         }
 
         mask = BIT(rcg->hid_width) - 1;
-        mask |= CFG_SRC_SEL_MASK | CFG_MODE_MASK;
+        mask |= CFG_SRC_SEL_MASK | CFG_MODE_MASK | CFG_HW_CLK_CTRL_MASK;
         cfg = f->pre_div << CFG_SRC_DIV_SHIFT;
         cfg |= rcg->parent_map[index].cfg << CFG_SRC_SEL_SHIFT;
         if (rcg->mnd_width && f->n && (f->m != f->n))
                 cfg |= CFG_MODE_DUAL_EDGE;
-        ret = regmap_update_bits(rcg->clkr.regmap,
-                        rcg->cmd_rcgr + CFG_REG, mask, cfg);
+
+        return regmap_update_bits(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG,
+                                        mask, cfg);
+}
+
+static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
+{
+        int ret;
+
+        ret = __clk_rcg2_configure(rcg, f);
         if (ret)
                 return ret;
 
@@ -790,3 +791,141 @@ const struct clk_ops clk_gfx3d_ops = {
         .determine_rate = clk_gfx3d_determine_rate,
 };
 EXPORT_SYMBOL_GPL(clk_gfx3d_ops);
+
+static int clk_rcg2_set_force_enable(struct clk_hw *hw)
+{
+        struct clk_rcg2 *rcg = to_clk_rcg2(hw);
+        const char *name = clk_hw_get_name(hw);
+        int ret, count;
+
+        ret = regmap_update_bits(rcg->clkr.regmap, rcg->cmd_rcgr + CMD_REG,
+                                 CMD_ROOT_EN, CMD_ROOT_EN);
+        if (ret)
+                return ret;
+
+        /* wait for RCG to turn ON */
+        for (count = 500; count > 0; count--) {
+                if (clk_rcg2_is_enabled(hw))
+                        return 0;
+
+                udelay(1);
+        }
+
+        pr_err("%s: RCG did not turn on\n", name);
+        return -ETIMEDOUT;
+}
+
+static int clk_rcg2_clear_force_enable(struct clk_hw *hw)
+{
+        struct clk_rcg2 *rcg = to_clk_rcg2(hw);
+
+        return regmap_update_bits(rcg->clkr.regmap, rcg->cmd_rcgr + CMD_REG,
+                                        CMD_ROOT_EN, 0);
+}
+
+static int
+clk_rcg2_shared_force_enable_clear(struct clk_hw *hw, const struct freq_tbl *f)
+{
+        struct clk_rcg2 *rcg = to_clk_rcg2(hw);
+        int ret;
+
+        ret = clk_rcg2_set_force_enable(hw);
+        if (ret)
+                return ret;
+
+        ret = clk_rcg2_configure(rcg, f);
+        if (ret)
+                return ret;
+
+        return clk_rcg2_clear_force_enable(hw);
+}
+
+static int clk_rcg2_shared_set_rate(struct clk_hw *hw, unsigned long rate,
+                                    unsigned long parent_rate)
+{
+        struct clk_rcg2 *rcg = to_clk_rcg2(hw);
+        const struct freq_tbl *f;
+
+        f = qcom_find_freq(rcg->freq_tbl, rate);
+        if (!f)
+                return -EINVAL;
+
+        /*
+         * In case clock is disabled, update the CFG, M, N and D registers
+         * and don't hit the update bit of CMD register.
+         */
+        if (!__clk_is_enabled(hw->clk))
+                return __clk_rcg2_configure(rcg, f);
+
+        return clk_rcg2_shared_force_enable_clear(hw, f);
+}
+
+static int clk_rcg2_shared_set_rate_and_parent(struct clk_hw *hw,
+                unsigned long rate, unsigned long parent_rate, u8 index)
+{
+        return clk_rcg2_shared_set_rate(hw, rate, parent_rate);
+}
+
+static int clk_rcg2_shared_enable(struct clk_hw *hw)
+{
+        struct clk_rcg2 *rcg = to_clk_rcg2(hw);
+        int ret;
+
+        /*
+         * Set the update bit because required configuration has already
+         * been written in clk_rcg2_shared_set_rate()
+         */
+        ret = clk_rcg2_set_force_enable(hw);
+        if (ret)
+                return ret;
+
+        ret = update_config(rcg);
+        if (ret)
+                return ret;
+
+        return clk_rcg2_clear_force_enable(hw);
+}
+
+static void clk_rcg2_shared_disable(struct clk_hw *hw)
+{
+        struct clk_rcg2 *rcg = to_clk_rcg2(hw);
+        u32 cfg;
+
+        /*
+         * Store current configuration as switching to safe source would clear
+         * the SRC and DIV of CFG register
+         */
+        regmap_read(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG, &cfg);
+
+        /*
+         * Park the RCG at a safe configuration - sourced off of safe source.
+         * Force enable and disable the RCG while configuring it to safeguard
+         * against any update signal coming from the downstream clock.
+         * The current parent is still prepared and enabled at this point, and
+         * the safe source is always on while application processor subsystem
+         * is online. Therefore, the RCG can safely switch its parent.
+         */
+        clk_rcg2_set_force_enable(hw);
+
+        regmap_write(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG,
+                     rcg->safe_src_index << CFG_SRC_SEL_SHIFT);
+
+        update_config(rcg);
+
+        clk_rcg2_clear_force_enable(hw);
+
+        /* Write back the stored configuration corresponding to current rate */
+        regmap_write(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG, cfg);
+}
+
+const struct clk_ops clk_rcg2_shared_ops = {
+        .enable = clk_rcg2_shared_enable,
+        .disable = clk_rcg2_shared_disable,
+        .get_parent = clk_rcg2_get_parent,
+        .set_parent = clk_rcg2_set_parent,
+        .recalc_rate = clk_rcg2_recalc_rate,
+        .determine_rate = clk_rcg2_determine_rate,
+        .set_rate = clk_rcg2_shared_set_rate,
+        .set_rate_and_parent = clk_rcg2_shared_set_rate_and_parent,
+};
+EXPORT_SYMBOL_GPL(clk_rcg2_shared_ops);
diff --git a/drivers/clk/qcom/gcc-sdm845.c b/drivers/clk/qcom/gcc-sdm845.c
new file mode 100644
index 000000000000..e78e6f5b99fc
--- /dev/null
+++ b/drivers/clk/qcom/gcc-sdm845.c
@@ -0,0 +1,3465 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+#include <linux/kernel.h>
+#include <linux/bitops.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/clk-provider.h>
+#include <linux/regmap.h>
+#include <linux/reset-controller.h>
+
+#include <dt-bindings/clock/qcom,gcc-sdm845.h>
+
+#include "common.h"
+#include "clk-regmap.h"
+#include "clk-pll.h"
+#include "clk-rcg.h"
+#include "clk-branch.h"
+#include "clk-alpha-pll.h"
+#include "gdsc.h"
+#include "reset.h"
+
+#define F(f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) }
+
+enum {
+        P_BI_TCXO,
+        P_AUD_REF_CLK,
+        P_CORE_BI_PLL_TEST_SE,
+        P_GPLL0_OUT_EVEN,
+        P_GPLL0_OUT_MAIN,
+        P_GPLL4_OUT_MAIN,
+        P_SLEEP_CLK,
+};
+
+static const struct parent_map gcc_parent_map_0[] = {
+        { P_BI_TCXO, 0 },
+        { P_GPLL0_OUT_MAIN, 1 },
+        { P_GPLL0_OUT_EVEN, 6 },
+        { P_CORE_BI_PLL_TEST_SE, 7 },
+};
+
+static const char * const gcc_parent_names_0[] = {
+        "bi_tcxo",
+        "gpll0",
+        "gpll0_out_even",
+        "core_bi_pll_test_se",
+};
+
+static const struct parent_map gcc_parent_map_1[] = {
+        { P_BI_TCXO, 0 },
+        { P_GPLL0_OUT_MAIN, 1 },
+        { P_SLEEP_CLK, 5 },
+        { P_GPLL0_OUT_EVEN, 6 },
+        { P_CORE_BI_PLL_TEST_SE, 7 },
+};
+
+static const char * const gcc_parent_names_1[] = {
+        "bi_tcxo",
+        "gpll0",
+        "core_pi_sleep_clk",
+        "gpll0_out_even",
+        "core_bi_pll_test_se",
+};
+
+static const struct parent_map gcc_parent_map_2[] = {
+        { P_BI_TCXO, 0 },
+        { P_SLEEP_CLK, 5 },
+        { P_CORE_BI_PLL_TEST_SE, 7 },
+};
+
+static const char * const gcc_parent_names_2[] = {
+        "bi_tcxo",
+        "core_pi_sleep_clk",
+        "core_bi_pll_test_se",
+};
+
+static const struct parent_map gcc_parent_map_3[] = {
+        { P_BI_TCXO, 0 },
+        { P_GPLL0_OUT_MAIN, 1 },
+        { P_CORE_BI_PLL_TEST_SE, 7 },
+};
+
+static const char * const gcc_parent_names_3[] = {
+        "bi_tcxo",
+        "gpll0",
+        "core_bi_pll_test_se",
+};
+
+static const struct parent_map gcc_parent_map_4[] = {
+        { P_BI_TCXO, 0 },
+        { P_CORE_BI_PLL_TEST_SE, 7 },
+};
+
+static const char * const gcc_parent_names_4[] = {
+        "bi_tcxo",
+        "core_bi_pll_test_se",
+};
+
+static const struct parent_map gcc_parent_map_5[] = {
+        { P_BI_TCXO, 0 },
+        { P_GPLL0_OUT_MAIN, 1 },
+        { P_GPLL4_OUT_MAIN, 5 },
+        { P_GPLL0_OUT_EVEN, 6 },
+        { P_CORE_BI_PLL_TEST_SE, 7 },
+};
+
+static const char * const gcc_parent_names_5[] = {
+        "bi_tcxo",
+        "gpll0",
+        "gpll4",
+        "gpll0_out_even",
+        "core_bi_pll_test_se",
+};
+
+static const struct parent_map gcc_parent_map_6[] = {
+        { P_BI_TCXO, 0 },
+        { P_GPLL0_OUT_MAIN, 1 },
+        { P_AUD_REF_CLK, 2 },
+        { P_GPLL0_OUT_EVEN, 6 },
+        { P_CORE_BI_PLL_TEST_SE, 7 },
+};
+
+static const char * const gcc_parent_names_6[] = {
+        "bi_tcxo",
+        "gpll0",
+        "aud_ref_clk",
+        "gpll0_out_even",
+        "core_bi_pll_test_se",
+};
+
+static const char * const gcc_parent_names_7[] = {
+        "bi_tcxo",
+        "gpll0",
+        "gpll0_out_even",
+        "core_bi_pll_test_se",
+};
+
+static const char * const gcc_parent_names_8[] = {
+        "bi_tcxo",
+        "gpll0",
+        "core_bi_pll_test_se",
+};
+
+static const struct parent_map gcc_parent_map_10[] = {
+        { P_BI_TCXO, 0 },
+        { P_GPLL0_OUT_MAIN, 1 },
+        { P_GPLL4_OUT_MAIN, 5 },
+        { P_GPLL0_OUT_EVEN, 6 },
+        { P_CORE_BI_PLL_TEST_SE, 7 },
+};
+
+static const char * const gcc_parent_names_10[] = {
+        "bi_tcxo",
+        "gpll0",
+        "gpll4",
+        "gpll0_out_even",
+        "core_bi_pll_test_se",
+};
+
+static struct clk_alpha_pll gpll0 = {
+        .offset = 0x0,
+        .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_FABIA],
+        .clkr = {
+                .enable_reg = 0x52000,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gpll0",
+                        .parent_names = (const char *[]){ "bi_tcxo" },
+                        .num_parents = 1,
+                        .ops = &clk_alpha_pll_fixed_fabia_ops,
+                },
+        },
+};
+
+static struct clk_alpha_pll gpll4 = {
+        .offset = 0x76000,
+        .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_FABIA],
+        .clkr = {
+                .enable_reg = 0x52000,
+                .enable_mask = BIT(4),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gpll4",
+                        .parent_names = (const char *[]){ "bi_tcxo" },
+                        .num_parents = 1,
+                        .ops = &clk_alpha_pll_fixed_fabia_ops,
+                },
+        },
+};
+
+static const struct clk_div_table post_div_table_fabia_even[] = {
+        { 0x0, 1 },
+        { 0x1, 2 },
+        { 0x3, 4 },
+        { 0x7, 8 },
+        { }
+};
+
+static struct clk_alpha_pll_postdiv gpll0_out_even = {
+        .offset = 0x0,
+        .post_div_shift = 8,
+        .post_div_table = post_div_table_fabia_even,
+        .num_post_div = ARRAY_SIZE(post_div_table_fabia_even),
+        .width = 4,
+        .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_FABIA],
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gpll0_out_even",
+                .parent_names = (const char *[]){ "gpll0" },
+                .num_parents = 1,
+                .ops = &clk_alpha_pll_postdiv_fabia_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_cpuss_ahb_clk_src[] = {
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_cpuss_ahb_clk_src = {
+        .cmd_rcgr = 0x48014,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_cpuss_ahb_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_cpuss_ahb_clk_src",
+                .parent_names = gcc_parent_names_7,
+                .num_parents = 4,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_cpuss_rbcpr_clk_src[] = {
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_cpuss_rbcpr_clk_src = {
+        .cmd_rcgr = 0x4815c,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_3,
+        .freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_cpuss_rbcpr_clk_src",
+                .parent_names = gcc_parent_names_8,
+                .num_parents = 3,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_gp1_clk_src[] = {
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        F(25000000, P_GPLL0_OUT_EVEN, 12, 0, 0),
+        F(50000000, P_GPLL0_OUT_EVEN, 6, 0, 0),
+        F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+        F(200000000, P_GPLL0_OUT_MAIN, 3, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_gp1_clk_src = {
+        .cmd_rcgr = 0x64004,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_1,
+        .freq_tbl = ftbl_gcc_gp1_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_gp1_clk_src",
+                .parent_names = gcc_parent_names_1,
+                .num_parents = 5,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_gp2_clk_src = {
+        .cmd_rcgr = 0x65004,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_1,
+        .freq_tbl = ftbl_gcc_gp1_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_gp2_clk_src",
+                .parent_names = gcc_parent_names_1,
+                .num_parents = 5,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_gp3_clk_src = {
+        .cmd_rcgr = 0x66004,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_1,
+        .freq_tbl = ftbl_gcc_gp1_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_gp3_clk_src",
+                .parent_names = gcc_parent_names_1,
+                .num_parents = 5,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_pcie_0_aux_clk_src[] = {
+        F(9600000, P_BI_TCXO, 2, 0, 0),
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_pcie_0_aux_clk_src = {
+        .cmd_rcgr = 0x6b028,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_2,
+        .freq_tbl = ftbl_gcc_pcie_0_aux_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_pcie_0_aux_clk_src",
+                .parent_names = gcc_parent_names_2,
+                .num_parents = 3,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_pcie_1_aux_clk_src = {
+        .cmd_rcgr = 0x8d028,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_2,
+        .freq_tbl = ftbl_gcc_pcie_0_aux_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_pcie_1_aux_clk_src",
+                .parent_names = gcc_parent_names_2,
+                .num_parents = 3,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_pcie_phy_refgen_clk_src[] = {
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_pcie_phy_refgen_clk_src = {
+        .cmd_rcgr = 0x6f014,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_pcie_phy_refgen_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_pcie_phy_refgen_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_pdm2_clk_src[] = {
+        F(9600000, P_BI_TCXO, 2, 0, 0),
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        F(60000000, P_GPLL0_OUT_MAIN, 10, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_pdm2_clk_src = {
+        .cmd_rcgr = 0x33010,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_pdm2_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_pdm2_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_qupv3_wrap0_s0_clk_src[] = {
+        F(7372800, P_GPLL0_OUT_EVEN, 1, 384, 15625),
+        F(14745600, P_GPLL0_OUT_EVEN, 1, 768, 15625),
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        F(29491200, P_GPLL0_OUT_EVEN, 1, 1536, 15625),
+        F(32000000, P_GPLL0_OUT_EVEN, 1, 8, 75),
+        F(48000000, P_GPLL0_OUT_EVEN, 1, 4, 25),
+        F(64000000, P_GPLL0_OUT_EVEN, 1, 16, 75),
+        F(80000000, P_GPLL0_OUT_EVEN, 1, 4, 15),
+        F(96000000, P_GPLL0_OUT_EVEN, 1, 8, 25),
+        F(100000000, P_GPLL0_OUT_EVEN, 3, 0, 0),
+        F(102400000, P_GPLL0_OUT_EVEN, 1, 128, 375),
+        F(112000000, P_GPLL0_OUT_EVEN, 1, 28, 75),
+        F(117964800, P_GPLL0_OUT_EVEN, 1, 6144, 15625),
+        F(120000000, P_GPLL0_OUT_EVEN, 2.5, 0, 0),
+        F(128000000, P_GPLL0_OUT_MAIN, 1, 16, 75),
+        { }
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap0_s0_clk_src = {
+        .cmd_rcgr = 0x17034,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap0_s0_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap0_s1_clk_src = {
+        .cmd_rcgr = 0x17164,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap0_s1_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap0_s2_clk_src = {
+        .cmd_rcgr = 0x17294,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap0_s2_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap0_s3_clk_src = {
+        .cmd_rcgr = 0x173c4,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap0_s3_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap0_s4_clk_src = {
+        .cmd_rcgr = 0x174f4,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap0_s4_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap0_s5_clk_src = {
+        .cmd_rcgr = 0x17624,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap0_s5_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap0_s6_clk_src = {
+        .cmd_rcgr = 0x17754,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap0_s6_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap0_s7_clk_src = {
+        .cmd_rcgr = 0x17884,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap0_s7_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap1_s0_clk_src = {
+        .cmd_rcgr = 0x18018,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap1_s0_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap1_s1_clk_src = {
+        .cmd_rcgr = 0x18148,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap1_s1_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap1_s2_clk_src = {
+        .cmd_rcgr = 0x18278,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap1_s2_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap1_s3_clk_src = {
+        .cmd_rcgr = 0x183a8,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap1_s3_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap1_s4_clk_src = {
+        .cmd_rcgr = 0x184d8,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap1_s4_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap1_s5_clk_src = {
+        .cmd_rcgr = 0x18608,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap1_s5_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap1_s6_clk_src = {
+        .cmd_rcgr = 0x18738,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap1_s6_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_qupv3_wrap1_s7_clk_src = {
+        .cmd_rcgr = 0x18868,
+        .mnd_width = 16,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_qupv3_wrap1_s7_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_sdcc2_apps_clk_src[] = {
+        F(400000, P_BI_TCXO, 12, 1, 4),
+        F(9600000, P_BI_TCXO, 2, 0, 0),
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        F(25000000, P_GPLL0_OUT_EVEN, 12, 0, 0),
+        F(50000000, P_GPLL0_OUT_EVEN, 6, 0, 0),
+        F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+        F(201500000, P_GPLL4_OUT_MAIN, 4, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
+        .cmd_rcgr = 0x1400c,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_10,
+        .freq_tbl = ftbl_gcc_sdcc2_apps_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_sdcc2_apps_clk_src",
+                .parent_names = gcc_parent_names_10,
+                .num_parents = 5,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_sdcc4_apps_clk_src[] = {
+        F(400000, P_BI_TCXO, 12, 1, 4),
+        F(9600000, P_BI_TCXO, 2, 0, 0),
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        F(25000000, P_GPLL0_OUT_MAIN, 12, 1, 2),
+        F(50000000, P_GPLL0_OUT_MAIN, 12, 0, 0),
+        F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_sdcc4_apps_clk_src = {
+        .cmd_rcgr = 0x1600c,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_sdcc4_apps_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_sdcc4_apps_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_tsif_ref_clk_src[] = {
+        F(105495, P_BI_TCXO, 2, 1, 91),
+        { }
+};
+
+static struct clk_rcg2 gcc_tsif_ref_clk_src = {
+        .cmd_rcgr = 0x36010,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_6,
+        .freq_tbl = ftbl_gcc_tsif_ref_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_tsif_ref_clk_src",
+                .parent_names = gcc_parent_names_6,
+                .num_parents = 5,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_ufs_card_axi_clk_src[] = {
+        F(25000000, P_GPLL0_OUT_EVEN, 12, 0, 0),
+        F(50000000, P_GPLL0_OUT_EVEN, 6, 0, 0),
+        F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+        F(200000000, P_GPLL0_OUT_MAIN, 3, 0, 0),
+        F(240000000, P_GPLL0_OUT_MAIN, 2.5, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_ufs_card_axi_clk_src = {
+        .cmd_rcgr = 0x7501c,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_ufs_card_axi_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_ufs_card_axi_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_ufs_card_ice_core_clk_src[] = {
+        F(37500000, P_GPLL0_OUT_EVEN, 8, 0, 0),
+        F(75000000, P_GPLL0_OUT_EVEN, 4, 0, 0),
+        F(150000000, P_GPLL0_OUT_MAIN, 4, 0, 0),
+        F(300000000, P_GPLL0_OUT_MAIN, 2, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_ufs_card_ice_core_clk_src = {
+        .cmd_rcgr = 0x7505c,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_ufs_card_ice_core_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_ufs_card_ice_core_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_ufs_card_phy_aux_clk_src = {
+        .cmd_rcgr = 0x75090,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_4,
+        .freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_ufs_card_phy_aux_clk_src",
+                .parent_names = gcc_parent_names_4,
+                .num_parents = 2,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_ufs_card_unipro_core_clk_src[] = {
+        F(37500000, P_GPLL0_OUT_EVEN, 8, 0, 0),
+        F(75000000, P_GPLL0_OUT_MAIN, 8, 0, 0),
+        F(150000000, P_GPLL0_OUT_MAIN, 4, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_ufs_card_unipro_core_clk_src = {
+        .cmd_rcgr = 0x75074,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_ufs_card_unipro_core_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_ufs_card_unipro_core_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_ufs_phy_axi_clk_src[] = {
+        F(25000000, P_GPLL0_OUT_EVEN, 12, 0, 0),
+        F(50000000, P_GPLL0_OUT_EVEN, 6, 0, 0),
+        F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+        F(200000000, P_GPLL0_OUT_MAIN, 3, 0, 0),
+        F(240000000, P_GPLL0_OUT_MAIN, 2.5, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_ufs_phy_axi_clk_src = {
+        .cmd_rcgr = 0x7701c,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_ufs_phy_axi_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_ufs_phy_axi_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_ufs_phy_ice_core_clk_src = {
+        .cmd_rcgr = 0x7705c,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_ufs_card_ice_core_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_ufs_phy_ice_core_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_ufs_phy_phy_aux_clk_src = {
+        .cmd_rcgr = 0x77090,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_4,
+        .freq_tbl = ftbl_gcc_pcie_0_aux_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_ufs_phy_phy_aux_clk_src",
+                .parent_names = gcc_parent_names_4,
+                .num_parents = 2,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_ufs_phy_unipro_core_clk_src = {
+        .cmd_rcgr = 0x77074,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_ufs_card_unipro_core_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_ufs_phy_unipro_core_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_usb30_prim_master_clk_src[] = {
+        F(33333333, P_GPLL0_OUT_EVEN, 9, 0, 0),
+        F(66666667, P_GPLL0_OUT_EVEN, 4.5, 0, 0),
+        F(133333333, P_GPLL0_OUT_MAIN, 4.5, 0, 0),
+        F(200000000, P_GPLL0_OUT_MAIN, 3, 0, 0),
+        F(240000000, P_GPLL0_OUT_MAIN, 2.5, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_usb30_prim_master_clk_src = {
+        .cmd_rcgr = 0xf018,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_usb30_prim_master_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_usb30_prim_master_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_usb30_prim_mock_utmi_clk_src[] = {
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        F(20000000, P_GPLL0_OUT_EVEN, 15, 0, 0),
+        F(40000000, P_GPLL0_OUT_EVEN, 7.5, 0, 0),
+        F(60000000, P_GPLL0_OUT_MAIN, 10, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_usb30_prim_mock_utmi_clk_src = {
+        .cmd_rcgr = 0xf030,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_usb30_prim_mock_utmi_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_usb30_prim_mock_utmi_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_usb30_sec_master_clk_src = {
+        .cmd_rcgr = 0x10018,
+        .mnd_width = 8,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_usb30_prim_master_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_usb30_sec_master_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_usb30_sec_mock_utmi_clk_src = {
+        .cmd_rcgr = 0x10030,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_0,
+        .freq_tbl = ftbl_gcc_usb30_prim_mock_utmi_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_usb30_sec_mock_utmi_clk_src",
+                .parent_names = gcc_parent_names_0,
+                .num_parents = 4,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_usb3_prim_phy_aux_clk_src = {
+        .cmd_rcgr = 0xf05c,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_2,
+        .freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_usb3_prim_phy_aux_clk_src",
+                .parent_names = gcc_parent_names_2,
+                .num_parents = 3,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_usb3_sec_phy_aux_clk_src = {
+        .cmd_rcgr = 0x1005c,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_2,
+        .freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_usb3_sec_phy_aux_clk_src",
+                .parent_names = gcc_parent_names_2,
+                .num_parents = 3,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_rcg2 gcc_vs_ctrl_clk_src = {
+        .cmd_rcgr = 0x7a030,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_3,
+        .freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_vs_ctrl_clk_src",
+                .parent_names = gcc_parent_names_3,
+                .num_parents = 3,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static const struct freq_tbl ftbl_gcc_vsensor_clk_src[] = {
+        F(19200000, P_BI_TCXO, 1, 0, 0),
+        F(300000000, P_GPLL0_OUT_MAIN, 2, 0, 0),
+        F(600000000, P_GPLL0_OUT_MAIN, 1, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 gcc_vsensor_clk_src = {
+        .cmd_rcgr = 0x7a018,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = gcc_parent_map_3,
+        .freq_tbl = ftbl_gcc_vsensor_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "gcc_vsensor_clk_src",
+                .parent_names = gcc_parent_names_8,
+                .num_parents = 3,
+                .ops = &clk_rcg2_ops,
+        },
+};
+
+static struct clk_branch gcc_aggre_noc_pcie_tbu_clk = {
+        .halt_reg = 0x90014,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x90014,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_aggre_noc_pcie_tbu_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_aggre_ufs_card_axi_clk = {
+        .halt_reg = 0x82028,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x82028,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x82028,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_aggre_ufs_card_axi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_card_axi_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_aggre_ufs_phy_axi_clk = {
+        .halt_reg = 0x82024,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x82024,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x82024,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_aggre_ufs_phy_axi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_phy_axi_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_aggre_usb3_prim_axi_clk = {
+        .halt_reg = 0x8201c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8201c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_aggre_usb3_prim_axi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb30_prim_master_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_aggre_usb3_sec_axi_clk = {
+        .halt_reg = 0x82020,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x82020,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_aggre_usb3_sec_axi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb30_sec_master_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_apc_vs_clk = {
+        .halt_reg = 0x7a050,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x7a050,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_apc_vs_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_vsensor_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_boot_rom_ahb_clk = {
+        .halt_reg = 0x38004,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x38004,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(10),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_boot_rom_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_camera_ahb_clk = {
+        .halt_reg = 0xb008,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0xb008,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0xb008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_camera_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_camera_axi_clk = {
+        .halt_reg = 0xb020,
+        .halt_check = BRANCH_VOTED,
+        .clkr = {
+                .enable_reg = 0xb020,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_camera_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_camera_xo_clk = {
+        .halt_reg = 0xb02c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0xb02c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_camera_xo_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ce1_ahb_clk = {
+        .halt_reg = 0x4100c,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x4100c,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(3),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ce1_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ce1_axi_clk = {
+        .halt_reg = 0x41008,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(4),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ce1_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ce1_clk = {
+        .halt_reg = 0x41004,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(5),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ce1_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_cfg_noc_usb3_prim_axi_clk = {
+        .halt_reg = 0x502c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x502c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_cfg_noc_usb3_prim_axi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb30_prim_master_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_cfg_noc_usb3_sec_axi_clk = {
+        .halt_reg = 0x5030,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x5030,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_cfg_noc_usb3_sec_axi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb30_sec_master_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_cpuss_ahb_clk = {
+        .halt_reg = 0x48000,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(21),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_cpuss_ahb_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_cpuss_ahb_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_cpuss_rbcpr_clk = {
+        .halt_reg = 0x48008,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x48008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_cpuss_rbcpr_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_cpuss_rbcpr_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ddrss_gpu_axi_clk = {
+        .halt_reg = 0x44038,
+        .halt_check = BRANCH_VOTED,
+        .clkr = {
+                .enable_reg = 0x44038,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ddrss_gpu_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_disp_ahb_clk = {
+        .halt_reg = 0xb00c,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0xb00c,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0xb00c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_disp_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_disp_axi_clk = {
+        .halt_reg = 0xb024,
+        .halt_check = BRANCH_VOTED,
+        .clkr = {
+                .enable_reg = 0xb024,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_disp_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_disp_gpll0_clk_src = {
+        .halt_check = BRANCH_HALT_DELAY,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(18),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_disp_gpll0_clk_src",
+                        .parent_names = (const char *[]){
+                                "gpll0",
+                        },
+                        .num_parents = 1,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_disp_gpll0_div_clk_src = {
+        .halt_check = BRANCH_HALT_DELAY,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(19),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_disp_gpll0_div_clk_src",
+                        .parent_names = (const char *[]){
+                                "gpll0_out_even",
+                        },
+                        .num_parents = 1,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_disp_xo_clk = {
+        .halt_reg = 0xb030,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0xb030,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_disp_xo_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gp1_clk = {
+        .halt_reg = 0x64000,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x64000,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gp1_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_gp1_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gp2_clk = {
+        .halt_reg = 0x65000,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x65000,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gp2_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_gp2_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gp3_clk = {
+        .halt_reg = 0x66000,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x66000,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gp3_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_gp3_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gpu_cfg_ahb_clk = {
+        .halt_reg = 0x71004,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x71004,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x71004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gpu_cfg_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gpu_gpll0_clk_src = {
+        .halt_check = BRANCH_HALT_DELAY,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(15),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gpu_gpll0_clk_src",
+                        .parent_names = (const char *[]){
+                                "gpll0",
+                        },
+                        .num_parents = 1,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gpu_gpll0_div_clk_src = {
+        .halt_check = BRANCH_HALT_DELAY,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(16),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gpu_gpll0_div_clk_src",
+                        .parent_names = (const char *[]){
+                                "gpll0_out_even",
+                        },
+                        .num_parents = 1,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gpu_iref_clk = {
+        .halt_reg = 0x8c010,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8c010,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gpu_iref_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gpu_memnoc_gfx_clk = {
+        .halt_reg = 0x7100c,
+        .halt_check = BRANCH_VOTED,
+        .clkr = {
+                .enable_reg = 0x7100c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gpu_memnoc_gfx_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gpu_snoc_dvm_gfx_clk = {
+        .halt_reg = 0x71018,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x71018,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gpu_snoc_dvm_gfx_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_gpu_vs_clk = {
+        .halt_reg = 0x7a04c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x7a04c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_gpu_vs_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_vsensor_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_mss_axis2_clk = {
+        .halt_reg = 0x8a008,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8a008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_mss_axis2_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_mss_cfg_ahb_clk = {
+        .halt_reg = 0x8a000,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x8a000,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x8a000,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_mss_cfg_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_mss_gpll0_div_clk_src = {
+        .halt_check = BRANCH_HALT_DELAY,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(17),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_mss_gpll0_div_clk_src",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_mss_mfab_axis_clk = {
+        .halt_reg = 0x8a004,
+        .halt_check = BRANCH_VOTED,
+        .hwcg_reg = 0x8a004,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x8a004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_mss_mfab_axis_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_mss_q6_memnoc_axi_clk = {
+        .halt_reg = 0x8a154,
+        .halt_check = BRANCH_VOTED,
+        .clkr = {
+                .enable_reg = 0x8a154,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_mss_q6_memnoc_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_mss_snoc_axi_clk = {
+        .halt_reg = 0x8a150,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8a150,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_mss_snoc_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_mss_vs_clk = {
+        .halt_reg = 0x7a048,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x7a048,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_mss_vs_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_vsensor_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_0_aux_clk = {
+        .halt_reg = 0x6b01c,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(3),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_0_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_pcie_0_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_0_cfg_ahb_clk = {
+        .halt_reg = 0x6b018,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x6b018,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(2),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_0_cfg_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_0_clkref_clk = {
+        .halt_reg = 0x8c00c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8c00c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_0_clkref_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_0_mstr_axi_clk = {
+        .halt_reg = 0x6b014,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(1),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_0_mstr_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_0_pipe_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(4),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_0_pipe_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_0_slv_axi_clk = {
+        .halt_reg = 0x6b010,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x6b010,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_0_slv_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_0_slv_q2a_axi_clk = {
+        .halt_reg = 0x6b00c,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(5),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_0_slv_q2a_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_1_aux_clk = {
+        .halt_reg = 0x8d01c,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(29),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_1_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_pcie_1_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_1_cfg_ahb_clk = {
+        .halt_reg = 0x8d018,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x8d018,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(28),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_1_cfg_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_1_clkref_clk = {
+        .halt_reg = 0x8c02c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8c02c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_1_clkref_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_1_mstr_axi_clk = {
+        .halt_reg = 0x8d014,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(27),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_1_mstr_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_1_pipe_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(30),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_1_pipe_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_1_slv_axi_clk = {
+        .halt_reg = 0x8d010,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x8d010,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(26),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_1_slv_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_1_slv_q2a_axi_clk = {
+        .halt_reg = 0x8d00c,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(25),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_1_slv_q2a_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_phy_aux_clk = {
+        .halt_reg = 0x6f004,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x6f004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_phy_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_pcie_0_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pcie_phy_refgen_clk = {
+        .halt_reg = 0x6f02c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x6f02c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pcie_phy_refgen_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_pcie_phy_refgen_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pdm2_clk = {
+        .halt_reg = 0x3300c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x3300c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pdm2_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_pdm2_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pdm_ahb_clk = {
+        .halt_reg = 0x33004,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x33004,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x33004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pdm_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_pdm_xo4_clk = {
+        .halt_reg = 0x33008,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x33008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_pdm_xo4_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_prng_ahb_clk = {
+        .halt_reg = 0x34004,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x34004,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(13),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_prng_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qmip_camera_ahb_clk = {
+        .halt_reg = 0xb014,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0xb014,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0xb014,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qmip_camera_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qmip_disp_ahb_clk = {
+        .halt_reg = 0xb018,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0xb018,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0xb018,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qmip_disp_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qmip_video_ahb_clk = {
+        .halt_reg = 0xb010,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0xb010,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0xb010,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qmip_video_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap0_s0_clk = {
+        .halt_reg = 0x17030,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(10),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap0_s0_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap0_s0_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap0_s1_clk = {
+        .halt_reg = 0x17160,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(11),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap0_s1_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap0_s1_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap0_s2_clk = {
+        .halt_reg = 0x17290,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(12),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap0_s2_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap0_s2_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap0_s3_clk = {
+        .halt_reg = 0x173c0,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(13),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap0_s3_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap0_s3_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap0_s4_clk = {
+        .halt_reg = 0x174f0,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(14),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap0_s4_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap0_s4_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap0_s5_clk = {
+        .halt_reg = 0x17620,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(15),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap0_s5_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap0_s5_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap0_s6_clk = {
+        .halt_reg = 0x17750,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(16),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap0_s6_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap0_s6_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap0_s7_clk = {
+        .halt_reg = 0x17880,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(17),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap0_s7_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap0_s7_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap1_s0_clk = {
+        .halt_reg = 0x18014,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(22),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap1_s0_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap1_s0_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap1_s1_clk = {
+        .halt_reg = 0x18144,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(23),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap1_s1_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap1_s1_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap1_s2_clk = {
+        .halt_reg = 0x18274,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(24),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap1_s2_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap1_s2_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap1_s3_clk = {
+        .halt_reg = 0x183a4,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(25),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap1_s3_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap1_s3_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap1_s4_clk = {
+        .halt_reg = 0x184d4,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(26),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap1_s4_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap1_s4_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap1_s5_clk = {
+        .halt_reg = 0x18604,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(27),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap1_s5_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap1_s5_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap1_s6_clk = {
+        .halt_reg = 0x18734,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(28),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap1_s6_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap1_s6_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap1_s7_clk = {
+        .halt_reg = 0x18864,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(29),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap1_s7_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_qupv3_wrap1_s7_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap_0_m_ahb_clk = {
+        .halt_reg = 0x17004,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(6),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap_0_m_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap_0_s_ahb_clk = {
+        .halt_reg = 0x17008,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x17008,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(7),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap_0_s_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap_1_m_ahb_clk = {
+        .halt_reg = 0x1800c,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(20),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap_1_m_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_qupv3_wrap_1_s_ahb_clk = {
+        .halt_reg = 0x18010,
+        .halt_check = BRANCH_HALT_VOTED,
+        .hwcg_reg = 0x18010,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x5200c,
+                .enable_mask = BIT(21),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_qupv3_wrap_1_s_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_sdcc2_ahb_clk = {
+        .halt_reg = 0x14008,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x14008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_sdcc2_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_sdcc2_apps_clk = {
+        .halt_reg = 0x14004,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x14004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_sdcc2_apps_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_sdcc2_apps_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_sdcc4_ahb_clk = {
+        .halt_reg = 0x16008,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x16008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_sdcc4_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_sdcc4_apps_clk = {
+        .halt_reg = 0x16004,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x16004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_sdcc4_apps_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_sdcc4_apps_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_sys_noc_cpuss_ahb_clk = {
+        .halt_reg = 0x414c,
+        .halt_check = BRANCH_HALT_VOTED,
+        .clkr = {
+                .enable_reg = 0x52004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_sys_noc_cpuss_ahb_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_cpuss_ahb_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_tsif_ahb_clk = {
+        .halt_reg = 0x36004,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x36004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_tsif_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_tsif_inactivity_timers_clk = {
+        .halt_reg = 0x3600c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x3600c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_tsif_inactivity_timers_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_tsif_ref_clk = {
+        .halt_reg = 0x36008,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x36008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_tsif_ref_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_tsif_ref_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_ahb_clk = {
+        .halt_reg = 0x75010,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x75010,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x75010,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_axi_clk = {
+        .halt_reg = 0x7500c,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x7500c,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x7500c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_axi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_card_axi_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_clkref_clk = {
+        .halt_reg = 0x8c004,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8c004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_clkref_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_ice_core_clk = {
+        .halt_reg = 0x75058,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x75058,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x75058,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_ice_core_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_card_ice_core_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_phy_aux_clk = {
+        .halt_reg = 0x7508c,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x7508c,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x7508c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_phy_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_card_phy_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_rx_symbol_0_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x75018,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_rx_symbol_0_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_rx_symbol_1_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x750a8,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_rx_symbol_1_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_tx_symbol_0_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x75014,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_tx_symbol_0_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_card_unipro_core_clk = {
+        .halt_reg = 0x75054,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x75054,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x75054,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_card_unipro_core_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_card_unipro_core_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_mem_clkref_clk = {
+        .halt_reg = 0x8c000,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8c000,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_mem_clkref_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_phy_ahb_clk = {
+        .halt_reg = 0x77010,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x77010,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x77010,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_phy_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_phy_axi_clk = {
+        .halt_reg = 0x7700c,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x7700c,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x7700c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_phy_axi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_phy_axi_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_phy_ice_core_clk = {
+        .halt_reg = 0x77058,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x77058,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x77058,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_phy_ice_core_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_phy_ice_core_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_phy_phy_aux_clk = {
+        .halt_reg = 0x7708c,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x7708c,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x7708c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_phy_phy_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_phy_phy_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_phy_rx_symbol_0_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x77018,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_phy_rx_symbol_0_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_phy_rx_symbol_1_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x770a8,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_phy_rx_symbol_1_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_phy_tx_symbol_0_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x77014,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_phy_tx_symbol_0_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_ufs_phy_unipro_core_clk = {
+        .halt_reg = 0x77054,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x77054,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x77054,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_ufs_phy_unipro_core_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_ufs_phy_unipro_core_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb30_prim_master_clk = {
+        .halt_reg = 0xf00c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0xf00c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb30_prim_master_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb30_prim_master_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb30_prim_mock_utmi_clk = {
+        .halt_reg = 0xf014,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0xf014,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb30_prim_mock_utmi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb30_prim_mock_utmi_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb30_prim_sleep_clk = {
+        .halt_reg = 0xf010,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0xf010,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb30_prim_sleep_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb30_sec_master_clk = {
+        .halt_reg = 0x1000c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x1000c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb30_sec_master_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb30_sec_master_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb30_sec_mock_utmi_clk = {
+        .halt_reg = 0x10014,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x10014,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb30_sec_mock_utmi_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb30_sec_mock_utmi_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb30_sec_sleep_clk = {
+        .halt_reg = 0x10010,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x10010,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb30_sec_sleep_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb3_prim_clkref_clk = {
+        .halt_reg = 0x8c008,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8c008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb3_prim_clkref_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb3_prim_phy_aux_clk = {
+        .halt_reg = 0xf04c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0xf04c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb3_prim_phy_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb3_prim_phy_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb3_prim_phy_com_aux_clk = {
+        .halt_reg = 0xf050,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0xf050,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb3_prim_phy_com_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb3_prim_phy_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb3_prim_phy_pipe_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0xf054,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb3_prim_phy_pipe_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb3_sec_clkref_clk = {
+        .halt_reg = 0x8c028,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x8c028,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb3_sec_clkref_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb3_sec_phy_aux_clk = {
+        .halt_reg = 0x1004c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x1004c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb3_sec_phy_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb3_sec_phy_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb3_sec_phy_com_aux_clk = {
+        .halt_reg = 0x10050,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x10050,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb3_sec_phy_com_aux_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_usb3_sec_phy_aux_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb3_sec_phy_pipe_clk = {
+        .halt_check = BRANCH_HALT_SKIP,
+        .clkr = {
+                .enable_reg = 0x10054,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb3_sec_phy_pipe_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_usb_phy_cfg_ahb2phy_clk = {
+        .halt_reg = 0x6a004,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x6a004,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x6a004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_usb_phy_cfg_ahb2phy_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_vdda_vs_clk = {
+        .halt_reg = 0x7a00c,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x7a00c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_vdda_vs_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_vsensor_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_vddcx_vs_clk = {
+        .halt_reg = 0x7a004,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x7a004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_vddcx_vs_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_vsensor_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_vddmx_vs_clk = {
+        .halt_reg = 0x7a008,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x7a008,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_vddmx_vs_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_vsensor_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_video_ahb_clk = {
+        .halt_reg = 0xb004,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0xb004,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0xb004,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_video_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_video_axi_clk = {
+        .halt_reg = 0xb01c,
+        .halt_check = BRANCH_VOTED,
+        .clkr = {
+                .enable_reg = 0xb01c,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_video_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_video_xo_clk = {
+        .halt_reg = 0xb028,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0xb028,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_video_xo_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_vs_ctrl_ahb_clk = {
+        .halt_reg = 0x7a014,
+        .halt_check = BRANCH_HALT,
+        .hwcg_reg = 0x7a014,
+        .hwcg_bit = 1,
+        .clkr = {
+                .enable_reg = 0x7a014,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_vs_ctrl_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch gcc_vs_ctrl_clk = {
+        .halt_reg = 0x7a010,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x7a010,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "gcc_vs_ctrl_clk",
+                        .parent_names = (const char *[]){
+                                "gcc_vs_ctrl_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct gdsc pcie_0_gdsc = {
+        .gdscr = 0x6b004,
+        .pd = {
+                .name = "pcie_0_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+        .flags = POLL_CFG_GDSCR,
+};
+
+static struct gdsc pcie_1_gdsc = {
+        .gdscr = 0x8d004,
+        .pd = {
+                .name = "pcie_1_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+        .flags = POLL_CFG_GDSCR,
+};
+
+static struct gdsc ufs_card_gdsc = {
+        .gdscr = 0x75004,
+        .pd = {
+                .name = "ufs_card_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+        .flags = POLL_CFG_GDSCR,
+};
+
+static struct gdsc ufs_phy_gdsc = {
+        .gdscr = 0x77004,
+        .pd = {
+                .name = "ufs_phy_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+        .flags = POLL_CFG_GDSCR,
+};
+
+static struct gdsc usb30_prim_gdsc = {
+        .gdscr = 0xf004,
+        .pd = {
+                .name = "usb30_prim_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+        .flags = POLL_CFG_GDSCR,
+};
+
+static struct gdsc usb30_sec_gdsc = {
+        .gdscr = 0x10004,
+        .pd = {
+                .name = "usb30_sec_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+        .flags = POLL_CFG_GDSCR,
+};
+
+static struct gdsc hlos1_vote_aggre_noc_mmu_audio_tbu_gdsc = {
+        .gdscr = 0x7d030,
+        .pd = {
+                .name = "hlos1_vote_aggre_noc_mmu_audio_tbu_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc hlos1_vote_aggre_noc_mmu_pcie_tbu_gdsc = {
+        .gdscr = 0x7d03c,
+        .pd = {
+                .name = "hlos1_vote_aggre_noc_mmu_pcie_tbu_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc hlos1_vote_aggre_noc_mmu_tbu1_gdsc = {
+        .gdscr = 0x7d034,
+        .pd = {
+                .name = "hlos1_vote_aggre_noc_mmu_tbu1_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc hlos1_vote_aggre_noc_mmu_tbu2_gdsc = {
+        .gdscr = 0x7d038,
+        .pd = {
+                .name = "hlos1_vote_aggre_noc_mmu_tbu2_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc = {
+        .gdscr = 0x7d040,
+        .pd = {
+                .name = "hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc = {
+        .gdscr = 0x7d048,
+        .pd = {
+                .name = "hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc hlos1_vote_mmnoc_mmu_tbu_sf_gdsc = {
+        .gdscr = 0x7d044,
+        .pd = {
+                .name = "hlos1_vote_mmnoc_mmu_tbu_sf_gdsc",
+        },
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct clk_regmap *gcc_sdm845_clocks[] = {
+        [GCC_AGGRE_NOC_PCIE_TBU_CLK] = &gcc_aggre_noc_pcie_tbu_clk.clkr,
+        [GCC_AGGRE_UFS_CARD_AXI_CLK] = &gcc_aggre_ufs_card_axi_clk.clkr,
+        [GCC_AGGRE_UFS_PHY_AXI_CLK] = &gcc_aggre_ufs_phy_axi_clk.clkr,
+        [GCC_AGGRE_USB3_PRIM_AXI_CLK] = &gcc_aggre_usb3_prim_axi_clk.clkr,
+        [GCC_AGGRE_USB3_SEC_AXI_CLK] = &gcc_aggre_usb3_sec_axi_clk.clkr,
+        [GCC_APC_VS_CLK] = &gcc_apc_vs_clk.clkr,
+        [GCC_BOOT_ROM_AHB_CLK] = &gcc_boot_rom_ahb_clk.clkr,
+        [GCC_CAMERA_AHB_CLK] = &gcc_camera_ahb_clk.clkr,
+        [GCC_CAMERA_AXI_CLK] = &gcc_camera_axi_clk.clkr,
+        [GCC_CAMERA_XO_CLK] = &gcc_camera_xo_clk.clkr,
+        [GCC_CE1_AHB_CLK] = &gcc_ce1_ahb_clk.clkr,
+        [GCC_CE1_AXI_CLK] = &gcc_ce1_axi_clk.clkr,
+        [GCC_CE1_CLK] = &gcc_ce1_clk.clkr,
+        [GCC_CFG_NOC_USB3_PRIM_AXI_CLK] = &gcc_cfg_noc_usb3_prim_axi_clk.clkr,
+        [GCC_CFG_NOC_USB3_SEC_AXI_CLK] = &gcc_cfg_noc_usb3_sec_axi_clk.clkr,
+        [GCC_CPUSS_AHB_CLK] = &gcc_cpuss_ahb_clk.clkr,
+        [GCC_CPUSS_AHB_CLK_SRC] = &gcc_cpuss_ahb_clk_src.clkr,
+        [GCC_CPUSS_RBCPR_CLK] = &gcc_cpuss_rbcpr_clk.clkr,
+        [GCC_CPUSS_RBCPR_CLK_SRC] = &gcc_cpuss_rbcpr_clk_src.clkr,
+        [GCC_DDRSS_GPU_AXI_CLK] = &gcc_ddrss_gpu_axi_clk.clkr,
+        [GCC_DISP_AHB_CLK] = &gcc_disp_ahb_clk.clkr,
+        [GCC_DISP_AXI_CLK] = &gcc_disp_axi_clk.clkr,
+        [GCC_DISP_GPLL0_CLK_SRC] = &gcc_disp_gpll0_clk_src.clkr,
+        [GCC_DISP_GPLL0_DIV_CLK_SRC] = &gcc_disp_gpll0_div_clk_src.clkr,
+        [GCC_DISP_XO_CLK] = &gcc_disp_xo_clk.clkr,
+        [GCC_GP1_CLK] = &gcc_gp1_clk.clkr,
+        [GCC_GP1_CLK_SRC] = &gcc_gp1_clk_src.clkr,
+        [GCC_GP2_CLK] = &gcc_gp2_clk.clkr,
+        [GCC_GP2_CLK_SRC] = &gcc_gp2_clk_src.clkr,
+        [GCC_GP3_CLK] = &gcc_gp3_clk.clkr,
+        [GCC_GP3_CLK_SRC] = &gcc_gp3_clk_src.clkr,
+        [GCC_GPU_CFG_AHB_CLK] = &gcc_gpu_cfg_ahb_clk.clkr,
+        [GCC_GPU_GPLL0_CLK_SRC] = &gcc_gpu_gpll0_clk_src.clkr,
+        [GCC_GPU_GPLL0_DIV_CLK_SRC] = &gcc_gpu_gpll0_div_clk_src.clkr,
+        [GCC_GPU_IREF_CLK] = &gcc_gpu_iref_clk.clkr,
+        [GCC_GPU_MEMNOC_GFX_CLK] = &gcc_gpu_memnoc_gfx_clk.clkr,
+        [GCC_GPU_SNOC_DVM_GFX_CLK] = &gcc_gpu_snoc_dvm_gfx_clk.clkr,
+        [GCC_GPU_VS_CLK] = &gcc_gpu_vs_clk.clkr,
+        [GCC_MSS_AXIS2_CLK] = &gcc_mss_axis2_clk.clkr,
+        [GCC_MSS_CFG_AHB_CLK] = &gcc_mss_cfg_ahb_clk.clkr,
+        [GCC_MSS_GPLL0_DIV_CLK_SRC] = &gcc_mss_gpll0_div_clk_src.clkr,
+        [GCC_MSS_MFAB_AXIS_CLK] = &gcc_mss_mfab_axis_clk.clkr,
+        [GCC_MSS_Q6_MEMNOC_AXI_CLK] = &gcc_mss_q6_memnoc_axi_clk.clkr,
+        [GCC_MSS_SNOC_AXI_CLK] = &gcc_mss_snoc_axi_clk.clkr,
+        [GCC_MSS_VS_CLK] = &gcc_mss_vs_clk.clkr,
+        [GCC_PCIE_0_AUX_CLK] = &gcc_pcie_0_aux_clk.clkr,
+        [GCC_PCIE_0_AUX_CLK_SRC] = &gcc_pcie_0_aux_clk_src.clkr,
+        [GCC_PCIE_0_CFG_AHB_CLK] = &gcc_pcie_0_cfg_ahb_clk.clkr,
+        [GCC_PCIE_0_CLKREF_CLK] = &gcc_pcie_0_clkref_clk.clkr,
+        [GCC_PCIE_0_MSTR_AXI_CLK] = &gcc_pcie_0_mstr_axi_clk.clkr,
+        [GCC_PCIE_0_PIPE_CLK] = &gcc_pcie_0_pipe_clk.clkr,
+        [GCC_PCIE_0_SLV_AXI_CLK] = &gcc_pcie_0_slv_axi_clk.clkr,
+        [GCC_PCIE_0_SLV_Q2A_AXI_CLK] = &gcc_pcie_0_slv_q2a_axi_clk.clkr,
+        [GCC_PCIE_1_AUX_CLK] = &gcc_pcie_1_aux_clk.clkr,
+        [GCC_PCIE_1_AUX_CLK_SRC] = &gcc_pcie_1_aux_clk_src.clkr,
+        [GCC_PCIE_1_CFG_AHB_CLK] = &gcc_pcie_1_cfg_ahb_clk.clkr,
+        [GCC_PCIE_1_CLKREF_CLK] = &gcc_pcie_1_clkref_clk.clkr,
+        [GCC_PCIE_1_MSTR_AXI_CLK] = &gcc_pcie_1_mstr_axi_clk.clkr,
+        [GCC_PCIE_1_PIPE_CLK] = &gcc_pcie_1_pipe_clk.clkr,
+        [GCC_PCIE_1_SLV_AXI_CLK] = &gcc_pcie_1_slv_axi_clk.clkr,
+        [GCC_PCIE_1_SLV_Q2A_AXI_CLK] = &gcc_pcie_1_slv_q2a_axi_clk.clkr,
+        [GCC_PCIE_PHY_AUX_CLK] = &gcc_pcie_phy_aux_clk.clkr,
+        [GCC_PCIE_PHY_REFGEN_CLK] = &gcc_pcie_phy_refgen_clk.clkr,
+        [GCC_PCIE_PHY_REFGEN_CLK_SRC] = &gcc_pcie_phy_refgen_clk_src.clkr,
+        [GCC_PDM2_CLK] = &gcc_pdm2_clk.clkr,
+        [GCC_PDM2_CLK_SRC] = &gcc_pdm2_clk_src.clkr,
+        [GCC_PDM_AHB_CLK] = &gcc_pdm_ahb_clk.clkr,
+        [GCC_PDM_XO4_CLK] = &gcc_pdm_xo4_clk.clkr,
+        [GCC_PRNG_AHB_CLK] = &gcc_prng_ahb_clk.clkr,
+        [GCC_QMIP_CAMERA_AHB_CLK] = &gcc_qmip_camera_ahb_clk.clkr,
+        [GCC_QMIP_DISP_AHB_CLK] = &gcc_qmip_disp_ahb_clk.clkr,
+        [GCC_QMIP_VIDEO_AHB_CLK] = &gcc_qmip_video_ahb_clk.clkr,
+        [GCC_QUPV3_WRAP0_S0_CLK] = &gcc_qupv3_wrap0_s0_clk.clkr,
+        [GCC_QUPV3_WRAP0_S0_CLK_SRC] = &gcc_qupv3_wrap0_s0_clk_src.clkr,
+        [GCC_QUPV3_WRAP0_S1_CLK] = &gcc_qupv3_wrap0_s1_clk.clkr,
+        [GCC_QUPV3_WRAP0_S1_CLK_SRC] = &gcc_qupv3_wrap0_s1_clk_src.clkr,
+        [GCC_QUPV3_WRAP0_S2_CLK] = &gcc_qupv3_wrap0_s2_clk.clkr,
+        [GCC_QUPV3_WRAP0_S2_CLK_SRC] = &gcc_qupv3_wrap0_s2_clk_src.clkr,
+        [GCC_QUPV3_WRAP0_S3_CLK] = &gcc_qupv3_wrap0_s3_clk.clkr,
+        [GCC_QUPV3_WRAP0_S3_CLK_SRC] = &gcc_qupv3_wrap0_s3_clk_src.clkr,
+        [GCC_QUPV3_WRAP0_S4_CLK] = &gcc_qupv3_wrap0_s4_clk.clkr,
+        [GCC_QUPV3_WRAP0_S4_CLK_SRC] = &gcc_qupv3_wrap0_s4_clk_src.clkr,
+        [GCC_QUPV3_WRAP0_S5_CLK] = &gcc_qupv3_wrap0_s5_clk.clkr,
+        [GCC_QUPV3_WRAP0_S5_CLK_SRC] = &gcc_qupv3_wrap0_s5_clk_src.clkr,
+        [GCC_QUPV3_WRAP0_S6_CLK] = &gcc_qupv3_wrap0_s6_clk.clkr,
+        [GCC_QUPV3_WRAP0_S6_CLK_SRC] = &gcc_qupv3_wrap0_s6_clk_src.clkr,
+        [GCC_QUPV3_WRAP0_S7_CLK] = &gcc_qupv3_wrap0_s7_clk.clkr,
+        [GCC_QUPV3_WRAP0_S7_CLK_SRC] = &gcc_qupv3_wrap0_s7_clk_src.clkr,
+        [GCC_QUPV3_WRAP1_S0_CLK] = &gcc_qupv3_wrap1_s0_clk.clkr,
+        [GCC_QUPV3_WRAP1_S0_CLK_SRC] = &gcc_qupv3_wrap1_s0_clk_src.clkr,
+        [GCC_QUPV3_WRAP1_S1_CLK] = &gcc_qupv3_wrap1_s1_clk.clkr,
+        [GCC_QUPV3_WRAP1_S1_CLK_SRC] = &gcc_qupv3_wrap1_s1_clk_src.clkr,
+        [GCC_QUPV3_WRAP1_S2_CLK] = &gcc_qupv3_wrap1_s2_clk.clkr,
+        [GCC_QUPV3_WRAP1_S2_CLK_SRC] = &gcc_qupv3_wrap1_s2_clk_src.clkr,
+        [GCC_QUPV3_WRAP1_S3_CLK] = &gcc_qupv3_wrap1_s3_clk.clkr,
+        [GCC_QUPV3_WRAP1_S3_CLK_SRC] = &gcc_qupv3_wrap1_s3_clk_src.clkr,
+        [GCC_QUPV3_WRAP1_S4_CLK] = &gcc_qupv3_wrap1_s4_clk.clkr,
+        [GCC_QUPV3_WRAP1_S4_CLK_SRC] = &gcc_qupv3_wrap1_s4_clk_src.clkr,
+        [GCC_QUPV3_WRAP1_S5_CLK] = &gcc_qupv3_wrap1_s5_clk.clkr,
+        [GCC_QUPV3_WRAP1_S5_CLK_SRC] = &gcc_qupv3_wrap1_s5_clk_src.clkr,
+        [GCC_QUPV3_WRAP1_S6_CLK] = &gcc_qupv3_wrap1_s6_clk.clkr,
+        [GCC_QUPV3_WRAP1_S6_CLK_SRC] = &gcc_qupv3_wrap1_s6_clk_src.clkr,
+        [GCC_QUPV3_WRAP1_S7_CLK] = &gcc_qupv3_wrap1_s7_clk.clkr,
+        [GCC_QUPV3_WRAP1_S7_CLK_SRC] = &gcc_qupv3_wrap1_s7_clk_src.clkr,
+        [GCC_QUPV3_WRAP_0_M_AHB_CLK] = &gcc_qupv3_wrap_0_m_ahb_clk.clkr,
+        [GCC_QUPV3_WRAP_0_S_AHB_CLK] = &gcc_qupv3_wrap_0_s_ahb_clk.clkr,
+        [GCC_QUPV3_WRAP_1_M_AHB_CLK] = &gcc_qupv3_wrap_1_m_ahb_clk.clkr,
+        [GCC_QUPV3_WRAP_1_S_AHB_CLK] = &gcc_qupv3_wrap_1_s_ahb_clk.clkr,
+        [GCC_SDCC2_AHB_CLK] = &gcc_sdcc2_ahb_clk.clkr,
+        [GCC_SDCC2_APPS_CLK] = &gcc_sdcc2_apps_clk.clkr,
+        [GCC_SDCC2_APPS_CLK_SRC] = &gcc_sdcc2_apps_clk_src.clkr,
+        [GCC_SDCC4_AHB_CLK] = &gcc_sdcc4_ahb_clk.clkr,
+        [GCC_SDCC4_APPS_CLK] = &gcc_sdcc4_apps_clk.clkr,
+        [GCC_SDCC4_APPS_CLK_SRC] = &gcc_sdcc4_apps_clk_src.clkr,
+        [GCC_SYS_NOC_CPUSS_AHB_CLK] = &gcc_sys_noc_cpuss_ahb_clk.clkr,
+        [GCC_TSIF_AHB_CLK] = &gcc_tsif_ahb_clk.clkr,
+        [GCC_TSIF_INACTIVITY_TIMERS_CLK] =
+                                        &gcc_tsif_inactivity_timers_clk.clkr,
+        [GCC_TSIF_REF_CLK] = &gcc_tsif_ref_clk.clkr,
+        [GCC_TSIF_REF_CLK_SRC] = &gcc_tsif_ref_clk_src.clkr,
+        [GCC_UFS_CARD_AHB_CLK] = &gcc_ufs_card_ahb_clk.clkr,
+        [GCC_UFS_CARD_AXI_CLK] = &gcc_ufs_card_axi_clk.clkr,
+        [GCC_UFS_CARD_AXI_CLK_SRC] = &gcc_ufs_card_axi_clk_src.clkr,
+        [GCC_UFS_CARD_CLKREF_CLK] = &gcc_ufs_card_clkref_clk.clkr,
+        [GCC_UFS_CARD_ICE_CORE_CLK] = &gcc_ufs_card_ice_core_clk.clkr,
+        [GCC_UFS_CARD_ICE_CORE_CLK_SRC] = &gcc_ufs_card_ice_core_clk_src.clkr,
+        [GCC_UFS_CARD_PHY_AUX_CLK] = &gcc_ufs_card_phy_aux_clk.clkr,
+        [GCC_UFS_CARD_PHY_AUX_CLK_SRC] = &gcc_ufs_card_phy_aux_clk_src.clkr,
+        [GCC_UFS_CARD_RX_SYMBOL_0_CLK] = &gcc_ufs_card_rx_symbol_0_clk.clkr,
+        [GCC_UFS_CARD_RX_SYMBOL_1_CLK] = &gcc_ufs_card_rx_symbol_1_clk.clkr,
+        [GCC_UFS_CARD_TX_SYMBOL_0_CLK] = &gcc_ufs_card_tx_symbol_0_clk.clkr,
+        [GCC_UFS_CARD_UNIPRO_CORE_CLK] = &gcc_ufs_card_unipro_core_clk.clkr,
+        [GCC_UFS_CARD_UNIPRO_CORE_CLK_SRC] =
+                                        &gcc_ufs_card_unipro_core_clk_src.clkr,
+        [GCC_UFS_MEM_CLKREF_CLK] = &gcc_ufs_mem_clkref_clk.clkr,
+        [GCC_UFS_PHY_AHB_CLK] = &gcc_ufs_phy_ahb_clk.clkr,
+        [GCC_UFS_PHY_AXI_CLK] = &gcc_ufs_phy_axi_clk.clkr,
+        [GCC_UFS_PHY_AXI_CLK_SRC] = &gcc_ufs_phy_axi_clk_src.clkr,
+        [GCC_UFS_PHY_ICE_CORE_CLK] = &gcc_ufs_phy_ice_core_clk.clkr,
+        [GCC_UFS_PHY_ICE_CORE_CLK_SRC] = &gcc_ufs_phy_ice_core_clk_src.clkr,
+        [GCC_UFS_PHY_PHY_AUX_CLK] = &gcc_ufs_phy_phy_aux_clk.clkr,
+        [GCC_UFS_PHY_PHY_AUX_CLK_SRC] = &gcc_ufs_phy_phy_aux_clk_src.clkr,
+        [GCC_UFS_PHY_RX_SYMBOL_0_CLK] = &gcc_ufs_phy_rx_symbol_0_clk.clkr,
+        [GCC_UFS_PHY_RX_SYMBOL_1_CLK] = &gcc_ufs_phy_rx_symbol_1_clk.clkr,
+        [GCC_UFS_PHY_TX_SYMBOL_0_CLK] = &gcc_ufs_phy_tx_symbol_0_clk.clkr,
+        [GCC_UFS_PHY_UNIPRO_CORE_CLK] = &gcc_ufs_phy_unipro_core_clk.clkr,
+        [GCC_UFS_PHY_UNIPRO_CORE_CLK_SRC] =
+                                        &gcc_ufs_phy_unipro_core_clk_src.clkr,
+        [GCC_USB30_PRIM_MASTER_CLK] = &gcc_usb30_prim_master_clk.clkr,
+        [GCC_USB30_PRIM_MASTER_CLK_SRC] = &gcc_usb30_prim_master_clk_src.clkr,
+        [GCC_USB30_PRIM_MOCK_UTMI_CLK] = &gcc_usb30_prim_mock_utmi_clk.clkr,
+        [GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC] =
+                                        &gcc_usb30_prim_mock_utmi_clk_src.clkr,
+        [GCC_USB30_PRIM_SLEEP_CLK] = &gcc_usb30_prim_sleep_clk.clkr,
+        [GCC_USB30_SEC_MASTER_CLK] = &gcc_usb30_sec_master_clk.clkr,
+        [GCC_USB30_SEC_MASTER_CLK_SRC] = &gcc_usb30_sec_master_clk_src.clkr,
+        [GCC_USB30_SEC_MOCK_UTMI_CLK] = &gcc_usb30_sec_mock_utmi_clk.clkr,
+        [GCC_USB30_SEC_MOCK_UTMI_CLK_SRC] =
+                                        &gcc_usb30_sec_mock_utmi_clk_src.clkr,
+        [GCC_USB30_SEC_SLEEP_CLK] = &gcc_usb30_sec_sleep_clk.clkr,
+        [GCC_USB3_PRIM_CLKREF_CLK] = &gcc_usb3_prim_clkref_clk.clkr,
+        [GCC_USB3_PRIM_PHY_AUX_CLK] = &gcc_usb3_prim_phy_aux_clk.clkr,
+        [GCC_USB3_PRIM_PHY_AUX_CLK_SRC] = &gcc_usb3_prim_phy_aux_clk_src.clkr,
+        [GCC_USB3_PRIM_PHY_COM_AUX_CLK] = &gcc_usb3_prim_phy_com_aux_clk.clkr,
+        [GCC_USB3_PRIM_PHY_PIPE_CLK] = &gcc_usb3_prim_phy_pipe_clk.clkr,
+        [GCC_USB3_SEC_CLKREF_CLK] = &gcc_usb3_sec_clkref_clk.clkr,
+        [GCC_USB3_SEC_PHY_AUX_CLK] = &gcc_usb3_sec_phy_aux_clk.clkr,
+        [GCC_USB3_SEC_PHY_AUX_CLK_SRC] = &gcc_usb3_sec_phy_aux_clk_src.clkr,
+        [GCC_USB3_SEC_PHY_COM_AUX_CLK] = &gcc_usb3_sec_phy_com_aux_clk.clkr,
+        [GCC_USB3_SEC_PHY_PIPE_CLK] = &gcc_usb3_sec_phy_pipe_clk.clkr,
+        [GCC_USB_PHY_CFG_AHB2PHY_CLK] = &gcc_usb_phy_cfg_ahb2phy_clk.clkr,
+        [GCC_VDDA_VS_CLK] = &gcc_vdda_vs_clk.clkr,
+        [GCC_VDDCX_VS_CLK] = &gcc_vddcx_vs_clk.clkr,
+        [GCC_VDDMX_VS_CLK] = &gcc_vddmx_vs_clk.clkr,
+        [GCC_VIDEO_AHB_CLK] = &gcc_video_ahb_clk.clkr,
+        [GCC_VIDEO_AXI_CLK] = &gcc_video_axi_clk.clkr,
+        [GCC_VIDEO_XO_CLK] = &gcc_video_xo_clk.clkr,
+        [GCC_VS_CTRL_AHB_CLK] = &gcc_vs_ctrl_ahb_clk.clkr,
+        [GCC_VS_CTRL_CLK] = &gcc_vs_ctrl_clk.clkr,
+        [GCC_VS_CTRL_CLK_SRC] = &gcc_vs_ctrl_clk_src.clkr,
+        [GCC_VSENSOR_CLK_SRC] = &gcc_vsensor_clk_src.clkr,
+        [GPLL0] = &gpll0.clkr,
+        [GPLL0_OUT_EVEN] = &gpll0_out_even.clkr,
+        [GPLL4] = &gpll4.clkr,
+};
+
+static const struct qcom_reset_map gcc_sdm845_resets[] = {
+        [GCC_MMSS_BCR] = { 0xb000 },
+        [GCC_PCIE_0_BCR] = { 0x6b000 },
+        [GCC_PCIE_1_BCR] = { 0x8d000 },
+        [GCC_PCIE_PHY_BCR] = { 0x6f000 },
+        [GCC_PDM_BCR] = { 0x33000 },
+        [GCC_PRNG_BCR] = { 0x34000 },
+        [GCC_QUPV3_WRAPPER_0_BCR] = { 0x17000 },
+        [GCC_QUPV3_WRAPPER_1_BCR] = { 0x18000 },
+        [GCC_QUSB2PHY_PRIM_BCR] = { 0x12000 },
+        [GCC_QUSB2PHY_SEC_BCR] = { 0x12004 },
+        [GCC_SDCC2_BCR] = { 0x14000 },
+        [GCC_SDCC4_BCR] = { 0x16000 },
+        [GCC_TSIF_BCR] = { 0x36000 },
+        [GCC_UFS_CARD_BCR] = { 0x75000 },
+        [GCC_UFS_PHY_BCR] = { 0x77000 },
+        [GCC_USB30_PRIM_BCR] = { 0xf000 },
+        [GCC_USB30_SEC_BCR] = { 0x10000 },
+        [GCC_USB3_PHY_PRIM_BCR] = { 0x50000 },
+        [GCC_USB3PHY_PHY_PRIM_BCR] = { 0x50004 },
+        [GCC_USB3_DP_PHY_PRIM_BCR] = { 0x50008 },
+        [GCC_USB3_PHY_SEC_BCR] = { 0x5000c },
+        [GCC_USB3PHY_PHY_SEC_BCR] = { 0x50010 },
+        [GCC_USB3_DP_PHY_SEC_BCR] = { 0x50014 },
+        [GCC_USB_PHY_CFG_AHB2PHY_BCR] = { 0x6a000 },
+        [GCC_PCIE_0_PHY_BCR] = { 0x6c01c },
+        [GCC_PCIE_1_PHY_BCR] = { 0x8e01c },
+};
+
+static struct gdsc *gcc_sdm845_gdscs[] = {
+        [PCIE_0_GDSC] = &pcie_0_gdsc,
+        [PCIE_1_GDSC] = &pcie_1_gdsc,
+        [UFS_CARD_GDSC] = &ufs_card_gdsc,
+        [UFS_PHY_GDSC] = &ufs_phy_gdsc,
+        [USB30_PRIM_GDSC] = &usb30_prim_gdsc,
+        [USB30_SEC_GDSC] = &usb30_sec_gdsc,
+        [HLOS1_VOTE_AGGRE_NOC_MMU_AUDIO_TBU_GDSC] =
+                        &hlos1_vote_aggre_noc_mmu_audio_tbu_gdsc,
+        [HLOS1_VOTE_AGGRE_NOC_MMU_PCIE_TBU_GDSC] =
+                        &hlos1_vote_aggre_noc_mmu_pcie_tbu_gdsc,
+        [HLOS1_VOTE_AGGRE_NOC_MMU_TBU1_GDSC] =
+                        &hlos1_vote_aggre_noc_mmu_tbu1_gdsc,
+        [HLOS1_VOTE_AGGRE_NOC_MMU_TBU2_GDSC] =
+                        &hlos1_vote_aggre_noc_mmu_tbu2_gdsc,
+        [HLOS1_VOTE_MMNOC_MMU_TBU_HF0_GDSC] =
+                        &hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc,
+        [HLOS1_VOTE_MMNOC_MMU_TBU_HF1_GDSC] =
+                        &hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc,
+        [HLOS1_VOTE_MMNOC_MMU_TBU_SF_GDSC] = &hlos1_vote_mmnoc_mmu_tbu_sf_gdsc,
+};
+
+static const struct regmap_config gcc_sdm845_regmap_config = {
+        .reg_bits       = 32,
+        .reg_stride     = 4,
+        .val_bits       = 32,
+        .max_register   = 0x182090,
+        .fast_io        = true,
+};
+
+static const struct qcom_cc_desc gcc_sdm845_desc = {
+        .config = &gcc_sdm845_regmap_config,
+        .clks = gcc_sdm845_clocks,
+        .num_clks = ARRAY_SIZE(gcc_sdm845_clocks),
+        .resets = gcc_sdm845_resets,
+        .num_resets = ARRAY_SIZE(gcc_sdm845_resets),
+        .gdscs = gcc_sdm845_gdscs,
+        .num_gdscs = ARRAY_SIZE(gcc_sdm845_gdscs),
+};
+
+static const struct of_device_id gcc_sdm845_match_table[] = {
+        { .compatible = "qcom,gcc-sdm845" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, gcc_sdm845_match_table);
+
+static int gcc_sdm845_probe(struct platform_device *pdev)
+{
+        struct regmap *regmap;
+
+        regmap = qcom_cc_map(pdev, &gcc_sdm845_desc);
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+
+        /* Disable the GPLL0 active input to MMSS and GPU via MISC registers */
+        regmap_update_bits(regmap, 0x09ffc, 0x3, 0x3);
+        regmap_update_bits(regmap, 0x71028, 0x3, 0x3);
+
+        /* Enable CPUSS clocks */
+        regmap_update_bits(regmap, 0x48190, BIT(0), 0x1);
+        regmap_update_bits(regmap, 0x52004, BIT(22), 0x1);
+
+        return qcom_cc_really_probe(pdev, &gcc_sdm845_desc, regmap);
+}
+
+static struct platform_driver gcc_sdm845_driver = {
+        .probe          = gcc_sdm845_probe,
+        .driver         = {
+                .name   = "gcc-sdm845",
+                .of_match_table = gcc_sdm845_match_table,
+        },
+};
+
+static int __init gcc_sdm845_init(void)
+{
+        return platform_driver_register(&gcc_sdm845_driver);
+}
+subsys_initcall(gcc_sdm845_init);
+
+static void __exit gcc_sdm845_exit(void)
+{
+        platform_driver_unregister(&gcc_sdm845_driver);
+}
+module_exit(gcc_sdm845_exit);
+
+MODULE_DESCRIPTION("QTI GCC SDM845 Driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:gcc-sdm845");
diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c
index 15f4bb5efd68..a077133c7ce3 100644
--- a/drivers/clk/qcom/gdsc.c
+++ b/drivers/clk/qcom/gdsc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015, 2017-2018, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -31,6 +31,12 @@
 #define HW_CONTROL_MASK         BIT(1)
 #define SW_COLLAPSE_MASK        BIT(0)
 #define GMEM_CLAMP_IO_MASK      BIT(0)
+#define GMEM_RESET_MASK         BIT(4)
+
+/* CFG_GDSCR */
+#define GDSC_POWER_UP_COMPLETE          BIT(16)
+#define GDSC_POWER_DOWN_COMPLETE        BIT(15)
+#define CFG_GDSCR_OFFSET                0x4
 
 /* Wait 2^n CXO cycles between all states. Here, n=2 (4 cycles). */
 #define EN_REST_WAIT_VAL        (0x2 << 20)
@@ -40,20 +46,50 @@
 #define RETAIN_MEM              BIT(14)
 #define RETAIN_PERIPH           BIT(13)
 
-#define TIMEOUT_US              100
+#define TIMEOUT_US              500
 
 #define domain_to_gdsc(domain) container_of(domain, struct gdsc, pd)
 
-static int gdsc_is_enabled(struct gdsc *sc, unsigned int reg)
+enum gdsc_status {
+        GDSC_OFF,
+        GDSC_ON
+};
+
+/* Returns 1 if GDSC status is status, 0 if not, and < 0 on error */
+static int gdsc_check_status(struct gdsc *sc, enum gdsc_status status)
 {
+        unsigned int reg;
         u32 val;
         int ret;
 
+        if (sc->flags & POLL_CFG_GDSCR)
+                reg = sc->gdscr + CFG_GDSCR_OFFSET;
+        else if (sc->gds_hw_ctrl)
+                reg = sc->gds_hw_ctrl;
+        else
+                reg = sc->gdscr;
+
         ret = regmap_read(sc->regmap, reg, &val);
         if (ret)
                 return ret;
 
-        return !!(val & PWR_ON_MASK);
+        if (sc->flags & POLL_CFG_GDSCR) {
+                switch (status) {
+                case GDSC_ON:
+                        return !!(val & GDSC_POWER_UP_COMPLETE);
+                case GDSC_OFF:
+                        return !!(val & GDSC_POWER_DOWN_COMPLETE);
+                }
+        }
+
+        switch (status) {
+        case GDSC_ON:
+                return !!(val & PWR_ON_MASK);
+        case GDSC_OFF:
+                return !(val & PWR_ON_MASK);
+        }
+
+        return -EINVAL;
 }
 
 static int gdsc_hwctrl(struct gdsc *sc, bool en)
@@ -63,34 +99,33 @@ static int gdsc_hwctrl(struct gdsc *sc, bool en)
         return regmap_update_bits(sc->regmap, sc->gdscr, HW_CONTROL_MASK, val);
 }
 
-static int gdsc_poll_status(struct gdsc *sc, unsigned int reg, bool en)
+static int gdsc_poll_status(struct gdsc *sc, enum gdsc_status status)
 {
         ktime_t start;
 
         start = ktime_get();
         do {
-                if (gdsc_is_enabled(sc, reg) == en)
+                if (gdsc_check_status(sc, status))
                         return 0;
         } while (ktime_us_delta(ktime_get(), start) < TIMEOUT_US);
 
-        if (gdsc_is_enabled(sc, reg) == en)
+        if (gdsc_check_status(sc, status))
                 return 0;
 
         return -ETIMEDOUT;
 }
 
-static int gdsc_toggle_logic(struct gdsc *sc, bool en)
+static int gdsc_toggle_logic(struct gdsc *sc, enum gdsc_status status)
 {
         int ret;
-        u32 val = en ? 0 : SW_COLLAPSE_MASK;
-        unsigned int status_reg = sc->gdscr;
+        u32 val = (status == GDSC_ON) ? 0 : SW_COLLAPSE_MASK;
 
         ret = regmap_update_bits(sc->regmap, sc->gdscr, SW_COLLAPSE_MASK, val);
         if (ret)
                 return ret;
 
         /* If disabling votable gdscs, don't poll on status */
-        if ((sc->flags & VOTABLE) && !en) {
+        if ((sc->flags & VOTABLE) && status == GDSC_OFF) {
                 /*
                  * Add a short delay here to ensure that an enable
                  * right after it was disabled does not put it in an
@@ -101,7 +136,6 @@ static int gdsc_toggle_logic(struct gdsc *sc, bool en)
         }
 
         if (sc->gds_hw_ctrl) {
-                status_reg = sc->gds_hw_ctrl;
                 /*
                  * The gds hw controller asserts/de-asserts the status bit soon
                  * after it receives a power on/off request from a master.
@@ -115,7 +149,7 @@ static int gdsc_toggle_logic(struct gdsc *sc, bool en)
                 udelay(1);
         }
 
-        return gdsc_poll_status(sc, status_reg, en);
+        return gdsc_poll_status(sc, status);
 }
 
 static inline int gdsc_deassert_reset(struct gdsc *sc)
@@ -166,6 +200,14 @@ static inline void gdsc_assert_clamp_io(struct gdsc *sc)
                            GMEM_CLAMP_IO_MASK, 1);
 }
 
+static inline void gdsc_assert_reset_aon(struct gdsc *sc)
+{
+        regmap_update_bits(sc->regmap, sc->clamp_io_ctrl,
+                           GMEM_RESET_MASK, 1);
+        udelay(1);
+        regmap_update_bits(sc->regmap, sc->clamp_io_ctrl,
+                           GMEM_RESET_MASK, 0);
+}
 static int gdsc_enable(struct generic_pm_domain *domain)
 {
         struct gdsc *sc = domain_to_gdsc(domain);
@@ -174,10 +216,19 @@ static int gdsc_enable(struct generic_pm_domain *domain)
         if (sc->pwrsts == PWRSTS_ON)
                 return gdsc_deassert_reset(sc);
 
-        if (sc->flags & CLAMP_IO)
+        if (sc->flags & SW_RESET) {
+                gdsc_assert_reset(sc);
+                udelay(1);
+                gdsc_deassert_reset(sc);
+        }
+
+        if (sc->flags & CLAMP_IO) {
+                if (sc->flags & AON_RESET)
+                        gdsc_assert_reset_aon(sc);
                 gdsc_deassert_clamp_io(sc);
+        }
 
-        ret = gdsc_toggle_logic(sc, true);
+        ret = gdsc_toggle_logic(sc, GDSC_ON);
         if (ret)
                 return ret;
 
@@ -222,8 +273,6 @@ static int gdsc_disable(struct generic_pm_domain *domain)
 
         /* Turn off HW trigger mode if supported */
         if (sc->flags & HW_CTRL) {
-                unsigned int reg;
-
                 ret = gdsc_hwctrl(sc, false);
                 if (ret < 0)
                         return ret;
@@ -235,8 +284,7 @@ static int gdsc_disable(struct generic_pm_domain *domain)
                  */
                 udelay(1);
 
-                reg = sc->gds_hw_ctrl ? sc->gds_hw_ctrl : sc->gdscr;
-                ret = gdsc_poll_status(sc, reg, true);
+                ret = gdsc_poll_status(sc, GDSC_ON);
                 if (ret)
                         return ret;
         }
@@ -244,7 +292,7 @@ static int gdsc_disable(struct generic_pm_domain *domain)
         if (sc->pwrsts & PWRSTS_OFF)
                 gdsc_clear_mem_on(sc);
 
-        ret = gdsc_toggle_logic(sc, false);
+        ret = gdsc_toggle_logic(sc, GDSC_OFF);
         if (ret)
                 return ret;
 
@@ -258,7 +306,6 @@ static int gdsc_init(struct gdsc *sc)
 {
         u32 mask, val;
         int on, ret;
-        unsigned int reg;
 
         /*
          * Disable HW trigger: collapse/restore occur based on registers writes.
@@ -274,13 +321,12 @@ static int gdsc_init(struct gdsc *sc)
 
         /* Force gdsc ON if only ON state is supported */
         if (sc->pwrsts == PWRSTS_ON) {
-                ret = gdsc_toggle_logic(sc, true);
+                ret = gdsc_toggle_logic(sc, GDSC_ON);
                 if (ret)
                         return ret;
         }
 
-        reg = sc->gds_hw_ctrl ? sc->gds_hw_ctrl : sc->gdscr;
-        on = gdsc_is_enabled(sc, reg);
+        on = gdsc_check_status(sc, GDSC_ON);
         if (on < 0)
                 return on;
 
diff --git a/drivers/clk/qcom/gdsc.h b/drivers/clk/qcom/gdsc.h
index 7fd78cec7e5b..bd1f2c780d0a 100644
--- a/drivers/clk/qcom/gdsc.h
+++ b/drivers/clk/qcom/gdsc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015, 2017-2018, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -53,7 +53,10 @@ struct gdsc {
 #define VOTABLE         BIT(0)
 #define CLAMP_IO        BIT(1)
 #define HW_CTRL         BIT(2)
-#define ALWAYS_ON       BIT(3)
+#define SW_RESET        BIT(3)
+#define AON_RESET       BIT(4)
+#define POLL_CFG_GDSCR  BIT(5)
+#define ALWAYS_ON       BIT(6)
         struct reset_controller_dev     *rcdev;
         unsigned int                    *resets;
         unsigned int                    reset_count;
diff --git a/drivers/clk/qcom/videocc-sdm845.c b/drivers/clk/qcom/videocc-sdm845.c
new file mode 100644
index 000000000000..9073b7a710ac
--- /dev/null
+++ b/drivers/clk/qcom/videocc-sdm845.c
@@ -0,0 +1,358 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+
+#include <dt-bindings/clock/qcom,videocc-sdm845.h>
+
+#include "common.h"
+#include "clk-alpha-pll.h"
+#include "clk-branch.h"
+#include "clk-rcg.h"
+#include "clk-regmap.h"
+#include "clk-pll.h"
+#include "gdsc.h"
+
+#define F(f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) }
+
+enum {
+        P_BI_TCXO,
+        P_CORE_BI_PLL_TEST_SE,
+        P_VIDEO_PLL0_OUT_EVEN,
+        P_VIDEO_PLL0_OUT_MAIN,
+        P_VIDEO_PLL0_OUT_ODD,
+};
+
+static const struct parent_map video_cc_parent_map_0[] = {
+        { P_BI_TCXO, 0 },
+        { P_VIDEO_PLL0_OUT_MAIN, 1 },
+        { P_VIDEO_PLL0_OUT_EVEN, 2 },
+        { P_VIDEO_PLL0_OUT_ODD, 3 },
+        { P_CORE_BI_PLL_TEST_SE, 4 },
+};
+
+static const char * const video_cc_parent_names_0[] = {
+        "bi_tcxo",
+        "video_pll0",
+        "video_pll0_out_even",
+        "video_pll0_out_odd",
+        "core_bi_pll_test_se",
+};
+
+static const struct alpha_pll_config video_pll0_config = {
+        .l = 0x10,
+        .alpha = 0xaaab,
+};
+
+static struct clk_alpha_pll video_pll0 = {
+        .offset = 0x42c,
+        .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_FABIA],
+        .clkr = {
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_pll0",
+                        .parent_names = (const char *[]){ "bi_tcxo" },
+                        .num_parents = 1,
+                        .ops = &clk_alpha_pll_fabia_ops,
+                },
+        },
+};
+
+static const struct freq_tbl ftbl_video_cc_venus_clk_src[] = {
+        F(100000000, P_VIDEO_PLL0_OUT_MAIN, 4, 0, 0),
+        F(200000000, P_VIDEO_PLL0_OUT_MAIN, 2, 0, 0),
+        F(330000000, P_VIDEO_PLL0_OUT_MAIN, 1, 0, 0),
+        F(404000000, P_VIDEO_PLL0_OUT_MAIN, 1, 0, 0),
+        F(444000000, P_VIDEO_PLL0_OUT_MAIN, 1, 0, 0),
+        F(533000000, P_VIDEO_PLL0_OUT_MAIN, 1, 0, 0),
+        { }
+};
+
+static struct clk_rcg2 video_cc_venus_clk_src = {
+        .cmd_rcgr = 0x7f0,
+        .mnd_width = 0,
+        .hid_width = 5,
+        .parent_map = video_cc_parent_map_0,
+        .freq_tbl = ftbl_video_cc_venus_clk_src,
+        .clkr.hw.init = &(struct clk_init_data){
+                .name = "video_cc_venus_clk_src",
+                .parent_names = video_cc_parent_names_0,
+                .num_parents = 5,
+                .flags = CLK_SET_RATE_PARENT,
+                .ops = &clk_rcg2_shared_ops,
+        },
+};
+
+static struct clk_branch video_cc_apb_clk = {
+        .halt_reg = 0x990,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x990,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_apb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_at_clk = {
+        .halt_reg = 0x9f0,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x9f0,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_at_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_qdss_trig_clk = {
+        .halt_reg = 0x970,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x970,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_qdss_trig_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_qdss_tsctr_div8_clk = {
+        .halt_reg = 0x9d0,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x9d0,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_qdss_tsctr_div8_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_vcodec0_axi_clk = {
+        .halt_reg = 0x930,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x930,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_vcodec0_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_vcodec0_core_clk = {
+        .halt_reg = 0x890,
+        .halt_check = BRANCH_VOTED,
+        .clkr = {
+                .enable_reg = 0x890,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_vcodec0_core_clk",
+                        .parent_names = (const char *[]){
+                                "video_cc_venus_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_vcodec1_axi_clk = {
+        .halt_reg = 0x950,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x950,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_vcodec1_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_vcodec1_core_clk = {
+        .halt_reg = 0x8d0,
+        .halt_check = BRANCH_VOTED,
+        .clkr = {
+                .enable_reg = 0x8d0,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_vcodec1_core_clk",
+                        .parent_names = (const char *[]){
+                                "video_cc_venus_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_venus_ahb_clk = {
+        .halt_reg = 0x9b0,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x9b0,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_venus_ahb_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_venus_ctl_axi_clk = {
+        .halt_reg = 0x910,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x910,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_venus_ctl_axi_clk",
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct clk_branch video_cc_venus_ctl_core_clk = {
+        .halt_reg = 0x850,
+        .halt_check = BRANCH_HALT,
+        .clkr = {
+                .enable_reg = 0x850,
+                .enable_mask = BIT(0),
+                .hw.init = &(struct clk_init_data){
+                        .name = "video_cc_venus_ctl_core_clk",
+                        .parent_names = (const char *[]){
+                                "video_cc_venus_clk_src",
+                        },
+                        .num_parents = 1,
+                        .flags = CLK_SET_RATE_PARENT,
+                        .ops = &clk_branch2_ops,
+                },
+        },
+};
+
+static struct gdsc venus_gdsc = {
+        .gdscr = 0x814,
+        .pd = {
+                .name = "venus_gdsc",
+        },
+        .cxcs = (unsigned int []){ 0x850, 0x910 },
+        .cxc_count = 2,
+        .pwrsts = PWRSTS_OFF_ON,
+        .flags = POLL_CFG_GDSCR,
+};
+
+static struct gdsc vcodec0_gdsc = {
+        .gdscr = 0x874,
+        .pd = {
+                .name = "vcodec0_gdsc",
+        },
+        .cxcs = (unsigned int []){ 0x890, 0x930 },
+        .cxc_count = 2,
+        .flags = HW_CTRL | POLL_CFG_GDSCR,
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc vcodec1_gdsc = {
+        .gdscr = 0x8b4,
+        .pd = {
+                .name = "vcodec1_gdsc",
+        },
+        .cxcs = (unsigned int []){ 0x8d0, 0x950 },
+        .cxc_count = 2,
+        .flags = HW_CTRL | POLL_CFG_GDSCR,
+        .pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct clk_regmap *video_cc_sdm845_clocks[] = {
+        [VIDEO_CC_APB_CLK] = &video_cc_apb_clk.clkr,
+        [VIDEO_CC_AT_CLK] = &video_cc_at_clk.clkr,
+        [VIDEO_CC_QDSS_TRIG_CLK] = &video_cc_qdss_trig_clk.clkr,
+        [VIDEO_CC_QDSS_TSCTR_DIV8_CLK] = &video_cc_qdss_tsctr_div8_clk.clkr,
+        [VIDEO_CC_VCODEC0_AXI_CLK] = &video_cc_vcodec0_axi_clk.clkr,
+        [VIDEO_CC_VCODEC0_CORE_CLK] = &video_cc_vcodec0_core_clk.clkr,
+        [VIDEO_CC_VCODEC1_AXI_CLK] = &video_cc_vcodec1_axi_clk.clkr,
+        [VIDEO_CC_VCODEC1_CORE_CLK] = &video_cc_vcodec1_core_clk.clkr,
+        [VIDEO_CC_VENUS_AHB_CLK] = &video_cc_venus_ahb_clk.clkr,
+        [VIDEO_CC_VENUS_CLK_SRC] = &video_cc_venus_clk_src.clkr,
+        [VIDEO_CC_VENUS_CTL_AXI_CLK] = &video_cc_venus_ctl_axi_clk.clkr,
+        [VIDEO_CC_VENUS_CTL_CORE_CLK] = &video_cc_venus_ctl_core_clk.clkr,
+        [VIDEO_PLL0] = &video_pll0.clkr,
+};
+
+static struct gdsc *video_cc_sdm845_gdscs[] = {
+        [VENUS_GDSC] = &venus_gdsc,
+        [VCODEC0_GDSC] = &vcodec0_gdsc,
+        [VCODEC1_GDSC] = &vcodec1_gdsc,
+};
+
+static const struct regmap_config video_cc_sdm845_regmap_config = {
+        .reg_bits       = 32,
+        .reg_stride     = 4,
+        .val_bits       = 32,
+        .max_register   = 0xb90,
+        .fast_io        = true,
+};
+
+static const struct qcom_cc_desc video_cc_sdm845_desc = {
+        .config = &video_cc_sdm845_regmap_config,
+        .clks = video_cc_sdm845_clocks,
+        .num_clks = ARRAY_SIZE(video_cc_sdm845_clocks),
+        .gdscs = video_cc_sdm845_gdscs,
+        .num_gdscs = ARRAY_SIZE(video_cc_sdm845_gdscs),
+};
+
+static const struct of_device_id video_cc_sdm845_match_table[] = {
+        { .compatible = "qcom,sdm845-videocc" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, video_cc_sdm845_match_table);
+
+static int video_cc_sdm845_probe(struct platform_device *pdev)
+{
+        struct regmap *regmap;
+
+        regmap = qcom_cc_map(pdev, &video_cc_sdm845_desc);
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+
+        clk_fabia_pll_configure(&video_pll0, regmap, &video_pll0_config);
+
+        return qcom_cc_really_probe(pdev, &video_cc_sdm845_desc, regmap);
+}
+
+static struct platform_driver video_cc_sdm845_driver = {
+        .probe          = video_cc_sdm845_probe,
+        .driver         = {
+                .name   = "sdm845-videocc",
+                .of_match_table = video_cc_sdm845_match_table,
+        },
+};
+
+static int __init video_cc_sdm845_init(void)
+{
+        return platform_driver_register(&video_cc_sdm845_driver);
+}
+subsys_initcall(video_cc_sdm845_init);
+
+static void __exit video_cc_sdm845_exit(void)
+{
+        platform_driver_unregister(&video_cc_sdm845_driver);
+}
+module_exit(video_cc_sdm845_exit);
+
+MODULE_LICENSE("GPL v2");
diff --git a/include/dt-bindings/clock/qcom,gcc-sdm845.h b/include/dt-bindings/clock/qcom,gcc-sdm845.h
new file mode 100644
index 000000000000..aca61264f12c
--- /dev/null
+++ b/include/dt-bindings/clock/qcom,gcc-sdm845.h
@@ -0,0 +1,239 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+#ifndef _DT_BINDINGS_CLK_SDM_GCC_SDM845_H
+#define _DT_BINDINGS_CLK_SDM_GCC_SDM845_H
+
+/* GCC clock registers */
+#define GCC_AGGRE_NOC_PCIE_TBU_CLK                              0
+#define GCC_AGGRE_UFS_CARD_AXI_CLK                              1
+#define GCC_AGGRE_UFS_PHY_AXI_CLK                               2
+#define GCC_AGGRE_USB3_PRIM_AXI_CLK                             3
+#define GCC_AGGRE_USB3_SEC_AXI_CLK                              4
+#define GCC_BOOT_ROM_AHB_CLK                                    5
+#define GCC_CAMERA_AHB_CLK                                      6
+#define GCC_CAMERA_AXI_CLK                                      7
+#define GCC_CAMERA_XO_CLK                                       8
+#define GCC_CE1_AHB_CLK                                         9
+#define GCC_CE1_AXI_CLK                                         10
+#define GCC_CE1_CLK                                             11
+#define GCC_CFG_NOC_USB3_PRIM_AXI_CLK                           12
+#define GCC_CFG_NOC_USB3_SEC_AXI_CLK                            13
+#define GCC_CPUSS_AHB_CLK                                       14
+#define GCC_CPUSS_AHB_CLK_SRC                                   15
+#define GCC_CPUSS_RBCPR_CLK                                     16
+#define GCC_CPUSS_RBCPR_CLK_SRC                                 17
+#define GCC_DDRSS_GPU_AXI_CLK                                   18
+#define GCC_DISP_AHB_CLK                                        19
+#define GCC_DISP_AXI_CLK                                        20
+#define GCC_DISP_GPLL0_CLK_SRC                                  21
+#define GCC_DISP_GPLL0_DIV_CLK_SRC                              22
+#define GCC_DISP_XO_CLK                                         23
+#define GCC_GP1_CLK                                             24
+#define GCC_GP1_CLK_SRC                                         25
+#define GCC_GP2_CLK                                             26
+#define GCC_GP2_CLK_SRC                                         27
+#define GCC_GP3_CLK                                             28
+#define GCC_GP3_CLK_SRC                                         29
+#define GCC_GPU_CFG_AHB_CLK                                     30
+#define GCC_GPU_GPLL0_CLK_SRC                                   31
+#define GCC_GPU_GPLL0_DIV_CLK_SRC                               32
+#define GCC_GPU_MEMNOC_GFX_CLK                                  33
+#define GCC_GPU_SNOC_DVM_GFX_CLK                                34
+#define GCC_MSS_AXIS2_CLK                                       35
+#define GCC_MSS_CFG_AHB_CLK                                     36
+#define GCC_MSS_GPLL0_DIV_CLK_SRC                               37
+#define GCC_MSS_MFAB_AXIS_CLK                                   38
+#define GCC_MSS_Q6_MEMNOC_AXI_CLK                               39
+#define GCC_MSS_SNOC_AXI_CLK                                    40
+#define GCC_PCIE_0_AUX_CLK                                      41
+#define GCC_PCIE_0_AUX_CLK_SRC                                  42
+#define GCC_PCIE_0_CFG_AHB_CLK                                  43
+#define GCC_PCIE_0_CLKREF_CLK                                   44
+#define GCC_PCIE_0_MSTR_AXI_CLK                                 45
+#define GCC_PCIE_0_PIPE_CLK                                     46
+#define GCC_PCIE_0_SLV_AXI_CLK                                  47
+#define GCC_PCIE_0_SLV_Q2A_AXI_CLK                              48
+#define GCC_PCIE_1_AUX_CLK                                      49
+#define GCC_PCIE_1_AUX_CLK_SRC                                  50
+#define GCC_PCIE_1_CFG_AHB_CLK                                  51
+#define GCC_PCIE_1_CLKREF_CLK                                   52
+#define GCC_PCIE_1_MSTR_AXI_CLK                                 53
+#define GCC_PCIE_1_PIPE_CLK                                     54
+#define GCC_PCIE_1_SLV_AXI_CLK                                  55
+#define GCC_PCIE_1_SLV_Q2A_AXI_CLK                              56
+#define GCC_PCIE_PHY_AUX_CLK                                    57
+#define GCC_PCIE_PHY_REFGEN_CLK                                 58
+#define GCC_PCIE_PHY_REFGEN_CLK_SRC                             59
+#define GCC_PDM2_CLK                                            60
+#define GCC_PDM2_CLK_SRC                                        61
+#define GCC_PDM_AHB_CLK                                         62
+#define GCC_PDM_XO4_CLK                                         63
+#define GCC_PRNG_AHB_CLK                                        64
+#define GCC_QMIP_CAMERA_AHB_CLK                                 65
+#define GCC_QMIP_DISP_AHB_CLK                                   66
+#define GCC_QMIP_VIDEO_AHB_CLK                                  67
+#define GCC_QUPV3_WRAP0_S0_CLK                                  68
+#define GCC_QUPV3_WRAP0_S0_CLK_SRC                              69
+#define GCC_QUPV3_WRAP0_S1_CLK                                  70
+#define GCC_QUPV3_WRAP0_S1_CLK_SRC                              71
+#define GCC_QUPV3_WRAP0_S2_CLK                                  72
+#define GCC_QUPV3_WRAP0_S2_CLK_SRC                              73
+#define GCC_QUPV3_WRAP0_S3_CLK                                  74
+#define GCC_QUPV3_WRAP0_S3_CLK_SRC                              75
+#define GCC_QUPV3_WRAP0_S4_CLK                                  76
+#define GCC_QUPV3_WRAP0_S4_CLK_SRC                              77
+#define GCC_QUPV3_WRAP0_S5_CLK                                  78
+#define GCC_QUPV3_WRAP0_S5_CLK_SRC                              79
+#define GCC_QUPV3_WRAP0_S6_CLK                                  80
+#define GCC_QUPV3_WRAP0_S6_CLK_SRC                              81
+#define GCC_QUPV3_WRAP0_S7_CLK                                  82
+#define GCC_QUPV3_WRAP0_S7_CLK_SRC                              83
+#define GCC_QUPV3_WRAP1_S0_CLK                                  84
+#define GCC_QUPV3_WRAP1_S0_CLK_SRC                              85
+#define GCC_QUPV3_WRAP1_S1_CLK                                  86
+#define GCC_QUPV3_WRAP1_S1_CLK_SRC                              87
+#define GCC_QUPV3_WRAP1_S2_CLK                                  88
+#define GCC_QUPV3_WRAP1_S2_CLK_SRC                              89
+#define GCC_QUPV3_WRAP1_S3_CLK                                  90
+#define GCC_QUPV3_WRAP1_S3_CLK_SRC                              91
+#define GCC_QUPV3_WRAP1_S4_CLK                                  92
+#define GCC_QUPV3_WRAP1_S4_CLK_SRC                              93
+#define GCC_QUPV3_WRAP1_S5_CLK                                  94
+#define GCC_QUPV3_WRAP1_S5_CLK_SRC                              95
+#define GCC_QUPV3_WRAP1_S6_CLK                                  96
+#define GCC_QUPV3_WRAP1_S6_CLK_SRC                              97
+#define GCC_QUPV3_WRAP1_S7_CLK                                  98
+#define GCC_QUPV3_WRAP1_S7_CLK_SRC                              99
+#define GCC_QUPV3_WRAP_0_M_AHB_CLK                              100
+#define GCC_QUPV3_WRAP_0_S_AHB_CLK                              101
+#define GCC_QUPV3_WRAP_1_M_AHB_CLK                              102
+#define GCC_QUPV3_WRAP_1_S_AHB_CLK                              103
+#define GCC_SDCC2_AHB_CLK                                       104
+#define GCC_SDCC2_APPS_CLK                                      105
+#define GCC_SDCC2_APPS_CLK_SRC                                  106
+#define GCC_SDCC4_AHB_CLK                                       107
+#define GCC_SDCC4_APPS_CLK                                      108
+#define GCC_SDCC4_APPS_CLK_SRC                                  109
+#define GCC_SYS_NOC_CPUSS_AHB_CLK                               110
+#define GCC_TSIF_AHB_CLK                                        111
+#define GCC_TSIF_INACTIVITY_TIMERS_CLK                          112
+#define GCC_TSIF_REF_CLK                                        113
+#define GCC_TSIF_REF_CLK_SRC                                    114
+#define GCC_UFS_CARD_AHB_CLK                                    115
+#define GCC_UFS_CARD_AXI_CLK                                    116
+#define GCC_UFS_CARD_AXI_CLK_SRC                                117
+#define GCC_UFS_CARD_CLKREF_CLK                                 118
+#define GCC_UFS_CARD_ICE_CORE_CLK                               119
+#define GCC_UFS_CARD_ICE_CORE_CLK_SRC                           120
+#define GCC_UFS_CARD_PHY_AUX_CLK                                121
+#define GCC_UFS_CARD_PHY_AUX_CLK_SRC                            122
+#define GCC_UFS_CARD_RX_SYMBOL_0_CLK                            123
+#define GCC_UFS_CARD_RX_SYMBOL_1_CLK                            124
+#define GCC_UFS_CARD_TX_SYMBOL_0_CLK                            125
+#define GCC_UFS_CARD_UNIPRO_CORE_CLK                            126
+#define GCC_UFS_CARD_UNIPRO_CORE_CLK_SRC                        127
+#define GCC_UFS_MEM_CLKREF_CLK                                  128
+#define GCC_UFS_PHY_AHB_CLK                                     129
+#define GCC_UFS_PHY_AXI_CLK                                     130
+#define GCC_UFS_PHY_AXI_CLK_SRC                                 131
+#define GCC_UFS_PHY_ICE_CORE_CLK                                132
+#define GCC_UFS_PHY_ICE_CORE_CLK_SRC                            133
+#define GCC_UFS_PHY_PHY_AUX_CLK                                 134
+#define GCC_UFS_PHY_PHY_AUX_CLK_SRC                             135
+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK                             136
+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK                             137
+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK                             138
+#define GCC_UFS_PHY_UNIPRO_CORE_CLK                             139
+#define GCC_UFS_PHY_UNIPRO_CORE_CLK_SRC                         140
+#define GCC_USB30_PRIM_MASTER_CLK                               141
+#define GCC_USB30_PRIM_MASTER_CLK_SRC                           142
+#define GCC_USB30_PRIM_MOCK_UTMI_CLK                            143
+#define GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC                        144
+#define GCC_USB30_PRIM_SLEEP_CLK                                145
+#define GCC_USB30_SEC_MASTER_CLK                                146
+#define GCC_USB30_SEC_MASTER_CLK_SRC                            147
+#define GCC_USB30_SEC_MOCK_UTMI_CLK                             148
+#define GCC_USB30_SEC_MOCK_UTMI_CLK_SRC                         149
+#define GCC_USB30_SEC_SLEEP_CLK                                 150
+#define GCC_USB3_PRIM_CLKREF_CLK                                151
+#define GCC_USB3_PRIM_PHY_AUX_CLK                               152
+#define GCC_USB3_PRIM_PHY_AUX_CLK_SRC                           153
+#define GCC_USB3_PRIM_PHY_COM_AUX_CLK                           154
+#define GCC_USB3_PRIM_PHY_PIPE_CLK                              155
+#define GCC_USB3_SEC_CLKREF_CLK                                 156
+#define GCC_USB3_SEC_PHY_AUX_CLK                                157
+#define GCC_USB3_SEC_PHY_AUX_CLK_SRC                            158
+#define GCC_USB3_SEC_PHY_PIPE_CLK                               159
+#define GCC_USB3_SEC_PHY_COM_AUX_CLK                            160
+#define GCC_USB_PHY_CFG_AHB2PHY_CLK                             161
+#define GCC_VIDEO_AHB_CLK                                       162
+#define GCC_VIDEO_AXI_CLK                                       163
+#define GCC_VIDEO_XO_CLK                                        164
+#define GPLL0                                                   165
+#define GPLL0_OUT_EVEN                                          166
+#define GPLL0_OUT_MAIN                                          167
+#define GCC_GPU_IREF_CLK                                        168
+#define GCC_SDCC1_AHB_CLK                                       169
+#define GCC_SDCC1_APPS_CLK                                      170
+#define GCC_SDCC1_ICE_CORE_CLK                                  171
+#define GCC_SDCC1_APPS_CLK_SRC                                  172
+#define GCC_SDCC1_ICE_CORE_CLK_SRC                              173
+#define GCC_APC_VS_CLK                                          174
+#define GCC_GPU_VS_CLK                                          175
+#define GCC_MSS_VS_CLK                                          176
+#define GCC_VDDA_VS_CLK                                         177
+#define GCC_VDDCX_VS_CLK                                        178
+#define GCC_VDDMX_VS_CLK                                        179
+#define GCC_VS_CTRL_AHB_CLK                                     180
+#define GCC_VS_CTRL_CLK                                         181
+#define GCC_VS_CTRL_CLK_SRC                                     182
+#define GCC_VSENSOR_CLK_SRC                                     183
+#define GPLL4                                                   184
+
+/* GCC Resets */
+#define GCC_MMSS_BCR                                            0
+#define GCC_PCIE_0_BCR                                          1
+#define GCC_PCIE_1_BCR                                          2
+#define GCC_PCIE_PHY_BCR                                        3
+#define GCC_PDM_BCR                                             4
+#define GCC_PRNG_BCR                                            5
+#define GCC_QUPV3_WRAPPER_0_BCR                                 6
+#define GCC_QUPV3_WRAPPER_1_BCR                                 7
+#define GCC_QUSB2PHY_PRIM_BCR                                   8
+#define GCC_QUSB2PHY_SEC_BCR                                    9
+#define GCC_SDCC2_BCR                                           10
+#define GCC_SDCC4_BCR                                           11
+#define GCC_TSIF_BCR                                            12
+#define GCC_UFS_CARD_BCR                                        13
+#define GCC_UFS_PHY_BCR                                         14
+#define GCC_USB30_PRIM_BCR                                      15
+#define GCC_USB30_SEC_BCR                                       16
+#define GCC_USB3_PHY_PRIM_BCR                                   17
+#define GCC_USB3PHY_PHY_PRIM_BCR                                18
+#define GCC_USB3_DP_PHY_PRIM_BCR                                19
+#define GCC_USB3_PHY_SEC_BCR                                    20
+#define GCC_USB3PHY_PHY_SEC_BCR                                 21
+#define GCC_USB3_DP_PHY_SEC_BCR                                 22
+#define GCC_USB_PHY_CFG_AHB2PHY_BCR                             23
+#define GCC_PCIE_0_PHY_BCR                                      24
+#define GCC_PCIE_1_PHY_BCR                                      25
+
+/* GCC GDSCRs */
+#define PCIE_0_GDSC                                             0
+#define PCIE_1_GDSC                                             1
+#define UFS_CARD_GDSC                                           2
+#define UFS_PHY_GDSC                                            3
+#define USB30_PRIM_GDSC                                         4
+#define USB30_SEC_GDSC                                          5
+#define HLOS1_VOTE_AGGRE_NOC_MMU_AUDIO_TBU_GDSC                 6
+#define HLOS1_VOTE_AGGRE_NOC_MMU_PCIE_TBU_GDSC                  7
+#define HLOS1_VOTE_AGGRE_NOC_MMU_TBU1_GDSC                      8
+#define HLOS1_VOTE_AGGRE_NOC_MMU_TBU2_GDSC                      9
+#define HLOS1_VOTE_MMNOC_MMU_TBU_HF0_GDSC                       10
+#define HLOS1_VOTE_MMNOC_MMU_TBU_HF1_GDSC                       11
+#define HLOS1_VOTE_MMNOC_MMU_TBU_SF_GDSC                        12
+
+#endif
diff --git a/include/dt-bindings/clock/qcom,videocc-sdm845.h b/include/dt-bindings/clock/qcom,videocc-sdm845.h
new file mode 100644
index 000000000000..1b868165e8ce
--- /dev/null
+++ b/include/dt-bindings/clock/qcom,videocc-sdm845.h
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+#ifndef _DT_BINDINGS_CLK_SDM_VIDEO_CC_SDM845_H
+#define _DT_BINDINGS_CLK_SDM_VIDEO_CC_SDM845_H
+
+/* VIDEO_CC clock registers */
+#define VIDEO_CC_APB_CLK                0
+#define VIDEO_CC_AT_CLK                 1
+#define VIDEO_CC_QDSS_TRIG_CLK          2
+#define VIDEO_CC_QDSS_TSCTR_DIV8_CLK    3
+#define VIDEO_CC_VCODEC0_AXI_CLK        4
+#define VIDEO_CC_VCODEC0_CORE_CLK       5
+#define VIDEO_CC_VCODEC1_AXI_CLK        6
+#define VIDEO_CC_VCODEC1_CORE_CLK       7
+#define VIDEO_CC_VENUS_AHB_CLK          8
+#define VIDEO_CC_VENUS_CLK_SRC          9
+#define VIDEO_CC_VENUS_CTL_AXI_CLK      10
+#define VIDEO_CC_VENUS_CTL_CORE_CLK     11
+#define VIDEO_PLL0                      12
+
+/* VIDEO_CC Resets */
+#define VIDEO_CC_VENUS_BCR              0
+#define VIDEO_CC_VCODEC0_BCR            1
+#define VIDEO_CC_VCODEC1_BCR            2
+#define VIDEO_CC_INTERFACE_BCR          3
+
+/* VIDEO_CC GDSCRs */
+#define VENUS_GDSC                      0
+#define VCODEC0_GDSC                    1
+#define VCODEC1_GDSC                    2
+
+#endif