Merge "clk: qcom: clk-alpha: Reconfigure Fabia PLL during enable" (12eb0327) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/clk/qcom/clk-alpha-pll.c

+61 −7

Original line number	Diff line number	Diff line
		@@ -231,11 +231,16 @@ static int wait_for_pll(struct clk_alpha_pll *pll, u32 mask, bool inverse,
		#define wait_for_pll_update(pll) \
		wait_for_pll(pll, PLL_UPDATE, 1, "pll update")

		void clk_alpha_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		int clk_alpha_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		const struct alpha_pll_config *config)
		{
		u32 val, mask;

		if (!config) {
		pr_err("PLL configuration missing.\n");
		return -EINVAL;
		}

		regmap_write(regmap, pll->offset + PLL_L_VAL, config->l);
		regmap_write(regmap, pll->offset + PLL_ALPHA_VAL, config->alpha);
		regmap_write(regmap, pll->offset + PLL_ALPHA_VAL_U, config->alpha_u);
		@@ -301,6 +306,8 @@ void clk_alpha_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		if (pll->flags & SUPPORTS_FSM_MODE)
		qcom_pll_set_fsm_mode(regmap, pll->offset + PLL_MODE,
		6, 0);

		return 0;
		}

		static int clk_alpha_pll_hwfsm_enable(struct clk_hw *hw)
		@@ -388,7 +395,7 @@ static int clk_alpha_pll_enable(struct clk_hw *hw)
		{
		int ret;
		struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);
		u32 val, mask, off;
		u32 val, mask, off, l_val;

		off = pll->offset;

		@@ -413,6 +420,25 @@ static int clk_alpha_pll_enable(struct clk_hw *hw)
		if ((val & mask) == mask)
		return 0;

		ret = regmap_read(pll->clkr.regmap, off + PLL_L_VAL, &l_val);
		if (ret)
		return ret;

		/* PLL has lost it's L value, needs reconfiguration */
		if (!l_val) {
		if (pll->type == AGERA_PLL)
		ret = clk_agera_pll_configure(pll, pll->clkr.regmap,
		pll->config);
		else
		ret = clk_alpha_pll_configure(pll, pll->clkr.regmap,
		pll->config);
		if (ret) {
		pr_err("Failed to configure %s\n", clk_hw_get_name(hw));
		return ret;
		}
		pr_warn("PLL configuration lost, reconfiguration of PLL done.\n");
		}

		ret = regmap_update_bits(pll->clkr.regmap, off + PLL_MODE,
		PLL_BYPASSNL, PLL_BYPASSNL);
		if (ret)
		@@ -1880,11 +1906,16 @@ static int clk_fabia_pll_latch_input(struct clk_alpha_pll *pll,
		return ret;
		}

		void clk_fabia_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		int clk_fabia_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		const struct alpha_pll_config *config)
		{
		u32 val, mask;

		if (!config) {
		pr_err("PLL configuration missing.\n");
		return -EINVAL;
		}

		if (config->l)
		regmap_write(regmap, pll->offset + PLL_L_VAL,
		config->l);
		@@ -1940,13 +1971,14 @@ void clk_fabia_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		PLL_RESET_N, PLL_RESET_N);

		pll->inited = true;
		return 0;
		}

		static int clk_fabia_pll_enable(struct clk_hw *hw)
		{
		int ret;
		struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);
		u32 val, off = pll->offset;
		u32 val, off = pll->offset, l_val;

		ret = regmap_read(pll->clkr.regmap, off + PLL_MODE, &val);
		if (ret)
		@@ -1960,8 +1992,23 @@ static int clk_fabia_pll_enable(struct clk_hw *hw)
		return wait_for_pll_enable_active(pll);
		}

		if (unlikely(!pll->inited))
		clk_fabia_pll_configure(pll, pll->clkr.regmap, pll->config);
		ret = regmap_read(pll->clkr.regmap, pll->offset + PLL_L_VAL, &l_val);
		if (ret)
		return ret;

		/* PLL has lost it's L value, needs reconfiguration */
		if (!l_val)
		pll->inited = false;

		if (unlikely(!pll->inited)) {
		ret = clk_fabia_pll_configure(pll, pll->clkr.regmap,
		pll->config);
		if (ret) {
		pr_err("Failed to configure %s\n", clk_hw_get_name(hw));
		return ret;
		}
		pr_warn("PLL configuration lost, reconfiguration of PLL done.\n");
		}

		/* Disable PLL output */
		ret = regmap_update_bits(pll->clkr.regmap, off + PLL_MODE,
		@@ -2287,11 +2334,16 @@ const struct clk_ops clk_generic_pll_postdiv_ops = {
		};
		EXPORT_SYMBOL(clk_generic_pll_postdiv_ops);

		void clk_agera_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		int clk_agera_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		const struct alpha_pll_config *config)
		{
		u32 val, mask;

		if (!config) {
		pr_err("PLL configuration missing.\n");
		return -EINVAL;
		}

		if (config->l)
		regmap_write(regmap, pll->offset + PLL_L_VAL,
		config->l);
		@@ -2338,6 +2390,8 @@ void clk_agera_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		if (config->test_ctl_hi_val)
		regmap_write(regmap, pll->offset + AGERA_PLL_TEST_CTL_U,
		config->test_ctl_hi_val);

		return 0;
		}

		static unsigned long

drivers/clk/qcom/clk-alpha-pll.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -156,15 +156,15 @@ extern const struct clk_ops clk_alpha_pll_lucid_ops;
		extern const struct clk_ops clk_alpha_pll_fixed_lucid_ops;
		extern const struct clk_ops clk_alpha_pll_postdiv_lucid_ops;

		void clk_alpha_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		int clk_alpha_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		const struct alpha_pll_config *config);
		int clk_trion_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		const struct alpha_pll_config *config);
		int clk_regera_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,
		int clk_fabia_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		const struct alpha_pll_config *config);
		void clk_agera_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		int clk_agera_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		const struct alpha_pll_config *config);
		int clk_lucid_pll_configure(struct clk_alpha_pll pll, struct regmap regmap,
		const struct alpha_pll_config *config);