Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a1cc4c2 authored by Jasper Mattsson's avatar Jasper Mattsson Committed by Stephen Boyd
Browse files

clk: mediatek: Add flags to mtk_gate 



This is required to mark gates as CLK_IS_CRITICAL.

Signed-off-by: default avatarJasper Mattsson <jasu@njomotys.info>
Acked-by: default avatarMars Cheng <mars.cheng@mediatek.com>
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 03c4fda6

drivers/clk/mediatek/clk-gate.c

+3 −1
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ struct clk *mtk_clk_register_gate( 
		int clr_ofs,

		int sta_ofs,

		u8 bit,

		const struct clk_ops *ops)

		const struct clk_ops *ops,

		unsigned long flags)

{

	struct mtk_clk_gate *cg;

	struct clk *clk;
@@ -172,6 +173,7 @@ struct clk *mtk_clk_register_gate( 
	init.parent_names = parent_name ? &parent_name : NULL;

	init.num_parents = parent_name ? 1 : 0;

	init.ops = ops;

	init.flags = flags;



	cg->regmap = regmap;

	cg->set_ofs = set_ofs;

drivers/clk/mediatek/clk-gate.h

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct clk *mtk_clk_register_gate( 
		int clr_ofs,

		int sta_ofs,

		u8 bit,

		const struct clk_ops *ops);

		const struct clk_ops *ops,

		unsigned long flags);



#endif /* __DRV_CLK_GATE_H */

drivers/clk/mediatek/clk-mtk.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int mtk_clk_register_gates(struct device_node *node, 
				gate->regs->set_ofs,

				gate->regs->clr_ofs,

				gate->regs->sta_ofs,

				gate->shift, gate->ops);

				gate->shift, gate->ops, gate->flags);



		if (IS_ERR(clk)) {

			pr_err("Failed to register clk %s: %ld\n",

drivers/clk/mediatek/clk-mtk.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ struct mtk_gate { 
	const struct mtk_gate_regs *regs;

	int shift;

	const struct clk_ops *ops;

	unsigned long flags;

};



int mtk_clk_register_gates(struct device_node *node,