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

Commit 8f7ccc2e authored by Laxminath Kasam's avatar Laxminath Kasam
Browse files

audio-lnx: Add latest snapshot for audio drivers. 



Propagate the changes based on latest snapshot
for audio kernel source tree at below cutoff of
kernel msm-4.9 -
(040750bf -
 "Revert "ARM: dts: msm: Add DT node for aop-qmp
  clock controller on SDM845 v2"")

CRs-Fixed: 2104096
Change-Id: I0927c40b3a188dbf892e7ec4c1c7810953724929
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent 8b3bdea2

asoc/codecs/msm-cdc-pinctrl.c

+8 −2
Original line number Diff line number Diff line
@@ -217,8 +217,14 @@ static int msm_cdc_pinctrl_remove(struct platform_device *pdev) 


	gpio_data = dev_get_drvdata(&pdev->dev);



	if (gpio_data && gpio_data->pinctrl)

	/* to free the requested gpio before exiting */

	if (gpio_data) {

		if (gpio_is_valid(gpio_data->gpio))

			gpio_free(gpio_data->gpio);



		if (gpio_data->pinctrl)

			devm_pinctrl_put(gpio_data->pinctrl);

	}



	devm_kfree(&pdev->dev, gpio_data);

asoc/codecs/wcd-spi.c

+4 −0
Original line number Diff line number Diff line
@@ -1374,6 +1374,10 @@ static void wcd_spi_component_unbind(struct device *dev, 
{

	struct spi_device *spi = to_spi_device(dev);

	struct wcd_spi_priv *wcd_spi = spi_get_drvdata(spi);

	struct wcd_spi_debug_data *dbg_data = &wcd_spi->debug_data;



	debugfs_remove_recursive(dbg_data->dir);

	dbg_data->dir = NULL;



	wcd_spi->m_dev = NULL;

	wcd_spi->m_ops = NULL;

asoc/codecs/wcd9335.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
/* Convert from vout ctl to micbias voltage in mV */

#define WCD_VOUT_CTL_TO_MICB(v) (1000 + v * 50)



#define TASHA_ZDET_NUM_MEASUREMENTS 150

#define TASHA_ZDET_NUM_MEASUREMENTS 900

#define TASHA_MBHC_GET_C1(c)  ((c & 0xC000) >> 14)

#define TASHA_MBHC_GET_X1(x)  (x & 0x3FFF)

/* z value compared in milliOhm */

asoc/codecs/wcd934x/wcd934x-mbhc.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
/* Z floating defined in ohms */

#define TAVIL_ZDET_FLOATING_IMPEDANCE 0x0FFFFFFE



#define TAVIL_ZDET_NUM_MEASUREMENTS   150

#define TAVIL_ZDET_NUM_MEASUREMENTS   900

#define TAVIL_MBHC_GET_C1(c)          ((c & 0xC000) >> 14)

#define TAVIL_MBHC_GET_X1(x)          (x & 0x3FFF)

/* Z value compared in milliOhm */

asoc/codecs/wcd934x/wcd934x.c

+36 −4
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ static const struct snd_kcontrol_new name##_mux = \ 
#define WCD934X_DIG_CORE_REG_MIN  WCD934X_CDC_ANC0_CLK_RESET_CTL

#define WCD934X_DIG_CORE_REG_MAX  0xFFF



#define WCD934X_CHILD_DEVICES_MAX	6



#define WCD934X_MAX_MICBIAS 4

#define DAPM_MICBIAS1_STANDALONE "MIC BIAS1 Standalone"

#define DAPM_MICBIAS2_STANDALONE "MIC BIAS2 Standalone"
@@ -626,6 +628,11 @@ struct tavil_priv { 
	int power_active_ref;

	int sidetone_coeff_array[IIR_MAX][BAND_MAX]

		[WCD934X_CDC_SIDETONE_IIR_COEFF_MAX];



	struct spi_device *spi;

	struct platform_device *pdev_child_devices

		[WCD934X_CHILD_DEVICES_MAX];

	int child_count;

};



static const struct tavil_reg_mask_val tavil_spkr_default[] = {
@@ -5105,6 +5112,13 @@ static void tavil_restore_iir_coeff(struct tavil_priv *tavil, int iir_idx) 
	int band_idx = 0, coeff_idx = 0;

	struct snd_soc_codec *codec = tavil->codec;



	/*

	 * snd_soc_write call crashes at rmmod if there is no machine

	 * driver and hence no codec pointer available

	 */

	if (!codec)

		return;



	for (band_idx = 0; band_idx < BAND_MAX; band_idx++) {

		snd_soc_write(codec,

		(WCD934X_CDC_SIDETONE_IIR0_IIR_COEF_B1_CTL + 16 * iir_idx),
@@ -9397,6 +9411,9 @@ static int tavil_soc_codec_remove(struct snd_soc_codec *codec) 


	control = dev_get_drvdata(codec->dev->parent);

	devm_kfree(codec->dev, control->rx_chs);

	/* slimslave deinit in wcd core looks for this value */

	control->num_rx_port = 0;

	control->num_tx_port = 0;

	control->rx_chs = NULL;

	control->tx_chs = NULL;

	tavil_cleanup_irqs(tavil);
@@ -9736,6 +9753,7 @@ static void tavil_codec_add_spi_device(struct tavil_priv *tavil, 
		goto err_dt_parse;

	}



	tavil->spi = spi;

	/* Put the reference to SPI master */

	put_device(&master->dev);
@@ -9782,6 +9800,7 @@ static void tavil_add_child_devices(struct work_struct *work) 
	}



	platdata = &tavil->swr.plat_data;

	tavil->child_count = 0;



	for_each_child_of_node(wcd9xxx->dev->of_node, node) {
@@ -9849,6 +9868,10 @@ static void tavil_add_child_devices(struct work_struct *work) 
				__func__);

			tavil->swr.ctrl_data = swr_ctrl_data;

		}

		if (tavil->child_count < WCD934X_CHILD_DEVICES_MAX)

			tavil->pdev_child_devices[tavil->child_count++] = pdev;

		else

			goto err_mem;

	}



	return;
@@ -10076,11 +10099,24 @@ static int tavil_probe(struct platform_device *pdev) 
static int tavil_remove(struct platform_device *pdev)

{

	struct tavil_priv *tavil;

	int count = 0;



	tavil = platform_get_drvdata(pdev);

	if (!tavil)

		return -EINVAL;



	/* do dsd deinit before codec->component->regmap becomes freed */

	if (tavil->dsd_config) {

		tavil_dsd_deinit(tavil->dsd_config);

		tavil->dsd_config = NULL;

	}



	if (tavil->spi)

		spi_unregister_device(tavil->spi);

	for (count = 0; count < tavil->child_count &&

				count < WCD934X_CHILD_DEVICES_MAX; count++)

		platform_device_unregister(tavil->pdev_child_devices[count]);



	mutex_destroy(&tavil->micb_lock);

	mutex_destroy(&tavil->svs_mutex);

	mutex_destroy(&tavil->codec_mutex);
@@ -10091,10 +10127,6 @@ static int tavil_remove(struct platform_device *pdev) 
	snd_soc_unregister_codec(&pdev->dev);

	clk_put(tavil->wcd_ext_clk);

	wcd_resmgr_remove(tavil->resmgr);

	if (tavil->dsd_config) {

		tavil_dsd_deinit(tavil->dsd_config);

		tavil->dsd_config = NULL;

	}

	devm_kfree(&pdev->dev, tavil);

	return 0;

}