diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-14 02:55:03 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:56 -0500 |
commit | 7113e95812f508bff10f95f2e52ce6ee8cda1875 (patch) | |
tree | 88ffdb570507c19a51ce5d48db474f1ec3788469 /sound/pci/oxygen/virtuoso.c | |
parent | bc9abce0de0b180817bc7e9f73145ef0b6a464ef (diff) |
[ALSA] oxygen: fix channel routing
Do not exchange the surround and back jacks except when in 7.1 mode
where the surround jack is not rear but side.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
-rw-r--r-- | sound/pci/oxygen/virtuoso.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 6603a685ccca..bfd1f3c3dfcd 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
@@ -19,9 +19,9 @@ | |||
19 | 19 | ||
20 | /* | 20 | /* |
21 | * SPI 0 -> 1st PCM1796 (front) | 21 | * SPI 0 -> 1st PCM1796 (front) |
22 | * SPI 1 -> 2nd PCM1796 (side) | 22 | * SPI 1 -> 2nd PCM1796 (surround) |
23 | * SPI 2 -> 3rd PCM1796 (center/LFE) | 23 | * SPI 2 -> 3rd PCM1796 (center/LFE) |
24 | * SPI 4 -> 4th PCM1796 (rear) | 24 | * SPI 4 -> 4th PCM1796 (back) |
25 | * | 25 | * |
26 | * GPIO 2 -> M0 of CS5381 | 26 | * GPIO 2 -> M0 of CS5381 |
27 | * GPIO 3 -> M1 of CS5381 | 27 | * GPIO 3 -> M1 of CS5381 |
@@ -76,7 +76,7 @@ static void pcm1796_write(struct oxygen *chip, unsigned int codec, | |||
76 | { | 76 | { |
77 | /* maps ALSA channel pair number to SPI output */ | 77 | /* maps ALSA channel pair number to SPI output */ |
78 | static const u8 codec_map[4] = { | 78 | static const u8 codec_map[4] = { |
79 | 0, 4, 2, 1 | 79 | 0, 1, 2, 4 |
80 | }; | 80 | }; |
81 | oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER_WRITE | | 81 | oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER_WRITE | |
82 | OXYGEN_SPI_DATA_LENGTH_2 | | 82 | OXYGEN_SPI_DATA_LENGTH_2 | |