Commit 8e37395c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Again it became bigger than wished, unfortunately, as this contains
  quite a few ASoC fixes that came up a bit late. It also includes yet
  more HD- and USB-audio quirks: I decided to merge them now, as those
  are for stable, and we'll need them sooner or later.

  Although the volumes are a bit high, all changes are device-specific
  (and reasonably small) fixes, so it should be safe for the late rc"

* tag 'sound-5.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Fix microphone sound on Jieli webcam.
  ALSA: hda/realtek: Fixes HP Spectre x360 15-eb1xxx speakers
  ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset
  ALSA: hda/realtek: Add quirk for Clevo PC50HS
  ALSA: usb-audio: add Schiit Hel device to quirk table
  ASoC: wm8960: Fix clock configuration on slave mode
  ASoC: cs42l42: Ensure 0dB full scale volume is used for headsets
  ASoC: soc-core: fix null-ptr-deref in snd_soc_del_component_unlocked()
  ASoC: codec: wcd938x: Add irq config support
  ASoC: DAPM: Fix missing kctl change notifications
  ASoC: Intel: bytcht_es8316: Utilize dev_err_probe() to avoid log saturation
  ASoC: Intel: bytcht_es8316: Switch to use gpiod_get_optional()
  ASoC: Intel: bytcht_es8316: Use temporary variable for struct device
  ASoC: Intel: bytcht_es8316: Get platform data via dev_get_platdata()
  ASoC: wcd938x: Fix jack detection issue
  ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
  ASoC: cs4341: Add SPI device ID table
  ASoC: pcm179x: Add missing entries SPI to device ID table
  ASoC: fsl_xcvr: Fix channel swap issue with ARC
  ASoC: pcm512x: Mend accesses to the I2S_1 and I2S_2 registers
parents 6da52dea 29664923

sound/pci/hda/patch_realtek.c

+47 −0
Original line number Diff line number Diff line
@@ -2535,6 +2535,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1558, 0x65d2, "Clevo PB51R[CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x65e1, "Clevo PB51[ED][DF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x65e5, "Clevo PC50D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x65f1, "Clevo PC50HS", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x67d1, "Clevo PB71[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x67e1, "Clevo PB71[DE][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
@@ -6405,6 +6406,44 @@ static void alc_fixup_no_int_mic(struct hda_codec *codec, 
	}

}



/* GPIO1 = amplifier on/off

 * GPIO3 = mic mute LED

 */

static void alc285_fixup_hp_spectre_x360_eb1(struct hda_codec *codec,

					  const struct hda_fixup *fix, int action)

{

	static const hda_nid_t conn[] = { 0x02 };



	struct alc_spec *spec = codec->spec;

	static const struct hda_pintbl pincfgs[] = {

		{ 0x14, 0x90170110 },  /* front/high speakers */

		{ 0x17, 0x90170130 },  /* back/bass speakers */

		{ }

	};



	//enable micmute led

	alc_fixup_hp_gpio_led(codec, action, 0x00, 0x04);



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->micmute_led_polarity = 1;

		/* needed for amp of back speakers */

		spec->gpio_mask |= 0x01;

		spec->gpio_dir |= 0x01;

		snd_hda_apply_pincfgs(codec, pincfgs);

		/* share DAC to have unified volume control */

		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn), conn);

		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);

		break;

	case HDA_FIXUP_ACT_INIT:

		/* need to toggle GPIO to enable the amp of back speakers */

		alc_update_gpio_data(codec, 0x01, true);

		msleep(100);

		alc_update_gpio_data(codec, 0x01, false);

		break;

	}

}



static void alc285_fixup_hp_spectre_x360(struct hda_codec *codec,

					  const struct hda_fixup *fix, int action)

{
@@ -6557,6 +6596,7 @@ enum { 
	ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED,

	ALC280_FIXUP_HP_9480M,

	ALC245_FIXUP_HP_X360_AMP,

	ALC285_FIXUP_HP_SPECTRE_X360_EB1,

	ALC288_FIXUP_DELL_HEADSET_MODE,

	ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,

	ALC288_FIXUP_DELL_XPS_13,
@@ -8250,6 +8290,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_hp_spectre_x360,

	},

	[ALC285_FIXUP_HP_SPECTRE_X360_EB1] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_hp_spectre_x360_eb1

	},

	[ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_ideapad_s740_coef,
@@ -8584,6 +8628,8 @@ 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, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),

	SND_PCI_QUIRK(0x103c, 0x8812, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),

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

	SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
@@ -9005,6 +9051,7 @@ 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 = ALC285_FIXUP_HP_SPECTRE_X360_EB1, .name = "alc285-hp-spectre-x360-eb1"},

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

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

	{.id = ALC255_FIXUP_ACER_HEADPHONE_AND_MIC, .name = "alc255-acer-headphone-and-mic"},

sound/soc/codecs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1583,6 +1583,7 @@ config SND_SOC_WCD938X_SDW 
	tristate "WCD9380/WCD9385 Codec - SDW"

	select SND_SOC_WCD938X

	select SND_SOC_WCD_MBHC

	select REGMAP_IRQ

	depends on SOUNDWIRE

	select REGMAP_SOUNDWIRE

	help

sound/soc/codecs/cs42l42.c

+3 −13
Original line number Diff line number Diff line
@@ -922,7 +922,6 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream) 
	struct snd_soc_component *component = dai->component;

	struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component);

	unsigned int regval;

	u8 fullScaleVol;

	int ret;



	if (mute) {
@@ -993,20 +992,11 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream) 
		cs42l42->stream_use |= 1 << stream;



		if (stream == SNDRV_PCM_STREAM_PLAYBACK) {

			/* Read the headphone load */

			regval = snd_soc_component_read(component, CS42L42_LOAD_DET_RCSTAT);

			if (((regval & CS42L42_RLA_STAT_MASK) >> CS42L42_RLA_STAT_SHIFT) ==

			    CS42L42_RLA_STAT_15_OHM) {

				fullScaleVol = CS42L42_HP_FULL_SCALE_VOL_MASK;

			} else {

				fullScaleVol = 0;

			}



			/* Un-mute the headphone, set the full scale volume flag */

			/* Un-mute the headphone */

			snd_soc_component_update_bits(component, CS42L42_HP_CTL,

						      CS42L42_HP_ANA_AMUTE_MASK |

						      CS42L42_HP_ANA_BMUTE_MASK |

						      CS42L42_HP_FULL_SCALE_VOL_MASK, fullScaleVol);

						      CS42L42_HP_ANA_BMUTE_MASK,

						      0);

		}

	}

sound/soc/codecs/cs4341.c

+7 −0
Original line number Diff line number Diff line
@@ -305,12 +305,19 @@ static int cs4341_spi_probe(struct spi_device *spi) 
	return cs4341_probe(&spi->dev);

}



static const struct spi_device_id cs4341_spi_ids[] = {

	{ "cs4341a" },

	{ }

};

MODULE_DEVICE_TABLE(spi, cs4341_spi_ids);



static struct spi_driver cs4341_spi_driver = {

	.driver = {

		.name = "cs4341-spi",

		.of_match_table = of_match_ptr(cs4341_dt_ids),

	},

	.probe = cs4341_spi_probe,

	.id_table = cs4341_spi_ids,

};

#endif

sound/soc/codecs/nau8824.c

+2 −2
Original line number Diff line number Diff line
@@ -867,8 +867,8 @@ static void nau8824_jdet_work(struct work_struct *work) 
	struct regmap *regmap = nau8824->regmap;

	int adc_value, event = 0, event_mask = 0;



	snd_soc_dapm_enable_pin(dapm, "MICBIAS");

	snd_soc_dapm_enable_pin(dapm, "SAR");

	snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");

	snd_soc_dapm_force_enable_pin(dapm, "SAR");

	snd_soc_dapm_sync(dapm);



	msleep(100);