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

Commit 5885b9b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: HDA: Use LPIB Position fix for Intel SCH Poulsbo
  ALSA: hda: fix mute led polarity for HP laptops with buggy BIOS
  ALSA: HDA: Set position fix to LPIB for an Atom/Poulsbo based device
  ASoC: Fix hx4700 error handling to free gpios if snd_soc_register_card fails
  ASoC: WM8958: correctly show firmware magic on mismatch
  ASoC: mxs: Add appropriate MODULE_ALIAS()
  ASoC: mxs: Add missing MODULE_LICENSE("GPL")
  ASoC: Fix WM8996 24.576MHz clock operation
  ASoC: Include linux/module.h for smdk2443_wm9710
  ASoC: Fix a typo in jive_wm8750
  ASoC: Fix build dependency for SND_SOC_JZ4740_CODEC
  ASoC: Include linux/io.h for jz4740 codec
parents 1c5ff0f5 844ec314

sound/pci/hda/hda_intel.c

+3 −1
Original line number Diff line number Diff line
@@ -2507,6 +2507,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS 1101HA", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
@@ -2970,7 +2971,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	/* SCH */

	{ PCI_DEVICE(0x8086, 0x811b),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE},

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_LPIB }, /* Poulsbo */

	/* ICH */

	{ PCI_DEVICE(0x8086, 0x2668),

	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |

	  AZX_DCAPS_BUFSIZE },  /* ICH6 */

sound/pci/hda/patch_sigmatel.c

+6 −0
Original line number Diff line number Diff line
@@ -4929,6 +4929,12 @@ static int find_mute_led_gpio(struct hda_codec *codec, int default_polarity) 
				set_hp_led_gpio(codec);

				return 1;

			}

			/* BIOS bug: unfilled OEM string */

			if (strstr(dev->name, "HP_Mute_LED_P_G")) {

				set_hp_led_gpio(codec);

				spec->gpio_led_polarity = 1;

				return 1;

			}

		}



		/*

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_CX20442

	select SND_SOC_DA7210 if I2C

	select SND_SOC_DFBMCS320

	select SND_SOC_JZ4740_CODEC if SOC_JZ4740

	select SND_SOC_JZ4740_CODEC

	select SND_SOC_LM4857 if I2C

	select SND_SOC_MAX98088 if I2C

	select SND_SOC_MAX98095 if I2C

sound/soc/codecs/jz4740.c

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

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/io.h>



#include <linux/delay.h>

sound/soc/codecs/wm8958-dsp2.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name, 
	}



	if (memcmp(fw->data, "WMFW", 4) != 0) {

		memcpy(&data32, fw->data, sizeof(data32));

		data32 = be32_to_cpu(data32);

		dev_err(codec->dev, "%s: firmware has bad file magic %08x\n",

			name, data32);

		goto err;