Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

1 files changed, 18 insertions, 1 deletions

diff --git a/sound/pci/ice1712/phase.h b/sound/pci/ice1712/phase.h
index 6230cf16989f..13e841b55488 100644
--- a/sound/pci/ice1712/phase.h
+++ b/sound/pci/ice1712/phase.h
@@ -24,11 +24,28 @@
  *
  */      
 
-#define PHASE_DEVICE_DESC "{Terratec,Phase 22},"
+#define PHASE_DEVICE_DESC "{Terratec,Phase 22},"\
+                          "{Terratec,Phase 28},"
 
 #define VT1724_SUBDEVICE_PHASE22        0x3b155011
+#define VT1724_SUBDEVICE_PHASE28        0x3b154911
 
 /* entry point */
 extern struct snd_ice1712_card_info snd_vt1724_phase_cards[];
 
+/* PHASE28 GPIO bits */
+#define PHASE28_SPI_MISO        (1 << 21)
+#define PHASE28_WM_RESET        (1 << 20)
+#define PHASE28_SPI_CLK         (1 << 19)
+#define PHASE28_SPI_MOSI        (1 << 18)
+#define PHASE28_WM_RW           (1 << 17)
+#define PHASE28_AC97_RESET      (1 << 16)
+#define PHASE28_DIGITAL_SEL1    (1 << 15)
+#define PHASE28_HP_SEL          (1 << 14)
+#define PHASE28_WM_CS           (1 << 12)
+#define PHASE28_AC97_COMMIT     (1 << 11)
+#define PHASE28_AC97_ADDR       (1 << 10)
+#define PHASE28_AC97_DATA_LOW   (1 << 9)
+#define PHASE28_AC97_DATA_HIGH  (1 << 8)
+#define PHASE28_AC97_DATA_MASK  0xFF
 #endif /* __SOUND_PHASE */