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

Commit 7aa48355 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "It's a bad habit to get a higher volume of fixes often lately, but
  things happen again.

  All commits found here are real bug fixes, and are mostly trivial.
  Most of changes in ASoC are the fixes for enum items due to the wrong
  API usages, in addition to a few DAPM mutex deadlock and other fixes.
  In HD-audio, only fixups for HP laptops.  Although diffstat shows
  much, the changes are simple: there are just so many different device
  entries there"

* tag 'sound-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: sta32x: Fix wrong enum for limiter2 release rate
  ASoC: da732x: Mark DC offset control registers volatile
  ALSA: hda/realtek - Add more entry for enable HP mute led
  ALSA: hda - Add a fixup for HP Folio 13 mute LED
  ASoC: wm8958-dsp: Fix firmware block loading
  ASoC: sta32x: Fix cache sync
  ALSA: hda/realtek - Add more entry for enable HP mute led
  ASoC: dapm: Add locking to snd_soc_dapm_xxxx_pin functions
  Input - arizona-haptics: Fix double lock of dapm_mutex
  ASoC: wm8400: Fix the wrong number of enum items
  ASoC: isabelle: Fix the wrong number of items in enum ctls
  ASoC: ad1980: Fix wrong number of items for capture source
  ASoC: wm8994: Fix the wrong number of enum items
  ASoC: wm8900: Fix the wrong number of enum items
  ASoC: wm8770: Fix wrong number of enum items
  ASoC: sta32x: Fix array access overflow
  ASoC: dapm: Correct regulator bypass error messages
parents 04b52252 997e7547

drivers/extcon/extcon-arizona.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -222,27 +222,19 @@ static void arizona_extcon_pulse_micbias(struct arizona_extcon_info *info) 
	struct snd_soc_dapm_context *dapm = arizona->dapm;

	struct snd_soc_dapm_context *dapm = arizona->dapm;

	int ret;

	int ret;





	mutex_lock(&dapm->card->dapm_mutex);



	ret = snd_soc_dapm_force_enable_pin(dapm, widget);

	ret = snd_soc_dapm_force_enable_pin(dapm, widget);

	if (ret != 0)

	if (ret != 0)

		dev_warn(arizona->dev, "Failed to enable %s: %d\n",

		dev_warn(arizona->dev, "Failed to enable %s: %d\n",

			 widget, ret);

			 widget, ret);





	mutex_unlock(&dapm->card->dapm_mutex);



	snd_soc_dapm_sync(dapm);

	snd_soc_dapm_sync(dapm);





	if (!arizona->pdata.micd_force_micbias) {

	if (!arizona->pdata.micd_force_micbias) {

		mutex_lock(&dapm->card->dapm_mutex);



		ret = snd_soc_dapm_disable_pin(arizona->dapm, widget);

		ret = snd_soc_dapm_disable_pin(arizona->dapm, widget);

		if (ret != 0)

		if (ret != 0)

			dev_warn(arizona->dev, "Failed to disable %s: %d\n",

			dev_warn(arizona->dev, "Failed to disable %s: %d\n",

				 widget, ret);

				 widget, ret);





		mutex_unlock(&dapm->card->dapm_mutex);



		snd_soc_dapm_sync(dapm);

		snd_soc_dapm_sync(dapm);

	}

	}

}

}
@@ -304,16 +296,12 @@ static void arizona_stop_mic(struct arizona_extcon_info *info) 
				 ARIZONA_MICD_ENA, 0,

				 ARIZONA_MICD_ENA, 0,

				 &change);

				 &change);





	mutex_lock(&dapm->card->dapm_mutex);



	ret = snd_soc_dapm_disable_pin(dapm, widget);

	ret = snd_soc_dapm_disable_pin(dapm, widget);

	if (ret != 0)

	if (ret != 0)

		dev_warn(arizona->dev,

		dev_warn(arizona->dev,

			 "Failed to disable %s: %d\n",

			 "Failed to disable %s: %d\n",

			 widget, ret);

			 widget, ret);





	mutex_unlock(&dapm->card->dapm_mutex);



	snd_soc_dapm_sync(dapm);

	snd_soc_dapm_sync(dapm);





	if (info->micd_reva) {

	if (info->micd_reva) {

drivers/input/misc/arizona-haptics.c

+0 −19
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ static void arizona_haptics_work(struct work_struct *work) 
						       struct arizona_haptics,

						       struct arizona_haptics,

						       work);

						       work);

	struct arizona *arizona = haptics->arizona;

	struct arizona *arizona = haptics->arizona;

	struct mutex *dapm_mutex = &arizona->dapm->card->dapm_mutex;

	int ret;

	int ret;





	if (!haptics->arizona->dapm) {

	if (!haptics->arizona->dapm) {
@@ -67,13 +66,10 @@ static void arizona_haptics_work(struct work_struct *work) 
			return;

			return;

		}

		}





		mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



		ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");

		ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");

		if (ret != 0) {

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",

			dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",

				ret);

				ret);

			mutex_unlock(dapm_mutex);

			return;

			return;

		}

		}
@@ -81,21 +77,14 @@ static void arizona_haptics_work(struct work_struct *work) 
		if (ret != 0) {

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",

			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",

				ret);

				ret);

			mutex_unlock(dapm_mutex);

			return;

			return;

		}

		}



		mutex_unlock(dapm_mutex);



	} else {

	} else {

		/* This disable sequence will be a noop if already enabled */

		/* This disable sequence will be a noop if already enabled */

		mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



		ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");

		ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");

		if (ret != 0) {

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",

			dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",

				ret);

				ret);

			mutex_unlock(dapm_mutex);

			return;

			return;

		}

		}
@@ -103,12 +92,9 @@ static void arizona_haptics_work(struct work_struct *work) 
		if (ret != 0) {

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",

			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",

				ret);

				ret);

			mutex_unlock(dapm_mutex);

			return;

			return;

		}

		}





		mutex_unlock(dapm_mutex);



		ret = regmap_update_bits(arizona->regmap,

		ret = regmap_update_bits(arizona->regmap,

					 ARIZONA_HAPTICS_CONTROL_1,

					 ARIZONA_HAPTICS_CONTROL_1,

					 ARIZONA_HAP_CTRL_MASK,

					 ARIZONA_HAP_CTRL_MASK,
@@ -155,16 +141,11 @@ static int arizona_haptics_play(struct input_dev *input, void *data, 
static void arizona_haptics_close(struct input_dev *input)

static void arizona_haptics_close(struct input_dev *input)

{

{

	struct arizona_haptics *haptics = input_get_drvdata(input);

	struct arizona_haptics *haptics = input_get_drvdata(input);

	struct mutex *dapm_mutex = &haptics->arizona->dapm->card->dapm_mutex;





	cancel_work_sync(&haptics->work);

	cancel_work_sync(&haptics->work);





	mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



	if (haptics->arizona->dapm)

	if (haptics->arizona->dapm)

		snd_soc_dapm_disable_pin(haptics->arizona->dapm, "HAPTICS");

		snd_soc_dapm_disable_pin(haptics->arizona->dapm, "HAPTICS");



	mutex_unlock(dapm_mutex);

}

}





static int arizona_haptics_probe(struct platform_device *pdev)

static int arizona_haptics_probe(struct platform_device *pdev)

include/sound/soc-dapm.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -449,14 +449,22 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, 
/* dapm audio pin control and status */

/* dapm audio pin control and status */

int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm,

			    const char *pin);

			    const char *pin);

int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,

				     const char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm,

			     const char *pin);

			     const char *pin);

int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm,

				      const char *pin);

int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm,

				 const char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,

				const char *pin);

				const char *pin);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

				  const char *pin);

				  const char *pin);

int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,

					   const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

				const char *pin);

				const char *pin);

void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec);

void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec);

sound/pci/hda/patch_realtek.c

+48 −0
Original line number Original line Diff line number Diff line
@@ -4319,6 +4319,54 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x218b, "HP", ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x218b, "HP", ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED),

	/* ALC282 */

	SND_PCI_QUIRK(0x103c, 0x220f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2213, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2266, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2267, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2268, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2269, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x226a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x226b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x227a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x227b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x229e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22a0, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22b2, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22b7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22bf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c0, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c1, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c2, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22cd, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22ce, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22cf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22d0, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	/* ALC290 */

	SND_PCI_QUIRK(0x103c, 0x2260, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2261, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2262, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2263, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2264, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2265, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x227d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x227e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x227f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2280, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2281, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2282, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2289, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x228a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x228b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x228c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x228d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x228e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c5, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c6, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c8, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c3, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22c4, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),

	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),

	SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

sound/pci/hda/patch_sigmatel.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,7 @@ enum { 
	STAC_92HD83XXX_HP_LED,

	STAC_92HD83XXX_HP_LED,

	STAC_92HD83XXX_HP_INV_LED,

	STAC_92HD83XXX_HP_INV_LED,

	STAC_92HD83XXX_HP_MIC_LED,

	STAC_92HD83XXX_HP_MIC_LED,

	STAC_HP_LED_GPIO10,

	STAC_92HD83XXX_HEADSET_JACK,

	STAC_92HD83XXX_HEADSET_JACK,

	STAC_92HD83XXX_HP,

	STAC_92HD83XXX_HP,

	STAC_HP_ENVY_BASS,

	STAC_HP_ENVY_BASS,
@@ -2130,6 +2131,17 @@ static void stac92hd83xxx_fixup_hp_mic_led(struct hda_codec *codec, 
	}

	}

}

}





static void stac92hd83xxx_fixup_hp_led_gpio10(struct hda_codec *codec,

				   const struct hda_fixup *fix, int action)

{

	struct sigmatel_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->gpio_led = 0x10; /* GPIO4 */

		spec->default_polarity = 0;

	}

}



static void stac92hd83xxx_fixup_headset_jack(struct hda_codec *codec,

static void stac92hd83xxx_fixup_headset_jack(struct hda_codec *codec,

				   const struct hda_fixup *fix, int action)

				   const struct hda_fixup *fix, int action)

{

{
@@ -2624,6 +2636,12 @@ static const struct hda_fixup stac92hd83xxx_fixups[] = { 
		.chained = true,

		.chained = true,

		.chain_id = STAC_92HD83XXX_HP,

		.chain_id = STAC_92HD83XXX_HP,

	},

	},

	[STAC_HP_LED_GPIO10] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = stac92hd83xxx_fixup_hp_led_gpio10,

		.chained = true,

		.chain_id = STAC_92HD83XXX_HP,

	},

	[STAC_92HD83XXX_HEADSET_JACK] = {

	[STAC_92HD83XXX_HEADSET_JACK] = {

		.type = HDA_FIXUP_FUNC,

		.type = HDA_FIXUP_FUNC,

		.v.func = stac92hd83xxx_fixup_headset_jack,

		.v.func = stac92hd83xxx_fixup_headset_jack,
@@ -2702,6 +2720,8 @@ static const struct snd_pci_quirk stac92hd83xxx_fixup_tbl[] = { 
			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),

			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1888,

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1888,

			  "HP Envy Spectre", STAC_HP_ENVY_BASS),

			  "HP Envy Spectre", STAC_HP_ENVY_BASS),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1899,

			  "HP Folio 13", STAC_HP_LED_GPIO10),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x18df,

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x18df,

			  "HP Folio", STAC_HP_BNB13_EQ),

			  "HP Folio", STAC_HP_BNB13_EQ),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x18F8,

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x18F8,