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

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

Merge "ASoC: wcd934x: enable rate converter clock for AANC"

parents 6d162862 d07060d4
Loading
Loading
Loading
Loading
+5 −7
Original line number Diff line number Diff line
@@ -1033,17 +1033,15 @@ static int tavil_codec_enable_anc(struct snd_soc_dapm_widget *w,
			snd_soc_write(codec, reg, (val & mask));
		}

		/* Rate converter clk enable and set bypass mode */
		snd_soc_update_bits(codec, WCD934X_CDC_ANC0_RC_COMMON_CTL,
				    0x05, 0x05);
		if (!hwdep_cal)
			release_firmware(fw);
		break;
	case SND_SOC_DAPM_POST_PMU:
		/* Remove ANC Rx from reset */
		snd_soc_update_bits(codec, WCD934X_CDC_ANC0_CLK_RESET_CTL,
				    0x08, 0x00);
		snd_soc_update_bits(codec, WCD934X_CDC_ANC1_CLK_RESET_CTL,
				    0x08, 0x00);
		break;
	case SND_SOC_DAPM_POST_PMD:
		snd_soc_update_bits(codec, WCD934X_CDC_ANC0_RC_COMMON_CTL,
				    0x05, 0x00);
		if (!strcmp(w->name, "ANC EAR PA") ||
		    !strcmp(w->name, "ANC SPK1 PA")) {
			snd_soc_update_bits(codec, WCD934X_CDC_ANC0_MODE_1_CTL,