Commit b1d198c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A few piled ASoC fixes and usual HD-audio and USB-audio fixups. Some
  of them are for ASoC core error-handling"

* tag 'sound-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda: enable regmap internal locking
  ALSA: hda/realtek - Add quirk for the bass speaker on Lenovo Yoga X1 7th gen
  ALSA: hda/realtek - Set EAPD control to default for ALC222
  ALSA: usb-audio: Apply the sample rate quirk for Bose Companion 5
  ALSA: hda/realtek - Add new codec supported for ALCS1200A
  ASoC: Intel: boards: Fix compile-testing RT1011/RT5682
  ASoC: SOF: imx8: Fix dsp_box offset
  ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime()
  ASoC: fsl_audmix: add missed pm_runtime_disable
  ASoC: stm32: spdifrx: fix input pin state management
  ASoC: stm32: spdifrx: fix race condition in irq handler
  ASoC: stm32: spdifrx: fix inconsistent lock state
  ASoC: core: Fix access to uninitialized list heads
  ASoC: soc-core: Set dpcm_playback / dpcm_capture
  ASoC: SOF: imx8: fix memory allocation failure check on priv->pd_dev
  ASoC: SOF: Intel: hda: hda-dai: fix oops on hda_link .hw_free
  ASoC: SOF: fix fault at driver unload after failed probe
parents 658e1af5 8e85def5

sound/hda/hdac_regmap.c

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ static const struct regmap_config hda_regmap_cfg = { 
	.reg_write = hda_reg_write,

	.use_single_read = true,

	.use_single_write = true,

	.disable_locking = true,

};



/**

sound/pci/hda/patch_realtek.c

+5 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
	case 0x10ec0672:

		alc_update_coef_idx(codec, 0xd, 0, 1<<14); /* EAPD Ctrl */

		break;

	case 0x10ec0222:

	case 0x10ec0623:

		alc_update_coef_idx(codec, 0x19, 1<<13, 0);

		break;
@@ -430,6 +431,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
		break;

	case 0x10ec0899:

	case 0x10ec0900:

	case 0x10ec0b00:

	case 0x10ec1168:

	case 0x10ec1220:

		alc_update_coef_idx(codec, 0x7, 1<<1, 0);
@@ -2526,6 +2528,7 @@ static int patch_alc882(struct hda_codec *codec) 
	case 0x10ec0882:

	case 0x10ec0885:

	case 0x10ec0900:

	case 0x10ec0b00:

	case 0x10ec1220:

		break;

	default:
@@ -7257,6 +7260,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x224c, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x224d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Yoga 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1),

	SND_PCI_QUIRK(0x17aa, 0x2293, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1),

	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
@@ -9255,6 +9259,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = { 
	HDA_CODEC_ENTRY(0x10ec0892, "ALC892", patch_alc662),

	HDA_CODEC_ENTRY(0x10ec0899, "ALC898", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec0900, "ALC1150", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec0b00, "ALCS1200A", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec1168, "ALC1220", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec1220, "ALC1220", patch_alc882),

	{} /* terminator */

sound/soc/fsl/fsl_audmix.c

+8 −1
Original line number Diff line number Diff line
@@ -505,15 +505,20 @@ static int fsl_audmix_probe(struct platform_device *pdev) 
					      ARRAY_SIZE(fsl_audmix_dai));

	if (ret) {

		dev_err(dev, "failed to register ASoC DAI\n");

		return ret;

		goto err_disable_pm;

	}



	priv->pdev = platform_device_register_data(dev, mdrv, 0, NULL, 0);

	if (IS_ERR(priv->pdev)) {

		ret = PTR_ERR(priv->pdev);

		dev_err(dev, "failed to register platform %s: %d\n", mdrv, ret);

		goto err_disable_pm;

	}



	return 0;



err_disable_pm:

	pm_runtime_disable(dev);

	return ret;

}
@@ -521,6 +526,8 @@ static int fsl_audmix_remove(struct platform_device *pdev) 
{

	struct fsl_audmix *priv = dev_get_drvdata(&pdev->dev);



	pm_runtime_disable(&pdev->dev);



	if (priv->pdev)

		platform_device_unregister(priv->pdev);

sound/soc/intel/boards/cml_rt1011_rt5682.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/clk.h>

#include <linux/dmi.h>

#include <linux/slab.h>

#include <asm/cpu_device_id.h>

#include <linux/acpi.h>

#include <sound/core.h>

#include <sound/jack.h>

sound/soc/soc-core.c

+8 −6
Original line number Diff line number Diff line
@@ -479,6 +479,12 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( 
		goto free_rtd;



	rtd->dev = dev;

	INIT_LIST_HEAD(&rtd->list);

	INIT_LIST_HEAD(&rtd->component_list);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].fe_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].fe_clients);

	dev_set_drvdata(dev, rtd);

	INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work);
@@ -494,12 +500,6 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( 
	/*

	 * rtd remaining settings

	 */

	INIT_LIST_HEAD(&rtd->component_list);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].fe_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].fe_clients);



	rtd->card = card;

	rtd->dai_link = dai_link;

	if (!rtd->dai_link->ops)
@@ -1871,6 +1871,8 @@ match: 


			/* convert non BE into BE */

			dai_link->no_pcm = 1;

			dai_link->dpcm_playback = 1;

			dai_link->dpcm_capture = 1;



			/* override any BE fixups */

			dai_link->be_hw_params_fixup =

CRA Git | Maintained and supported by SUSTech CRA and CCSE