Commit 77b0b254 authored by Ondrej Zary's avatar Ondrej Zary Committed by Takashi Iwai

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: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bfe51427
...@@ -630,7 +630,7 @@ config SND_ICE1724 ...@@ -630,7 +630,7 @@ config SND_ICE1724
AudioTrak Prodigy 192, 7.1 (HIFI/LT/XT), HD2; Hercules AudioTrak Prodigy 192, 7.1 (HIFI/LT/XT), HD2; Hercules
Fortissimo IV; ESI Juli@; Pontis MS300; EGO-SYS WaveTerminal Fortissimo IV; ESI Juli@; Pontis MS300; EGO-SYS WaveTerminal
192M; Albatron K8X800 Pro II; Chaintech ZNF3-150/250, 9CJS, 192M; Albatron K8X800 Pro II; Chaintech ZNF3-150/250, 9CJS,
AV-710; Shuttle SN25P. AV-710; Shuttle SN25P; Philips PSC724 Ultimate Edge.
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called snd-ice1724. will be called snd-ice1724.
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
snd-ice17xx-ak4xxx-objs := ak4xxx.o snd-ice17xx-ak4xxx-objs := ak4xxx.o
snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o
snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o psc724.o wm8766.o wm8776.o
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include "wtm.h" #include "wtm.h"
#include "se.h" #include "se.h"
#include "quartet.h" #include "quartet.h"
#include "psc724.h"
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)"); MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)");
...@@ -2257,6 +2258,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = { ...@@ -2257,6 +2258,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
snd_vt1724_se_cards, snd_vt1724_se_cards,
snd_vt1724_qtet_cards, snd_vt1724_qtet_cards,
snd_vt1724_ooaoo_cards, snd_vt1724_ooaoo_cards,
snd_vt1724_psc724_cards,
NULL, NULL,
}; };
...@@ -2372,7 +2374,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice, ...@@ -2372,7 +2374,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
return -EIO; return -EIO;
} }
ice->eeprom.version = snd_vt1724_read_i2c(ice, dev, 0x05); ice->eeprom.version = snd_vt1724_read_i2c(ice, dev, 0x05);
if (ice->eeprom.version != 2) if (ice->eeprom.version != 1 && ice->eeprom.version != 2)
printk(KERN_WARNING "ice1724: Invalid EEPROM version %i\n", printk(KERN_WARNING "ice1724: Invalid EEPROM version %i\n",
ice->eeprom.version); ice->eeprom.version);
size = ice->eeprom.size - 6; size = ice->eeprom.size - 6;
......
This diff is collapsed.
#ifndef __SOUND_PSC724_H
#define __SOUND_PSC724_H
/* ID */
#define PSC724_DEVICE_DESC \
"{Philips,PSC724 Ultimate Edge},"
#define VT1724_SUBDEVICE_PSC724 0xab170619
/* entry struct */
extern struct snd_ice1712_card_info snd_vt1724_psc724_cards[];
#endif /* __SOUND_PSC724_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment