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

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

Pull sound fixes from Takashi Iwai:
 "A slightly high volume at this time due to pending ASoC fixes.

  While there are a few generic simple-card fixes for regressions, most
  of the changes are device-specific fixes: ASoC Intel SOF, codec
  clocks, other codec / platform fixes as well as usual HD-audio and
  USB-audio"

* tag 'sound-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (37 commits)
  ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook Fury 17 G8
  ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook Fury 15 G8
  ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook G8
  ALSA: hda/realtek: fix mute/micmute LEDs for HP 855 G8
  ALSA: hda/realtek: Chain in pop reduction fixup for ThinkStation P340
  ALSA: usb-audio: scarlett2: snd_scarlett_gen2_controls_create() can be static
  ALSA: hda/realtek: the bass speaker can't output sound on Yoga 9i
  ALSA: hda/realtek: Headphone volume is controlled by Front mixer
  ALSA: usb-audio: scarlett2: Improve driver startup messages
  ALSA: usb-audio: scarlett2: Fix device hang with ehci-pci
  ALSA: usb-audio: fix control-request direction
  ASoC: qcom: lpass-cpu: Use optional clk APIs
  ASoC: cs35l33: fix an error code in probe()
  ASoC: SOF: Intel: hda: don't send DAI_CONFIG IPC for older firmware
  ASoC: fsl: fix SND_SOC_IMX_RPMSG dependency
  ASoC: cs42l52: Minor tidy up of error paths
  ASoC: cs35l32: Add missing regmap use_single config
  ASoC: cs35l34: Add missing regmap use_single config
  ASoC: cs42l73: Add missing regmap use_single config
  ASoC: cs53l30: Add missing regmap use_single config
  ...
parents 8508b97a 50dbfae9

include/sound/soc-dai.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct snd_compr_stream; 
#define SND_SOC_DAIFMT_CBP_CFP		(1 << 12) /* codec clk provider & frame provider */

#define SND_SOC_DAIFMT_CBC_CFP		(2 << 12) /* codec clk consumer & frame provider */

#define SND_SOC_DAIFMT_CBP_CFC		(3 << 12) /* codec clk provider & frame consumer */

#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame follower */

#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame consumer */



/* previous definitions kept for backwards-compatibility, do not use in new contributions */

#define SND_SOC_DAIFMT_CBM_CFM		SND_SOC_DAIFMT_CBP_CFP

sound/pci/hda/patch_realtek.c

+45 −1
Original line number Diff line number Diff line
@@ -2603,6 +2603,28 @@ static const struct hda_model_fixup alc882_fixup_models[] = { 
	{}

};



static const struct snd_hda_pin_quirk alc882_pin_fixup_tbl[] = {

	SND_HDA_PIN_QUIRK(0x10ec1220, 0x1043, "ASUS", ALC1220_FIXUP_CLEVO_P950,

		{0x14, 0x01014010},

		{0x15, 0x01011012},

		{0x16, 0x01016011},

		{0x18, 0x01a19040},

		{0x19, 0x02a19050},

		{0x1a, 0x0181304f},

		{0x1b, 0x0221401f},

		{0x1e, 0x01456130}),

	SND_HDA_PIN_QUIRK(0x10ec1220, 0x1462, "MS-7C35", ALC1220_FIXUP_CLEVO_P950,

		{0x14, 0x01015010},

		{0x15, 0x01011012},

		{0x16, 0x01011011},

		{0x18, 0x01a11040},

		{0x19, 0x02a19050},

		{0x1a, 0x0181104f},

		{0x1b, 0x0221401f},

		{0x1e, 0x01451130}),

	{}

};



/*

 * BIOS auto configuration

 */
@@ -2644,6 +2666,7 @@ static int patch_alc882(struct hda_codec *codec) 


	snd_hda_pick_fixup(codec, alc882_fixup_models, alc882_fixup_tbl,

		       alc882_fixups);

	snd_hda_pick_pin_fixup(codec, alc882_pin_fixup_tbl, alc882_fixups, true);

	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);



	alc_auto_parse_customize_define(codec);
@@ -6543,6 +6566,8 @@ enum { 
	ALC295_FIXUP_ASUS_DACS,

	ALC295_FIXUP_HP_OMEN,

	ALC285_FIXUP_HP_SPECTRE_X360,

	ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP,

	ALC623_FIXUP_LENOVO_THINKSTATION_P340,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -8109,6 +8134,18 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1,

	},

	[ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_ideapad_s740_coef,

		.chained = true,

		.chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,

	},

	[ALC623_FIXUP_LENOVO_THINKSTATION_P340] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_no_shutup,

		.chained = true,

		.chain_id = ALC283_FIXUP_HEADSET_MIC,

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8291,6 +8328,10 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),

	SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x886d, "HP ZBook Fury 17.3 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
@@ -8427,7 +8468,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1558, 0xc019, "Clevo NH77D[BE]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0xc022, "Clevo NH77[DC][QW]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),

	SND_PCI_QUIRK(0x17aa, 0x1048, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x1048, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
@@ -8477,6 +8518,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME),

	SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF),

	SND_PCI_QUIRK(0x17aa, 0x3843, "Yoga 9i", ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP),

	SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
@@ -8692,6 +8734,8 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC245_FIXUP_HP_X360_AMP, .name = "alc245-hp-x360-amp"},

	{.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"},

	{.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"},

	{.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"},

	{.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"},

	{}

};

#define ALC225_STANDARD_PINS \

sound/soc/amd/raven/acp3x-pcm-dma.c

+0 −10
Original line number Diff line number Diff line
@@ -235,10 +235,6 @@ static int acp3x_dma_open(struct snd_soc_component *component, 
		return ret;

	}



	if (!adata->play_stream && !adata->capture_stream &&

	    !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)

		rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);



	i2s_data->acp3x_base = adata->acp3x_base;

	runtime->private_data = i2s_data;

	return ret;
@@ -365,12 +361,6 @@ static int acp3x_dma_close(struct snd_soc_component *component, 
		}

	}



	/* Disable ACP irq, when the current stream is being closed and

	 * another stream is also not active.

	 */

	if (!adata->play_stream && !adata->capture_stream &&

		!adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)

		rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);

	return 0;

}

sound/soc/amd/raven/acp3x.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
#define ACP_POWER_OFF_IN_PROGRESS	0x03



#define ACP3x_ITER_IRER_SAMP_LEN_MASK	0x38

#define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF



struct acp3x_platform_info {

	u16 play_i2s_instance;

sound/soc/amd/raven/pci-acp3x.c

+15 −0
Original line number Diff line number Diff line
@@ -76,6 +76,19 @@ static int acp3x_reset(void __iomem *acp3x_base) 
	return -ETIMEDOUT;

}



static void acp3x_enable_interrupts(void __iomem *acp_base)

{

	rv_writel(0x01, acp_base + mmACP_EXTERNAL_INTR_ENB);

}



static void acp3x_disable_interrupts(void __iomem *acp_base)

{

	rv_writel(ACP_EXT_INTR_STAT_CLEAR_MASK, acp_base +

		  mmACP_EXTERNAL_INTR_STAT);

	rv_writel(0x00, acp_base + mmACP_EXTERNAL_INTR_CNTL);

	rv_writel(0x00, acp_base + mmACP_EXTERNAL_INTR_ENB);

}



static int acp3x_init(struct acp3x_dev_data *adata)

{

	void __iomem *acp3x_base = adata->acp3x_base;
@@ -93,6 +106,7 @@ static int acp3x_init(struct acp3x_dev_data *adata) 
		pr_err("ACP3x reset failed\n");

		return ret;

	}

	acp3x_enable_interrupts(acp3x_base);

	return 0;

}
@@ -100,6 +114,7 @@ static int acp3x_deinit(void __iomem *acp3x_base) 
{

	int ret;



	acp3x_disable_interrupts(acp3x_base);

	/* Reset */

	ret = acp3x_reset(acp3x_base);

	if (ret) {