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

Commit 53d9b647 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge fb6fe00f on remote branch 

Change-Id: Ic451b31731b22247a10e5b77086c1f5af1b4c7a5
parents 753409d8 fb6fe00f

Makefile.am

100755 → 100644
+2 −2
Original line number Diff line number Diff line
@@ -43,14 +43,14 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/wcd937x/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295 sa8295))

KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y

obj-m := ipc/

obj-m += dsp/

obj-m += asoc/

obj-m += asoc/codecs/

obj-m += soc/

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa8195))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa8195 sa8295))

KBUILD_OPTIONS += CONFIG_SND_SOC_SA8155=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa6155))

asoc/bengal.c

+1 −3
Original line number Diff line number Diff line
@@ -930,8 +930,6 @@ static int usb_audio_tx_format_get(struct snd_kcontrol *kcontrol, 
static int usb_audio_tx_format_put(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	int rc = 0;



	switch (ucontrol->value.integer.value[0]) {

	case 3:

		usb_tx_cfg.bit_format = SNDRV_PCM_FORMAT_S32_LE;
@@ -951,7 +949,7 @@ static int usb_audio_tx_format_put(struct snd_kcontrol *kcontrol, 
		 __func__, usb_tx_cfg.bit_format,

		 ucontrol->value.integer.value[0]);



	return rc;

	return 0;

}



static int usb_audio_rx_ch_get(struct snd_kcontrol *kcontrol,

asoc/codecs/wcd-mbhc-adc.c

+9 −5
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ static bool wcd_mbhc_adc_check_for_spl_headset(struct wcd_mbhc *mbhc, 
	adc_hph_threshold = wcd_mbhc_adc_get_hph_thres(mbhc);



	if (output_mv > adc_threshold || output_mv < adc_hph_threshold) {

		if (mbhc->force_linein == true)

			spl_hs = false;

	} else {

		spl_hs = true;
@@ -515,10 +516,13 @@ static bool wcd_is_special_headset(struct wcd_mbhc *mbhc) 
		msleep(50);

		output_mv = wcd_measure_adc_once(mbhc, MUX_CTL_IN2P);

		if (output_mv <= adc_threshold) {

			pr_debug("%s: Special headset detected in %d msecs\n",

			if (mbhc->force_linein != true) {

				pr_debug(

				"%s: Special headset detected in %d msecs\n",

					 __func__, delay);

				is_spl_hs = true;

			}

		}



		if (delay == SPECIAL_HS_DETECT_TIME_MS) {

			pr_debug("%s: Spl headset not found in 2 sec\n",
@@ -831,7 +835,7 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
			}

		}



		if (output_mv > hs_threshold) {

		if (output_mv > hs_threshold || mbhc->force_linein == true) {

			pr_debug("%s: cable is extension cable\n", __func__);

			plug_type = MBHC_PLUG_TYPE_HIGH_HPH;

			wrk_complete = true;

asoc/codecs/wcd934x/wcd934x-regmap.c

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

/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2018, 2021, The Linux Foundation. All rights reserved.

 */



#include <linux/regmap.h>
@@ -1832,6 +1832,8 @@ int wcd934x_regmap_register_patch(struct regmap *regmap, int revision) 
					    ARRAY_SIZE(wcd934x_1_1_defaults));

		regcache_cache_only(regmap, false);

		break;

	default:

		break;

	}



	return rc;

asoc/codecs/wcd9xxx-core.c

+2 −2
Original line number Diff line number Diff line
@@ -638,9 +638,9 @@ static int wcd9xxx_device_init(struct wcd9xxx *wcd9xxx) 
	wcd9xxx_bringdown(wcd9xxx->dev);

	wcd9xxx_core_res_deinit(&wcd9xxx->core_res);

err_bring_up:

	mutex_destroy(&wcd9xxx->io_lock);

	mutex_destroy(&wcd9xxx->xfer_lock);

	mutex_destroy(&wcd9xxx->reset_lock);

	mutex_destroy(&wcd9xxx->xfer_lock);

	mutex_destroy(&wcd9xxx->io_lock);

	return ret;

}