aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712/ice1724.c
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2012-10-14 15:09:22 -0400
committerTakashi Iwai <tiwai@suse.de>2012-10-17 03:01:32 -0400
commit77b0b254af72add59c8125cd8799f390bc508f2b (patch)
tree1689e1bf407ceef68eea238b3c1b4394dc81db8f /sound/pci/ice1712/ice1724.c
parentbfe514279cc011304de9093a4923db09ef4eb459 (diff)
ALSA: ice1712: Add Philips PSC724 Ultimate Edge
Add psc724 subdriver to snd-ice1712 that provides full support for Philips PSC724 Ultimate Edge sound cards. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/ice1724.c')
-rw-r--r--sound/pci/ice1712/ice1724.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 287df68a9df8..161c8f6924dc 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -54,6 +54,7 @@
54#include "wtm.h" 54#include "wtm.h"
55#include "se.h" 55#include "se.h"
56#include "quartet.h" 56#include "quartet.h"
57#include "psc724.h"
57 58
58MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); 59MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
59MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)"); 60MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)");
@@ -2257,6 +2258,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
2257 snd_vt1724_se_cards, 2258 snd_vt1724_se_cards,
2258 snd_vt1724_qtet_cards, 2259 snd_vt1724_qtet_cards,
2259 snd_vt1724_ooaoo_cards, 2260 snd_vt1724_ooaoo_cards,
2261 snd_vt1724_psc724_cards,
2260 NULL, 2262 NULL,
2261}; 2263};
2262 2264
@@ -2372,7 +2374,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
2372 return -EIO; 2374 return -EIO;
2373 } 2375 }
2374 ice->eeprom.version = snd_vt1724_read_i2c(ice, dev, 0x05); 2376 ice->eeprom.version = snd_vt1724_read_i2c(ice, dev, 0x05);
2375 if (ice->eeprom.version != 2) 2377 if (ice->eeprom.version != 1 && ice->eeprom.version != 2)
2376 printk(KERN_WARNING "ice1724: Invalid EEPROM version %i\n", 2378 printk(KERN_WARNING "ice1724: Invalid EEPROM version %i\n",
2377 ice->eeprom.version); 2379 ice->eeprom.version);
2378 size = ice->eeprom.size - 6; 2380 size = ice->eeprom.size - 6;