Commit e5dbdcb3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.5-rc6' of... 

Merge tag 'asoc-fix-v5.5-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.5

This is mostly driver specific fixes, plus an error handling fix
in the core.  There is a rather large diffstat for the stm32 SAI
driver, this is a very large but mostly mechanical update which
wraps every register access in the driver to allow a fix to the
locking which avoids circular locks, the active change is much
smaller and more reasonably sized.
parents 60adcfde 85578bbd

sound/soc/codecs/cros_ec_codec.c

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <crypto/hash.h>

#include <crypto/sha.h>

#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/io.h>
@@ -1047,10 +1048,17 @@ static const struct of_device_id cros_ec_codec_of_match[] = { 
MODULE_DEVICE_TABLE(of, cros_ec_codec_of_match);

#endif



static const struct acpi_device_id cros_ec_codec_acpi_id[] = {

	{ "GOOG0013", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, cros_ec_codec_acpi_id);



static struct platform_driver cros_ec_codec_platform_driver = {

	.driver = {

		.name = "cros-ec-codec",

		.of_match_table = of_match_ptr(cros_ec_codec_of_match),

		.acpi_match_table = ACPI_PTR(cros_ec_codec_acpi_id),

	},

	.probe = cros_ec_codec_platform_probe,

};

sound/soc/codecs/hdac_hda.c

+3 −1
Original line number Diff line number Diff line
@@ -588,7 +588,9 @@ static int hdac_hda_dev_remove(struct hdac_device *hdev) 
	struct hdac_hda_priv *hda_pvt;



	hda_pvt = dev_get_drvdata(&hdev->dev);

	if (hda_pvt && hda_pvt->codec.registered)

		cancel_delayed_work_sync(&hda_pvt->codec.jackpoll_work);



	return 0;

}

sound/soc/codecs/msm8916-wcd-analog.c

+15 −5
Original line number Diff line number Diff line
@@ -396,9 +396,6 @@ static int pm8916_wcd_analog_enable_micbias_int(struct snd_soc_component 


	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_component_update_bits(component, CDC_A_MICB_1_INT_RBIAS,

				    MICB_1_INT_TX2_INT_RBIAS_EN_MASK,

				    MICB_1_INT_TX2_INT_RBIAS_EN_ENABLE);

		snd_soc_component_update_bits(component, reg, MICB_1_EN_PULL_DOWN_EN_MASK, 0);

		snd_soc_component_update_bits(component, CDC_A_MICB_1_EN,

				    MICB_1_EN_OPA_STG2_TAIL_CURR_MASK,
@@ -448,6 +445,14 @@ static int pm8916_wcd_analog_enable_micbias_int1(struct 
	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	struct pm8916_wcd_analog_priv *wcd = snd_soc_component_get_drvdata(component);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_component_update_bits(component, CDC_A_MICB_1_INT_RBIAS,

				    MICB_1_INT_TX1_INT_RBIAS_EN_MASK,

				    MICB_1_INT_TX1_INT_RBIAS_EN_ENABLE);

		break;

	}



	return pm8916_wcd_analog_enable_micbias_int(component, event, w->reg,

						     wcd->micbias1_cap_mode);

}
@@ -558,6 +563,11 @@ static int pm8916_wcd_analog_enable_micbias_int2(struct 
	struct pm8916_wcd_analog_priv *wcd = snd_soc_component_get_drvdata(component);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_component_update_bits(component, CDC_A_MICB_1_INT_RBIAS,

				    MICB_1_INT_TX2_INT_RBIAS_EN_MASK,

				    MICB_1_INT_TX2_INT_RBIAS_EN_ENABLE);

		break;

	case SND_SOC_DAPM_POST_PMU:

		pm8916_mbhc_configure_bias(wcd, true);

		break;
@@ -938,10 +948,10 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = { 


	SND_SOC_DAPM_SUPPLY("MIC BIAS External1", CDC_A_MICB_1_EN, 7, 0,

			    pm8916_wcd_analog_enable_micbias_ext1,

			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

			    SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("MIC BIAS External2", CDC_A_MICB_2_EN, 7, 0,

			    pm8916_wcd_analog_enable_micbias_ext2,

			    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

			    SND_SOC_DAPM_POST_PMU),



	SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0,

			   pm8916_wcd_analog_enable_adc,

sound/soc/codecs/msm8916-wcd-digital.c

+6 −0
Original line number Diff line number Diff line
@@ -586,6 +586,12 @@ static int msm8916_wcd_digital_enable_interpolator( 
		snd_soc_component_write(component, rx_gain_reg[w->shift],

			      snd_soc_component_read32(component, rx_gain_reg[w->shift]));

		break;

	case SND_SOC_DAPM_POST_PMD:

		snd_soc_component_update_bits(component, LPASS_CDC_CLK_RX_RESET_CTL,

					      1 << w->shift, 1 << w->shift);

		snd_soc_component_update_bits(component, LPASS_CDC_CLK_RX_RESET_CTL,

					      1 << w->shift, 0x0);

		break;

	}

	return 0;

}

sound/soc/codecs/rt5640.c

+7 −0
Original line number Diff line number Diff line
@@ -2432,6 +2432,13 @@ static void rt5640_disable_jack_detect(struct snd_soc_component *component) 
{

	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);



	/*

	 * soc_remove_component() force-disables jack and thus rt5640->jack

	 * could be NULL at the time of driver's module unloading.

	 */

	if (!rt5640->jack)

		return;



	disable_irq(rt5640->irq);

	rt5640_cancel_work(rt5640);

CRA Git | Maintained and supported by SUSTech CRA and CCSE