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

Commit c3c0c55a authored by KakatkarAkshay's avatar KakatkarAkshay
Browse files

Merge tag 'LA.UM.9.12.1.r1-00300-SMxx50.QSSI12.0' of...

Merge tag 'LA.UM.9.12.1.r1-00300-SMxx50.QSSI12.0' of https://source.codeaurora.org/quic/la/platform/vendor/opensource/audio-kernel into HEAD

"LA.UM.9.12.1.r1-00300-SMxx50.QSSI12.0"
parents 4eaf2072 e6caa5f6
Loading
Loading
Loading
Loading
+17 −1
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
 * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
 */

#include <linux/module.h>
@@ -987,6 +987,22 @@ static int wcd937x_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,
			snd_soc_component_update_bits(component,
					WCD937X_DIGITAL_PDM_WD_CTL0,
					0x17, 0x00);
		usleep_range(10000, 10010);
		/* disable EAR CnP FSM */
		snd_soc_component_update_bits(component,
					WCD937X_EAR_EAR_EN_REG,
					0x02, 0x00);
		/* toggle EAR PA to let PA control registers take effect */
		snd_soc_component_update_bits(component,
					WCD937X_ANA_EAR,
					0x80, 0x80);
		snd_soc_component_update_bits(component,
					WCD937X_ANA_EAR,
					0x80, 0x00);
		/* enable EAR CnP FSM */
		snd_soc_component_update_bits(component,
					WCD937X_EAR_EAR_EN_REG,
					0x02, 0x02);
		break;
	};
	return ret;
+5 −0
Original line number Diff line number Diff line
@@ -2373,6 +2373,11 @@ static void msm_pcm_routing_process_voice(u16 reg, u16 val, int set)
	session_id = msm_pcm_routing_get_voc_sessionid(val);
	if (!session_id) {
		pr_err("%s: Invalid session_id %x\n", __func__, session_id);
		return;
	}
	pr_debug("%s: FE DAI 0x%x session_id 0x%x\n",
		__func__, val, session_id);