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

Commit 36cd8e60 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 58f399da on remote branch 

Change-Id: I1f378192f200acbef1bfc1b8064a615bd50ebc44
parents de532b5f 58f399da

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);

asoc/codecs/wcd937x/wcd937x.c

+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;

}

asoc/msm-audio-effects-q6-v2.c

+4 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/slab.h>
@@ -16,7 +16,7 @@ 
#define GET_NEXT(ptr, upper_limit, rc)                                  \

({                                                                      \

	if (((ptr) + 1) > (upper_limit)) {                              \

		pr_err_ratelimited("%s: param list out of boundary\n",  \

		pr_debug_ratelimited("%s: param list out of boundary\n",  \

				   __func__);				\

		(rc) = -EINVAL;                                         \

	}                                                               \
@@ -26,7 +26,7 @@ 
#define CHECK_PARAM_LEN(len, max_len, tag, rc)                          \

do {                                                                    \

	if ((len) > (max_len)) {                                        \

		pr_err_ratelimited("%s: params length overflows\n",	\

		pr_debug_ratelimited("%s: params length overflows\n",	\

				   (tag));				\

		(rc) = -EINVAL;                                         \

	}                                                               \
@@ -1409,7 +1409,7 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac, 
					"VOLUME/VOLUME2_GAIN_MASTER", rc);

			break;

		default:

			pr_err_ratelimited("%s: Invalid command id: %d to set config\n",

			pr_debug_ratelimited("%s: Invalid command id: %d to set config\n",

				__func__, command_id);

			continue;

		}

asoc/msm-dai-q6-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -4697,7 +4697,7 @@ static struct snd_soc_dai_driver msm_dai_q6_afe_rx_dai[] = { 
			 .formats = SNDRV_PCM_FMTBIT_S16_LE |

			 SNDRV_PCM_FMTBIT_S24_LE,

			 .channels_min = 1,

			 .channels_max = 2,

			 .channels_max = 10,

			 .rate_min =     8000,

			 .rate_max =	48000,

		},

asoc/msm-pcm-afe-v2.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.

 */
@@ -50,7 +50,7 @@ static struct snd_pcm_hardware msm_afe_hardware_playback = { 
	.rate_min =             8000,

	.rate_max =             48000,

	.channels_min =         1,

	.channels_max =         6,

	.channels_max =         10,

	.buffer_bytes_max =     MAX_PLAYBACK_PERIOD_SIZE *

				MAX_PLAYBACK_NUM_PERIODS,

	.period_bytes_min =     MIN_PLAYBACK_PERIOD_SIZE,