Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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: hda - support new AMD HDMI Audio (1002:970f)
ALSA: hda_intel: ALSA HD Audio patch for Intel Ibex Peak DeviceIDs
ALSA: wm8750: add missing VREF output
ALSA: spitz: MONO -> MONO1
ALSA: wm8750: it's MONO1, not MONO
+4
sound/pci/hda/hda_intel.c
+4
sound/pci/hda/hda_intel.c
···
101
101
"{Intel, ICH8},"
102
102
"{Intel, ICH9},"
103
103
"{Intel, ICH10},"
104
+
"{Intel, PCH},"
104
105
"{Intel, SCH},"
105
106
"{ATI, SB450},"
106
107
"{ATI, SB600},"
···
2264
2263
{ PCI_DEVICE(0x8086, 0x293f), .driver_data = AZX_DRIVER_ICH },
2265
2264
{ PCI_DEVICE(0x8086, 0x3a3e), .driver_data = AZX_DRIVER_ICH },
2266
2265
{ PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH },
2266
+
/* PCH */
2267
+
{ PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH },
2267
2268
/* SCH */
2268
2269
{ PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },
2269
2270
/* ATI SB 450/600 */
···
2275
2272
{ PCI_DEVICE(0x1002, 0x793b), .driver_data = AZX_DRIVER_ATIHDMI },
2276
2273
{ PCI_DEVICE(0x1002, 0x7919), .driver_data = AZX_DRIVER_ATIHDMI },
2277
2274
{ PCI_DEVICE(0x1002, 0x960f), .driver_data = AZX_DRIVER_ATIHDMI },
2275
+
{ PCI_DEVICE(0x1002, 0x970f), .driver_data = AZX_DRIVER_ATIHDMI },
2278
2276
{ PCI_DEVICE(0x1002, 0xaa00), .driver_data = AZX_DRIVER_ATIHDMI },
2279
2277
{ PCI_DEVICE(0x1002, 0xaa08), .driver_data = AZX_DRIVER_ATIHDMI },
2280
2278
{ PCI_DEVICE(0x1002, 0xaa10), .driver_data = AZX_DRIVER_ATIHDMI },
+2
-1
sound/soc/codecs/wm8750.c
+2
-1
sound/soc/codecs/wm8750.c
···
348
348
SND_SOC_DAPM_OUTPUT("ROUT1"),
349
349
SND_SOC_DAPM_OUTPUT("LOUT2"),
350
350
SND_SOC_DAPM_OUTPUT("ROUT2"),
351
-
SND_SOC_DAPM_OUTPUT("MONO"),
351
+
SND_SOC_DAPM_OUTPUT("MONO1"),
352
352
SND_SOC_DAPM_OUTPUT("OUT3"),
353
+
SND_SOC_DAPM_OUTPUT("VREF"),
353
354
354
355
SND_SOC_DAPM_INPUT("LINPUT1"),
355
356
SND_SOC_DAPM_INPUT("LINPUT2"),
+1
-1
sound/soc/pxa/spitz.c
+1
-1
sound/soc/pxa/spitz.c
···
297
297
snd_soc_dapm_disable_pin(codec, "LINPUT3");
298
298
snd_soc_dapm_disable_pin(codec, "RINPUT3");
299
299
snd_soc_dapm_disable_pin(codec, "OUT3");
300
-
snd_soc_dapm_disable_pin(codec, "MONO");
300
+
snd_soc_dapm_disable_pin(codec, "MONO1");
301
301
302
302
/* Add spitz specific controls */
303
303
for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) {