Merge 58f399da801f4a7cd663aeac73cff31f999e243c on remote branch (83e372bc) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/codecs/swr-dmic.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -593,11 +593,11 @@ static int swr_dmic_probe(struct swr_device *pdev)
		}

		/*
		* Add 5msec delay to provide sufficient time for
		* Add 10msec delay to provide sufficient time for
		* soundwire auto enumeration of slave devices as
		* as per HW requirement.
		*/
		usleep_range(5000, 5010);
		usleep_range(10000, 10010);
		do {
		/* Add delay for soundwire enumeration */
		usleep_range(100, 110);

+6 −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>
		@@ -178,6 +178,11 @@ static int wcd937x_init_reg(struct snd_soc_component *component)
		0xFF, 0xFA);
		snd_soc_component_update_bits(component, WCD937X_MICB3_TEST_CTL_1,
		0xFF, 0xFA);
		/* Set VBG Voltage to P0.5V for Tanggu second source */
		if (snd_soc_component_read32(component, WCD937X_DIGITAL_EFUSE_REG_16)
		== 0x01)
		snd_soc_component_update_bits(component,
		WCD937X_BIAS_VBG_FINE_ADJ, 0xF0, 0xB0);
		return 0;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -2876,6 +2876,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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -2451,7 +2451,7 @@ static void send_adm_cal(int fedai_id, int port_id, int copp_idx, int path, int
		perf_mode, app_type, acdb_id, sample_rate);
		/* send persistent cal only in case of record */
		if (path == TX_DEVICE)
		send_adm_cal_type(fedai_id, ADM_LSM_AUDPROC_PERSISTENT_CAL, path,
		send_adm_cal_type(fedai_id, ADM_AUDPROC_PERSISTENT_CAL, path,
		port_id, copp_idx, perf_mode, app_type,
		acdb_id, sample_rate);
		} else {