summaryrefslogtreecommitdiff
path: root/sound/pci/oxygen/virtuoso.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-01-14 08:55:03 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:29:56 +0100
commit7113e95812f508bff10f95f2e52ce6ee8cda1875 (patch)
tree88ffdb570507c19a51ce5d48db474f1ec3788469 /sound/pci/oxygen/virtuoso.c
parentbc9abce0de0b180817bc7e9f73145ef0b6a464ef (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.c6
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 @@
/*
* SPI 0 -> 1st PCM1796 (front)
- * SPI 1 -> 2nd PCM1796 (side)
+ * SPI 1 -> 2nd PCM1796 (surround)
* SPI 2 -> 3rd PCM1796 (center/LFE)
- * SPI 4 -> 4th PCM1796 (rear)
+ * SPI 4 -> 4th PCM1796 (back)
*
* GPIO 2 -> M0 of CS5381
* GPIO 3 -> M1 of CS5381
@@ -76,7 +76,7 @@ static void pcm1796_write(struct oxygen *chip, unsigned int codec,
{
/* maps ALSA channel pair number to SPI output */
static const u8 codec_map[4] = {
- 0, 4, 2, 1
+ 0, 1, 2, 4
};
oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER_WRITE |
OXYGEN_SPI_DATA_LENGTH_2 |