hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: powermac - Correct volume controls for PowerBook G3 Lombard 

Correct volume controls for PowerBook G3 Lombard (Screamer).

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Risto Suominen 2009-01-20 22:01:14 +02:00 committed by Takashi Iwai
parent b0a8a8fd1b
commit 573934bc03
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/ppc/awacs.c
View File

@ -773,6 +773,7 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip)
#define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \ #define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \
|| machine_is_compatible("PowerMac4,1")) || machine_is_compatible("PowerMac4,1"))
#define IS_G4AGP (machine_is_compatible("PowerMac3,1")) #define IS_G4AGP (machine_is_compatible("PowerMac3,1"))
#define IS_LOMBARD (machine_is_compatible("PowerBook1,1"))
static int imac1, imac2; static int imac1, imac2;
@ -862,6 +863,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
int pm5500 = IS_PM5500; int pm5500 = IS_PM5500;
int beige = IS_BEIGE; int beige = IS_BEIGE;
int g4agp = IS_G4AGP; int g4agp = IS_G4AGP;
int lombard = IS_LOMBARD;
int imac; int imac;
int err, vol; int err, vol;
@ -972,7 +974,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
err = build_mixers(chip, err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_screamer_mixers_beige), ARRAY_SIZE(snd_pmac_screamer_mixers_beige),
snd_pmac_screamer_mixers_beige); snd_pmac_screamer_mixers_beige);
else if (imac) else if (imac || lombard)
err = build_mixers(chip, err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_screamer_mixers_imac), ARRAY_SIZE(snd_pmac_screamer_mixers_imac),
snd_pmac_screamer_mixers_imac); snd_pmac_screamer_mixers_imac);
@ -986,7 +988,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
snd_pmac_awacs_mixers_pmac); snd_pmac_awacs_mixers_pmac);
if (err < 0) if (err < 0)
return err; return err;
chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp) chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp || lombard)
? &snd_pmac_awacs_master_sw_imac ? &snd_pmac_awacs_master_sw_imac
: &snd_pmac_awacs_master_sw, chip); : &snd_pmac_awacs_master_sw, chip);
err = snd_ctl_add(chip->card, chip->master_sw_ctl); err = snd_ctl_add(chip->card, chip->master_sw_ctl);