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-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ice1724 - Fix ESI Maya44 capture source control
ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs
ALSA: virtuoso: fix Xonar D1/DX front panel microphone
ALSA: hda - Add hp-dv4 model for IDT 92HD71bx
ALSA: hda - Fix mute-LED GPIO pin for HP dv series
ALSA: hda: Fix 0 dB for Lenovo models using Conexant CX20549 (Venice)

Linus Torvalds fc8e38f1 aa86f26b

+30 -8
+7
sound/core/pcm_native.c
··· 36 36 #include <sound/timer.h> 37 37 #include <sound/minors.h> 38 38 #include <asm/io.h> 39 + #if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT) 40 + #include <dma-coherence.h> 41 + #endif 39 42 40 43 /* 41 44 * Compatibility ··· 3187 3184 substream->runtime->dma_area, 3188 3185 substream->runtime->dma_addr, 3189 3186 area->vm_end - area->vm_start); 3187 + #elif defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT) 3188 + if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV && 3189 + !plat_device_is_coherent(substream->dma_buffer.dev.dev)) 3190 + area->vm_page_prot = pgprot_noncached(area->vm_page_prot); 3190 3191 #endif /* ARCH_HAS_DMA_MMAP_COHERENT */ 3191 3192 /* mmap with fault handler */ 3192 3193 area->vm_ops = &snd_pcm_vm_ops_data_fault;
+4 -3
sound/pci/hda/patch_conexant.c
··· 1197 1197 case 0x103c: 1198 1198 case 0x1631: 1199 1199 case 0x1734: 1200 - /* HP, Packard Bell, & Fujitsu-Siemens laptops have really bad 1201 - * sound over 0dB on NID 0x17. Fix max PCM level to 0 dB 1202 - * (originally it has 0x2b steps with 0dB offset 0x14) 1200 + case 0x17aa: 1201 + /* HP, Packard Bell, Fujitsu-Siemens & Lenovo laptops have 1202 + * really bad sound over 0dB on NID 0x17. Fix max PCM level to 1203 + * 0 dB (originally it has 0x2b steps with 0dB offset 0x14) 1203 1204 */ 1204 1205 snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT, 1205 1206 (0x14 << AC_AMPCAP_OFFSET_SHIFT) |
+13 -2
sound/pci/hda/patch_sigmatel.c
··· 104 104 STAC_DELL_M4_2, 105 105 STAC_DELL_M4_3, 106 106 STAC_HP_M4, 107 + STAC_HP_DV4, 107 108 STAC_HP_DV5, 108 109 STAC_HP_HDX, 109 110 STAC_HP_DV4_1222NR, ··· 1692 1691 [STAC_DELL_M4_2] = dell_m4_2_pin_configs, 1693 1692 [STAC_DELL_M4_3] = dell_m4_3_pin_configs, 1694 1693 [STAC_HP_M4] = NULL, 1694 + [STAC_HP_DV4] = NULL, 1695 1695 [STAC_HP_DV5] = NULL, 1696 1696 [STAC_HP_HDX] = NULL, 1697 1697 [STAC_HP_DV4_1222NR] = NULL, ··· 1705 1703 [STAC_DELL_M4_2] = "dell-m4-2", 1706 1704 [STAC_DELL_M4_3] = "dell-m4-3", 1707 1705 [STAC_HP_M4] = "hp-m4", 1706 + [STAC_HP_DV4] = "hp-dv4", 1708 1707 [STAC_HP_DV5] = "hp-dv5", 1709 1708 [STAC_HP_HDX] = "hp-hdx", 1710 1709 [STAC_HP_DV4_1222NR] = "hp-dv4-1222nr", ··· 1724 1721 SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080, 1725 1722 "HP", STAC_HP_DV5), 1726 1723 SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0, 1727 - "HP dv4-7", STAC_HP_DV5), 1724 + "HP dv4-7", STAC_HP_DV4), 1728 1725 SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600, 1729 1726 "HP dv4-7", STAC_HP_DV5), 1730 1727 SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3610, ··· 4769 4766 struct sigmatel_spec *spec = codec->spec; 4770 4767 unsigned int gpio; 4771 4768 4769 + if (spec->gpio_led) 4770 + return; 4771 + 4772 4772 gpio = snd_hda_param_read(codec, codec->afg, AC_PAR_GPIO_CAP); 4773 4773 gpio &= AC_GPIO_IO_COUNT; 4774 4774 if (gpio > 3) ··· 5681 5675 spec->num_smuxes = 1; 5682 5676 spec->num_dmuxes = 1; 5683 5677 /* fallthrough */ 5678 + case STAC_HP_DV4: 5679 + spec->gpio_led = 0x01; 5680 + /* fallthrough */ 5684 5681 case STAC_HP_DV5: 5685 5682 snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010); 5686 5683 stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN); ··· 5697 5688 spec->num_dmics = 1; 5698 5689 spec->num_dmuxes = 1; 5699 5690 spec->num_smuxes = 1; 5691 + spec->gpio_led = 0x08; 5700 5692 break; 5701 5693 } 5702 5694 ··· 5754 5744 } 5755 5745 5756 5746 /* enable bass on HP dv7 */ 5757 - if (spec->board_config == STAC_HP_DV5) { 5747 + if (spec->board_config == STAC_HP_DV4 || 5748 + spec->board_config == STAC_HP_DV5) { 5758 5749 unsigned int cap; 5759 5750 cap = snd_hda_param_read(codec, 0x1, AC_PAR_GPIO_CAP); 5760 5751 cap &= AC_GPIO_IO_COUNT;
+3 -3
sound/pci/ice1712/maya44.c
··· 347 347 348 348 /* known working input slots (0-4) */ 349 349 #define MAYA_LINE_IN 1 /* in-2 */ 350 - #define MAYA_MIC_IN 4 /* in-5 */ 350 + #define MAYA_MIC_IN 3 /* in-4 */ 351 351 352 352 static void wm8776_select_input(struct snd_maya44 *chip, int idx, int line) 353 353 { ··· 393 393 int changed; 394 394 395 395 mutex_lock(&chip->mutex); 396 - changed = maya_set_gpio_bits(chip->ice, GPIO_MIC_RELAY, 397 - sel ? GPIO_MIC_RELAY : 0); 396 + changed = maya_set_gpio_bits(chip->ice, 1 << GPIO_MIC_RELAY, 397 + sel ? (1 << GPIO_MIC_RELAY) : 0); 398 398 wm8776_select_input(chip, 0, sel ? MAYA_MIC_IN : MAYA_LINE_IN); 399 399 mutex_unlock(&chip->mutex); 400 400 return changed;
+3
sound/pci/oxygen/xonar_cs43xx.c
··· 56 56 #include <sound/pcm_params.h> 57 57 #include <sound/tlv.h> 58 58 #include "xonar.h" 59 + #include "cm9780.h" 59 60 #include "cs4398.h" 60 61 #include "cs4362a.h" 61 62 ··· 172 171 GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE); 173 172 oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, 174 173 GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE); 174 + 175 + oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC); 175 176 176 177 xonar_init_cs53x1(chip); 177 178 xonar_enable_output(chip);