Merge "clk: qcom: Add support for gate clocks" into msm-next (4074a08e) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/clk/qcom/clk-branch.c

+36 −0

Original line number	Diff line number	Diff line
		@@ -200,6 +200,42 @@ const struct clk_ops clk_branch2_ops = {
		};
		EXPORT_SYMBOL_GPL(clk_branch2_ops);

		static int clk_gate_toggle(struct clk_hw *hw, bool en)
		{
		struct clk_gate2 *gt = to_clk_gate2(hw);
		int ret = 0;

		if (en) {
		ret = clk_enable_regmap(hw);
		if (ret)
		return ret;
		} else {
		clk_disable_regmap(hw);
		}

		if (gt->udelay)
		udelay(gt->udelay);

		return ret;
		}

		static int clk_gate2_enable(struct clk_hw *hw)
		{
		return clk_gate_toggle(hw, true);
		}

		static void clk_gate2_disable(struct clk_hw *hw)
		{
		clk_gate_toggle(hw, false);
		}

		const struct clk_ops clk_gate2_ops = {
		.enable = clk_gate2_enable,
		.disable = clk_gate2_disable,
		.is_enabled = clk_is_enabled_regmap,
		};
		EXPORT_SYMBOL_GPL(clk_gate2_ops);

		const struct clk_ops clk_branch_simple_ops = {
		.enable = clk_enable_regmap,
		.disable = clk_disable_regmap,

+16 −0

Original line number	Diff line number	Diff line
		@@ -46,11 +46,27 @@ struct clk_branch {
		struct clk_regmap clkr;
		};

		/**
		* struct clk_gate2 - gating clock with status bit and dynamic hardware gating
		* @udelay: halt delay in microseconds on clock branch enable/disable
		* @clkr: handle between common and hardware-specific interfaces
		*
		* Clock which can gate its output.
		*/
		struct clk_gate2 {
		u32 udelay;
		struct clk_regmap clkr;
		};

		extern const struct clk_ops clk_branch_ops;
		extern const struct clk_ops clk_branch2_ops;
		extern const struct clk_ops clk_gate2_ops;
		extern const struct clk_ops clk_branch_simple_ops;

		#define to_clk_branch(_hw) \
		container_of(to_clk_regmap(_hw), struct clk_branch, clkr)

		#define to_clk_gate2(_hw) \
		container_of(to_clk_regmap(_hw), struct clk_gate2, clkr)

		#endif