Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e0059549345903195d6eb796c22048204c40a785
Commit:     e0059549345903195d6eb796c22048204c40a785
Parent:     c2353a0826d2b8fe9f5c6a6aca99149e4ee7b196
Author:     Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Fri Jan 18 09:18:32 2008 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:30:04 2008 +0100

    [ALSA] oxygen: fix playback routing
    
    The default playback routing must be 0xe4, not 0xe1; the front and
    surround DACs were exchanged.
    
    Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/oxygen/oxygen_lib.c   |    2 +-
 sound/pci/oxygen/oxygen_mixer.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 79e7c16..3e61f94 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -214,7 +214,7 @@ static void __devinit oxygen_init(struct oxygen *chip)
        oxygen_write16(chip, OXYGEN_I2S_C_FORMAT, 0x010a);
        oxygen_set_bits32(chip, OXYGEN_SPDIF_CONTROL, OXYGEN_SPDIF_RATE_MASK);
        oxygen_write32(chip, OXYGEN_SPDIF_OUTPUT_BITS, chip->spdif_bits);
-       oxygen_write16(chip, OXYGEN_PLAY_ROUTING, 0xe100);
+       oxygen_write16(chip, OXYGEN_PLAY_ROUTING, 0xe400);
        oxygen_write8(chip, OXYGEN_REC_ROUTING, 0x10);
        oxygen_write8(chip, OXYGEN_ADC_MONITOR, 0x00);
        oxygen_write8(chip, OXYGEN_A_MONITOR_ROUTING, 0xe4);
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index fae7c0f..6fd2a59 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -121,7 +121,7 @@ static int upmix_get(struct snd_kcontrol *ctl, struct 
snd_ctl_elem_value *value)
 void oxygen_update_dac_routing(struct oxygen *chip)
 {
        static const unsigned int reg_values[3] = {
-               0xe100, /* front <- 0, surround <- 1, center <- 2, back <- 3 */
+               0xe400, /* front <- 0, surround <- 1, center <- 2, back <- 3 */
                0xe000, /* front <- 0, surround <- 0, center <- 2, back <- 3 */
                0x2000  /* front <- 0, surround <- 0, center <- 2, back <- 0 */
        };
@@ -135,7 +135,7 @@ void oxygen_update_dac_routing(struct oxygen *chip)
        else if (channels == OXYGEN_PLAY_CHANNELS_8)
                reg_value = 0x6c00; /* surround <- 3, back <- 1 */
        else
-               reg_value = 0xe100;
+               reg_value = 0xe400;
        oxygen_write16_masked(chip, OXYGEN_PLAY_ROUTING, reg_value, 0xff00);
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to