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

3 files changed, 7 insertions, 2 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index ef9f072b47fc..a73d6ca0a906 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -101,6 +101,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
                          "{Intel, ICH8},"
                          "{Intel, ICH9},"
                          "{Intel, ICH10},"
+                         "{Intel, PCH},"
                          "{Intel, SCH},"
                          "{ATI, SB450},"
                          "{ATI, SB600},"
@@ -2263,6 +2264,8 @@ static struct pci_device_id azx_ids[] = {
         { PCI_DEVICE(0x8086, 0x293f), .driver_data = AZX_DRIVER_ICH },
         { PCI_DEVICE(0x8086, 0x3a3e), .driver_data = AZX_DRIVER_ICH },
         { PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH },
+        /* PCH */
+        { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH },
         /* SCH */
         { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },
         /* ATI SB 450/600 */
@@ -2272,6 +2275,7 @@ static struct pci_device_id azx_ids[] = {
         { PCI_DEVICE(0x1002, 0x793b), .driver_data = AZX_DRIVER_ATIHDMI },
         { PCI_DEVICE(0x1002, 0x7919), .driver_data = AZX_DRIVER_ATIHDMI },
         { PCI_DEVICE(0x1002, 0x960f), .driver_data = AZX_DRIVER_ATIHDMI },
+        { PCI_DEVICE(0x1002, 0x970f), .driver_data = AZX_DRIVER_ATIHDMI },
         { PCI_DEVICE(0x1002, 0xaa00), .driver_data = AZX_DRIVER_ATIHDMI },
         { PCI_DEVICE(0x1002, 0xaa08), .driver_data = AZX_DRIVER_ATIHDMI },
         { PCI_DEVICE(0x1002, 0xaa10), .driver_data = AZX_DRIVER_ATIHDMI },
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index e23cb09f0d14..c6a8edf302ad 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -348,8 +348,9 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("ROUT1"),
         SND_SOC_DAPM_OUTPUT("LOUT2"),
         SND_SOC_DAPM_OUTPUT("ROUT2"),
-        SND_SOC_DAPM_OUTPUT("MONO"),
+        SND_SOC_DAPM_OUTPUT("MONO1"),
         SND_SOC_DAPM_OUTPUT("OUT3"),
+        SND_SOC_DAPM_OUTPUT("VREF"),
 
         SND_SOC_DAPM_INPUT("LINPUT1"),
         SND_SOC_DAPM_INPUT("LINPUT2"),
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index eefc25b83514..37cb768fc933 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -297,7 +297,7 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec)
         snd_soc_dapm_disable_pin(codec, "LINPUT3");
         snd_soc_dapm_disable_pin(codec, "RINPUT3");
         snd_soc_dapm_disable_pin(codec, "OUT3");
-        snd_soc_dapm_disable_pin(codec, "MONO");
+        snd_soc_dapm_disable_pin(codec, "MONO1");
 
         /* Add spitz specific controls */
         for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) {