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

Commit 7978f15d authored by Odelu Kukatla's avatar Odelu Kukatla Committed by Gerrit - the friendly Code Review server
Browse files

clk: qcom: Use regmap_update_bits() to update the clock flags 



Currently clk_cbcr_set_flags() reads the CBCR register content,
modifies the flags and writes back the updated value into it.
Sometimes clk_set_flags() gets invoked for the same clock
while clk_enable() is in progress causing the CLK_ENABLE bit
getting updated outside of clk_enable() path. Therefore, use
regmap_update_bits() to update the flags in CBCR register.
Also add a barrier in clock enable/disable path to make
sure that register write goes through.

Change-Id: I8018f8033d05273320fd92cc7d21fcdce0885dfc
Signed-off-by: default avatarOdelu Kukatla <okukatla@codeaurora.org>
parent 8ca6d749

drivers/clk/qcom/clk-branch.c

+18 −10
Original line number Diff line number Diff line
@@ -115,6 +115,12 @@ static int clk_branch_toggle(struct clk_hw *hw, bool en, 
		clk_disable_regmap(hw);

	}



	/*

	 * Make sure enable/disable request goes through before waiting

	 * for CLK_OFF status to get updated.

	 */

	mb();



	return clk_branch_wait(br, en, check_halt);

}
@@ -126,34 +132,36 @@ static int clk_branch_enable(struct clk_hw *hw) 
static int clk_cbcr_set_flags(struct regmap *regmap, unsigned int reg,

				unsigned long flags)

{

	u32 cbcr_val;



	regmap_read(regmap, reg, &cbcr_val);

	u32 cbcr_val = 0;

	u32 cbcr_mask;

	int ret;



	switch (flags) {

	case CLKFLAG_PERIPH_OFF_SET:

		cbcr_val |= BIT(12);

		cbcr_val = cbcr_mask = BIT(12);

		break;

	case CLKFLAG_PERIPH_OFF_CLEAR:

		cbcr_val &= ~BIT(12);

		cbcr_mask = BIT(12);

		break;

	case CLKFLAG_RETAIN_PERIPH:

		cbcr_val |= BIT(13);

		cbcr_val = cbcr_mask = BIT(13);

		break;

	case CLKFLAG_NORETAIN_PERIPH:

		cbcr_val &= ~BIT(13);

		cbcr_mask = BIT(13);

		break;

	case CLKFLAG_RETAIN_MEM:

		cbcr_val |= BIT(14);

		cbcr_val = cbcr_mask = BIT(14);

		break;

	case CLKFLAG_NORETAIN_MEM:

		cbcr_val &= ~BIT(14);

		cbcr_mask = BIT(14);

		break;

	default:

		return -EINVAL;

	}



	regmap_write(regmap, reg, cbcr_val);

	ret = regmap_update_bits(regmap, reg, cbcr_mask, cbcr_val);

	if (ret)

		return ret;



	/* Make sure power is enabled/disabled before returning. */

	mb();