diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-26 16:12:42 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-26 16:12:42 +0300 |
| commit | e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4 (patch) | |
| tree | 0db15820fdd391a1570e1257167e8f02532c83f5 /sound/ppc | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
| parent | bc4a68fed4b4c01005ef3c71ede6a8cbe91b7dc9 (diff) | |
| download | linux-e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4.tar.xz | |
Merge branch 'topic/misc' into topic/pcsp-fix
Conflicts:
sound/drivers/pcsp/pcsp_lib.c
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/pmac.c | 2 | ||||
| -rw-r--r-- | sound/ppc/tumbler.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index a38c0c790d2b..af76ee862d27 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c @@ -1033,7 +1033,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) } if (of_device_is_compatible(sound, "tumbler")) { chip->model = PMAC_TUMBLER; - chip->can_capture = 0; /* no capture */ + chip->can_capture = machine_is_compatible("PowerMac4,2"); chip->can_duplex = 0; // chip->can_byte_swap = 0; /* FIXME: check this */ chip->num_freqs = ARRAY_SIZE(tumbler_freqs); diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index f746e15b8481..3eb223385416 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -875,7 +875,8 @@ static struct snd_kcontrol_new snapper_mixers[] __initdata = { .put = tumbler_put_master_switch }, DEFINE_SNAPPER_MIX("PCM Playback Volume", 0, VOL_IDX_PCM), - DEFINE_SNAPPER_MIX("PCM Playback Volume", 1, VOL_IDX_PCM2), + /* Alternative PCM is assigned to Mic analog loopback on iBook G4 */ + DEFINE_SNAPPER_MIX("Mic Playback Volume", 0, VOL_IDX_PCM2), DEFINE_SNAPPER_MIX("Monitor Mix Volume", 0, VOL_IDX_ADC), DEFINE_SNAPPER_MONO("Tone Control - Bass", bass), DEFINE_SNAPPER_MONO("Tone Control - Treble", treble), |