evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: snd-powermac: mixers for PowerMac G4 AGP

Browse source 
Add mixer controls for PowerMac G4 AGP (Screamer).

This patch fixes the regression in the recent snd-powermac which
doesn't support some G3/G4 PowerMacs:
    http://lkml.org/lkml/2008/10/1/220

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Tested-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: stable@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Risto Suominen 2008-08-25 08:02:12 +02:00 • committed by Takashi Iwai
parent 24918b61b5
commit 4dbf95ba6c
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sound/ppc/awacs.c
View file

@ -621,6 +621,13 @@ static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __initdata = {
AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),
}; };
static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] __initdata = {
AWACS_VOLUME("Line out Playback Volume", 2, 6, 1),
AWACS_VOLUME("Master Playback Volume", 5, 6, 1),
AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),
AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),
};
static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __initdata = { static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __initdata = {
AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), AWACS_VOLUME("Line out Playback Volume", 2, 6, 1),
AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),
@ -768,6 +775,7 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip)
#define IS_IMAC (machine_is_compatible("PowerMac2,1") \ #define IS_IMAC (machine_is_compatible("PowerMac2,1") \
|| machine_is_compatible("PowerMac2,2") \ || machine_is_compatible("PowerMac2,2") \
|| machine_is_compatible("PowerMac4,1")) || machine_is_compatible("PowerMac4,1"))
#define IS_G4AGP (machine_is_compatible("PowerMac3,1"))
static int imac; static int imac;
@ -850,6 +858,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
{ {
int pm7500 = IS_PM7500; int pm7500 = IS_PM7500;
int beige = IS_BEIGE; int beige = IS_BEIGE;
int g4agp = IS_G4AGP;
int err, vol; int err, vol;
imac = IS_IMAC; imac = IS_IMAC;
@ -939,7 +948,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
snd_pmac_awacs_mixers); snd_pmac_awacs_mixers);
if (err < 0) if (err < 0)
return err; return err;
if (beige) if (beige || g4agp)
; ;
else if (chip->model == PMAC_SCREAMER) else if (chip->model == PMAC_SCREAMER)
err = build_mixers(chip, ARRAY_SIZE(snd_pmac_screamer_mixers2), err = build_mixers(chip, ARRAY_SIZE(snd_pmac_screamer_mixers2),
@ -961,13 +970,17 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
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);
else if (g4agp)
err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_screamer_mixers_g4agp),
snd_pmac_screamer_mixers_g4agp);
else else
err = build_mixers(chip, err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_awacs_mixers_pmac), ARRAY_SIZE(snd_pmac_awacs_mixers_pmac),
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) chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp)
? &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);
@ -1012,7 +1025,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
return err; return err;
} }
if (beige) if (beige || g4agp)
err = build_mixers(chip, err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_screamer_mic_boost_beige), ARRAY_SIZE(snd_pmac_screamer_mic_boost_beige),
snd_pmac_screamer_mic_boost_beige); snd_pmac_screamer_mic_boost_beige);