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

Commit 408afe18 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 9c87b94c on remote branch 

Change-Id: I379d6af571ba5c23c3867f350735c8980a82c5f6
parents acdc990f 9c87b94c

asoc/codecs/wcd-mbhc-adc.c

+5 −5
Original line number Diff line number Diff line
@@ -905,11 +905,6 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
		goto exit;

	}



	if ((plug_type == MBHC_PLUG_TYPE_HEADSET ||

	    plug_type == MBHC_PLUG_TYPE_HEADPHONE))

		if (mbhc->mbhc_cb->bcs_enable)

			mbhc->mbhc_cb->bcs_enable(mbhc, true);



	pr_debug("%s: Valid plug found, plug type %d wrk_cmpt %d btn_intr %d\n",

			__func__, plug_type, wrk_complete,

			mbhc->btn_press_intr);
@@ -932,6 +927,11 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
	else

		WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_DETECTION_DONE, 0);



	if ((plug_type == MBHC_PLUG_TYPE_HEADSET ||

	    plug_type == MBHC_PLUG_TYPE_HEADPHONE))

		if (mbhc->mbhc_cb->bcs_enable)

			mbhc->mbhc_cb->bcs_enable(mbhc, true);



	if (mbhc->mbhc_cb->mbhc_micbias_control)

		wcd_mbhc_adc_update_fsm_source(mbhc, plug_type);

exit:

asoc/codecs/wcd937x/wcd937x.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 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 */

	/* Set Bandgap Fine Adjustment to +5mV for Tanggu SMIC part */

	if (snd_soc_component_read32(component, WCD937X_DIGITAL_EFUSE_REG_16)

	    == 0x01)

		snd_soc_component_update_bits(component,

asoc/codecs/wsa881x-analog.c

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

/*

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

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

 */



#include <linux/clk.h>
@@ -922,7 +922,7 @@ static void wsa881x_ocp_ctl_work(struct work_struct *work) 
	struct wsa881x_pdata *wsa881x;

	struct delayed_work *dwork;

	struct snd_soc_component *component;

	int temp_val;

	int temp_val = 0;



	dwork = to_delayed_work(work);

	wsa881x = container_of(dwork, struct wsa881x_pdata, ocp_ctl_work);

asoc/msm-pcm-routing-v2.c

+13 −0
Original line number Diff line number Diff line
@@ -6124,6 +6124,18 @@ static int get_ec_ref_port_id(int value, int *index) 
		*index = 44;

		port_id = RT_PROXY_PORT_001_TX;

		break;

	case 45:

		*index = 45;

		port_id = AFE_PORT_ID_PRIMARY_TDM_RX_2;

		break;

	case 46:

		*index = 46;

		port_id = AFE_PORT_ID_TERTIARY_TDM_RX;

		break;

	case 47:

		*index = 47;

		port_id = AFE_PORT_ID_SECONDARY_TDM_TX_1;

		break;

	default:

		*index = 0; /* NONE */

		pr_err("%s: Invalid value %d\n", __func__, value);
@@ -6183,6 +6195,7 @@ static const char *const ec_ref_rx[] = { "None", "SLIM_RX", "I2S_RX", 
	"RX_CDC_DMA_RX_3", "TX_CDC_DMA_TX_0", "TERT_TDM_RX_2", "SEC_TDM_TX_0",

	"DISPLAY_PORT1", "SEN_MI2S_RX", "QUIN_TDM_TX_0", "SENARY_MI2S_TX",

	"PRI_TDM_RX_0", "PRI_TDM_TX_0", "QUIN_MI2S_RX", "AFE_PCM_TX",

	"PRI_TDM_RX_2", "TERT_TDM_RX_0", "SEC_TDM_TX_1",

};















static const struct soc_enum msm_route_ec_ref_rx_enum[] = {

























asoc/sa8155.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -10606,7 +10606,7 @@ static int msm_audio_ssr_compare(struct device *dev, void *data)













{















	struct device_node *node = data;





























	dev_dbg(dev, "%s: dev->of_node = 0x%p, node = 0x%p\n",













	dev_dbg(dev, "%s: dev->of_node = 0x%pK, node = 0x%pK\n",















		__func__, dev->of_node, node);















	return (dev->of_node && dev->of_node == node);















}