---
  drivers/clk/imx/clk-composite-8m.c | 18 ++++++++++++++----
  drivers/clk/imx/clk.h              | 13 +++++++++++--
  2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index e0f25983e80f..4174506e8bdd 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c

@@ -15,6 +15,7 @@
  #define PCG_PREDIV_MAX		8
  
  #define PCG_DIV_SHIFT		0
+#define PCG_CORE_DIV_WIDTH	3
  #define PCG_DIV_WIDTH		6
  #define PCG_DIV_MAX		64
  

@@ -126,6 +127,7 @@ static const struct clk_ops imx8m_clk_composite_divider_ops = {
  struct clk_hw *imx8m_clk_hw_composite_flags(const char *name,
  					const char * const *parent_names,
  					int num_parents, void __iomem *reg,
+					u32 composite_flags,
  					unsigned long flags)
  {
  	struct clk_hw *hw = ERR_PTR(-ENOMEM), *mux_hw;

@@ -133,6 +135,7 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name,
  	struct clk_divider *div = NULL;
  	struct clk_gate *gate = NULL;
  	struct clk_mux *mux = NULL;
+	const struct clk_ops *divider_ops;
  
  	mux = kzalloc(sizeof(*mux), GFP_KERNEL);
  	if (!mux)

@@ -149,8 +152,16 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name,
  
  	div_hw = &div->hw;
  	div->reg = reg;
-	div->shift = PCG_PREDIV_SHIFT;
-	div->width = PCG_PREDIV_WIDTH;
+	if (composite_flags & IMX_COMPOSITE_CORE) {
+		div->shift = PCG_DIV_SHIFT;
+		div->width = PCG_CORE_DIV_WIDTH;
+		divider_ops = &clk_divider_ops;
+	} else {
+		div->shift = PCG_PREDIV_SHIFT;
+		div->width = PCG_PREDIV_WIDTH;
+		divider_ops = &imx8m_clk_composite_divider_ops;
+	}
+
  	div->lock = &imx_ccm_lock;
  	div->flags = CLK_DIVIDER_ROUND_CLOSEST;
  

@@ -164,8 +175,7 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name,
  
  	hw = clk_hw_register_composite(NULL, name, parent_names, num_parents,
  			mux_hw, &clk_mux_ops, div_hw,
-			&imx8m_clk_composite_divider_ops,
-			gate_hw, &clk_gate_ops, flags);
+			divider_ops, gate_hw, &clk_gate_ops, flags);
  	if (IS_ERR(hw))
  		goto fail;
  

diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
index b05213b91dcf..f074dd8ec42e 100644
--- a/drivers/clk/imx/clk.h
+++ b/drivers/clk/imx/clk.h

@@ -477,20 +477,29 @@ struct clk_hw *imx_clk_hw_cpu(const char *name, const char *parent_name,
  		struct clk *div, struct clk *mux, struct clk *pll,
  		struct clk *step);
  
+#define IMX_COMPOSITE_CORE	BIT(0)
+
  struct clk_hw *imx8m_clk_hw_composite_flags(const char *name,
  					    const char * const *parent_names,
  					    int num_parents,
  					    void __iomem *reg,
+					    u32 composite_flags,
  					    unsigned long flags);
  
+#define imx8m_clk_hw_composite_core(name, parent_names, reg)	\
+	imx8m_clk_hw_composite_flags(name, parent_names, \
+			ARRAY_SIZE(parent_names), reg, \
+			IMX_COMPOSITE_CORE, \
+			CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE)
+
  #define imx8m_clk_composite_flags(name, parent_names, num_parents, reg, \
  				  flags) \
  	to_clk(imx8m_clk_hw_composite_flags(name, parent_names, \
-				num_parents, reg, flags))
+				num_parents, reg, 0, flags))
  
  #define __imx8m_clk_hw_composite(name, parent_names, reg, flags) \
  	imx8m_clk_hw_composite_flags(name, parent_names, \
-		ARRAY_SIZE(parent_names), reg, \
+		ARRAY_SIZE(parent_names), reg, 0, \
  		flags | CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE)
  
  #define __imx8m_clk_composite(name, parent_names, reg, flags) \