Skip to content

Commit

Permalink
ALSA: ice1712: Add Philips PSC724 Ultimate Edge
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ondrej Zary authored and Takashi Iwai committed Oct 17, 2012
1 parent bfe5142 commit 77b0b25
Show file tree
Hide file tree
Showing 5 changed files with 482 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sound/pci/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ config SND_ICE1724
AudioTrak Prodigy 192, 7.1 (HIFI/LT/XT), HD2; Hercules
Fortissimo IV; ESI Juli@; Pontis MS300; EGO-SYS WaveTerminal
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
will be called snd-ice1724.
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/ice1712/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

snd-ice17xx-ak4xxx-objs := ak4xxx.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
obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o
Expand Down
4 changes: 3 additions & 1 deletion sound/pci/ice1712/ice1724.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include "wtm.h"
#include "se.h"
#include "quartet.h"
#include "psc724.h"

MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)");
Expand Down Expand Up @@ -2257,6 +2258,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
snd_vt1724_se_cards,
snd_vt1724_qtet_cards,
snd_vt1724_ooaoo_cards,
snd_vt1724_psc724_cards,
NULL,
};

Expand Down Expand Up @@ -2372,7 +2374,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
return -EIO;
}
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",
ice->eeprom.version);
size = ice->eeprom.size - 6;
Expand Down
Loading

0 comments on commit 77b0b25

Please sign in to comment.