tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 5885b9b3 1c5ff0f5

+23 -6
+3 -1
sound/pci/hda/hda_intel.c
··· 2507 2507 SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB), 2508 2508 SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB), 2509 2509 SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB), 2510 + SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS 1101HA", POS_FIX_LPIB), 2510 2511 SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB), 2511 2512 SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB), 2512 2513 SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB), ··· 2971 2970 /* SCH */ 2972 2971 { PCI_DEVICE(0x8086, 0x811b), 2973 2972 .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP | 2974 - AZX_DCAPS_BUFSIZE}, 2973 + AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_LPIB }, /* Poulsbo */ 2974 + /* ICH */ 2975 2975 { PCI_DEVICE(0x8086, 0x2668), 2976 2976 .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC | 2977 2977 AZX_DCAPS_BUFSIZE }, /* ICH6 */
+6
sound/pci/hda/patch_sigmatel.c
··· 4929 4929 set_hp_led_gpio(codec); 4930 4930 return 1; 4931 4931 } 4932 + /* BIOS bug: unfilled OEM string */ 4933 + if (strstr(dev->name, "HP_Mute_LED_P_G")) { 4934 + set_hp_led_gpio(codec); 4935 + spec->gpio_led_polarity = 1; 4936 + return 1; 4937 + } 4932 4938 } 4933 4939 4934 4940 /*
+1 -1
sound/soc/codecs/Kconfig
··· 33 33 select SND_SOC_CX20442 34 34 select SND_SOC_DA7210 if I2C 35 35 select SND_SOC_DFBMCS320 36 - select SND_SOC_JZ4740_CODEC if SOC_JZ4740 36 + select SND_SOC_JZ4740_CODEC 37 37 select SND_SOC_LM4857 if I2C 38 38 select SND_SOC_MAX98088 if I2C 39 39 select SND_SOC_MAX98095 if I2C
+1
sound/soc/codecs/jz4740.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/slab.h> 18 + #include <linux/io.h> 18 19 19 20 #include <linux/delay.h> 20 21
+2
sound/soc/codecs/wm8958-dsp2.c
··· 60 60 } 61 61 62 62 if (memcmp(fw->data, "WMFW", 4) != 0) { 63 + memcpy(&data32, fw->data, sizeof(data32)); 64 + data32 = be32_to_cpu(data32); 63 65 dev_err(codec->dev, "%s: firmware has bad file magic %08x\n", 64 66 name, data32); 65 67 goto err;
+1
sound/soc/codecs/wm8996.c
··· 1968 1968 break; 1969 1969 case 24576000: 1970 1970 ratediv = WM8996_SYSCLK_DIV; 1971 + wm8996->sysclk /= 2; 1971 1972 case 12288000: 1972 1973 snd_soc_update_bits(codec, WM8996_AIF_RATE, 1973 1974 WM8996_SYSCLK_RATE, WM8996_SYSCLK_RATE);
+3
sound/soc/mxs/mxs-pcm.c
··· 357 357 platform_driver_unregister(&mxs_pcm_driver); 358 358 } 359 359 module_exit(snd_mxs_pcm_exit); 360 + 361 + MODULE_LICENSE("GPL"); 362 + MODULE_ALIAS("platform:mxs-pcm-audio");
+1
sound/soc/mxs/mxs-sgtl5000.c
··· 171 171 MODULE_AUTHOR("Freescale Semiconductor, Inc."); 172 172 MODULE_DESCRIPTION("MXS ALSA SoC Machine driver"); 173 173 MODULE_LICENSE("GPL"); 174 + MODULE_ALIAS("platform:mxs-sgtl5000");
+3 -2
sound/soc/pxa/hx4700.c
··· 209 209 snd_soc_card_hx4700.dev = &pdev->dev; 210 210 ret = snd_soc_register_card(&snd_soc_card_hx4700); 211 211 if (ret) 212 - return ret; 212 + gpio_free_array(hx4700_audio_gpios, 213 + ARRAY_SIZE(hx4700_audio_gpios)); 213 214 214 - return 0; 215 + return ret; 215 216 } 216 217 217 218 static int __devexit hx4700_audio_remove(struct platform_device *pdev)
+1 -2
sound/soc/samsung/jive_wm8750.c
··· 101 101 { 102 102 struct snd_soc_codec *codec = rtd->codec; 103 103 struct snd_soc_dapm_context *dapm = &codec->dapm; 104 - int err; 105 104 106 105 /* These endpoints are not being used. */ 107 106 snd_soc_dapm_nc_pin(dapm, "LINPUT2"); ··· 130 131 .dai_link = &jive_dai, 131 132 .num_links = 1, 132 133 133 - .dapm_widgtets = wm8750_dapm_widgets, 134 + .dapm_widgets = wm8750_dapm_widgets, 134 135 .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets), 135 136 .dapm_routes = audio_map, 136 137 .num_dapm_routes = ARRAY_SIZE(audio_map),
+1
sound/soc/samsung/smdk2443_wm9710.c
··· 12 12 * 13 13 */ 14 14 15 + #include <linux/module.h> 15 16 #include <sound/soc.h> 16 17 17 18 static struct snd_soc_card smdk2443;