aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJasper Mattsson <jasu@njomotys.info>2019-02-14 11:32:30 -0500
committerStephen Boyd <sboyd@kernel.org>2019-02-26 12:53:39 -0500
commit5a1cc4c27ad2aa3f988e2d69ce281fd3e8292ce3 (patch)
treee8780d2b15d30b1c70ecae36e4a1c6c2ad1b1726
parent03c4fda603fb48d5bb58cc72906dd592a54e464f (diff)
clk: mediatek: Add flags to mtk_gate
This is required to mark gates as CLK_IS_CRITICAL. Signed-off-by: Jasper Mattsson <jasu@njomotys.info> Acked-by: Mars Cheng <mars.cheng@mediatek.com> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--drivers/clk/mediatek/clk-gate.c4
-rw-r--r--drivers/clk/mediatek/clk-gate.h3
-rw-r--r--drivers/clk/mediatek/clk-mtk.c2
-rw-r--r--drivers/clk/mediatek/clk-mtk.h1
4 files changed, 7 insertions, 3 deletions
diff --git a/drivers/clk/mediatek/clk-gate.c b/drivers/clk/mediatek/clk-gate.c
index 934bf0e45e26..9628d4e7690b 100644
--- a/drivers/clk/mediatek/clk-gate.c
+++ b/drivers/clk/mediatek/clk-gate.c
@@ -157,7 +157,8 @@ struct clk *mtk_clk_register_gate(
157 int clr_ofs, 157 int clr_ofs,
158 int sta_ofs, 158 int sta_ofs,
159 u8 bit, 159 u8 bit,
160 const struct clk_ops *ops) 160 const struct clk_ops *ops,
161 unsigned long flags)
161{ 162{
162 struct mtk_clk_gate *cg; 163 struct mtk_clk_gate *cg;
163 struct clk *clk; 164 struct clk *clk;
@@ -172,6 +173,7 @@ struct clk *mtk_clk_register_gate(
172 init.parent_names = parent_name ? &parent_name : NULL; 173 init.parent_names = parent_name ? &parent_name : NULL;
173 init.num_parents = parent_name ? 1 : 0; 174 init.num_parents = parent_name ? 1 : 0;
174 init.ops = ops; 175 init.ops = ops;
176 init.flags = flags;
175 177
176 cg->regmap = regmap; 178 cg->regmap = regmap;
177 cg->set_ofs = set_ofs; 179 cg->set_ofs = set_ofs;
diff --git a/drivers/clk/mediatek/clk-gate.h b/drivers/clk/mediatek/clk-gate.h
index 72ef89b3ad7b..9f766dfe1d57 100644
--- a/drivers/clk/mediatek/clk-gate.h
+++ b/drivers/clk/mediatek/clk-gate.h
@@ -47,6 +47,7 @@ struct clk *mtk_clk_register_gate(
47 int clr_ofs, 47 int clr_ofs,
48 int sta_ofs, 48 int sta_ofs,
49 u8 bit, 49 u8 bit,
50 const struct clk_ops *ops); 50 const struct clk_ops *ops,
51 unsigned long flags);
51 52
52#endif /* __DRV_CLK_GATE_H */ 53#endif /* __DRV_CLK_GATE_H */
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 9c0ae4278a94..ef410413bb0b 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -130,7 +130,7 @@ int mtk_clk_register_gates(struct device_node *node,
130 gate->regs->set_ofs, 130 gate->regs->set_ofs,
131 gate->regs->clr_ofs, 131 gate->regs->clr_ofs,
132 gate->regs->sta_ofs, 132 gate->regs->sta_ofs,
133 gate->shift, gate->ops); 133 gate->shift, gate->ops, gate->flags);
134 134
135 if (IS_ERR(clk)) { 135 if (IS_ERR(clk)) {
136 pr_err("Failed to register clk %s: %ld\n", 136 pr_err("Failed to register clk %s: %ld\n",
diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index daab6ee94788..987ff2855249 100644
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -162,6 +162,7 @@ struct mtk_gate {
162 const struct mtk_gate_regs *regs; 162 const struct mtk_gate_regs *regs;
163 int shift; 163 int shift;
164 const struct clk_ops *ops; 164 const struct clk_ops *ops;
165 unsigned long flags;
165}; 166};
166 167
167int mtk_clk_register_gates(struct device_node *node, 168int mtk_clk_register_gates(struct device_node *node,