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

Commit 65af65b1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: bolero: Update fs_clk gen for va macro" into audio-drivers.lnx.5.0

parents e76174a3 9daf376e
Loading
Loading
Loading
Loading
+18 −20
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static int va_macro_mclk_enable(struct va_macro_priv *va_priv,

	mutex_lock(&va_priv->mclk_lock);
	if (mclk_enable) {
		if (va_priv->va_mclk_users == 0) {
		ret = bolero_clk_rsc_request_clock(va_priv->dev,
						   va_priv->default_clk_id,
						   va_priv->clk_id,
@@ -239,6 +238,7 @@ static int va_macro_mclk_enable(struct va_macro_priv *va_priv,
		}
		bolero_clk_rsc_fs_gen_request(va_priv->dev,
					      true);
		if (va_priv->va_mclk_users == 0) {
			regcache_mark_dirty(regmap);
			regcache_sync_region(regmap,
					VA_START_OFFSET,
@@ -253,7 +253,6 @@ static int va_macro_mclk_enable(struct va_macro_priv *va_priv,
			goto exit;
		}
		va_priv->va_mclk_users--;
		if (va_priv->va_mclk_users == 0) {
		bolero_clk_rsc_fs_gen_request(va_priv->dev,
					  false);
		bolero_clk_rsc_request_clock(va_priv->dev,
@@ -261,7 +260,6 @@ static int va_macro_mclk_enable(struct va_macro_priv *va_priv,
					va_priv->clk_id,
					false);
	}
	}
exit:
	mutex_unlock(&va_priv->mclk_lock);
	return ret;