diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-14 08:55:03 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:56 +0100 |
| commit | 7113e95812f508bff10f95f2e52ce6ee8cda1875 (patch) | |
| tree | 88ffdb570507c19a51ce5d48db474f1ec3788469 /sound/pci/oxygen/oxygen.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/oxygen.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index ba7a2a83f33..ecc0e6f9d27 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -19,10 +19,10 @@ /* * SPI 0 -> 1st AK4396 (front) - * SPI 1 -> 2nd AK4396 (side) + * SPI 1 -> 2nd AK4396 (surround) * SPI 2 -> 3rd AK4396 (center/LFE) * SPI 3 -> WM8785 - * SPI 4 -> 4th AK4396 (rear) + * SPI 4 -> 4th AK4396 (back) * * GPIO 0 -> DFS0 of AK5385 * GPIO 1 -> DFS1 of AK5385 @@ -99,7 +99,7 @@ static void ak4396_write(struct oxygen *chip, unsigned int codec, { /* maps ALSA channel pair number to SPI output */ static const u8 codec_spi_map[4] = { - 0, 4, 2, 1 + 0, 1, 2, 4 }; oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER_WRITE | OXYGEN_SPI_DATA_LENGTH_2 | |