aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-01-30 02:38:30 -0500
committerMercurial server <hg@alsa0.alsa-project.org>2008-01-31 11:30:23 -0500
commit2ea85986dd1fa96ccf0a2f37877d58a57ff6f583 (patch)
tree97d286e5144ee981405ba098f132699cf036a8b5 /sound/pci/oxygen
parent19e2e3c30485ba78a653dc521ed9e1f2b6a8bee1 (diff)
[ALSA] oxygen: revert SPI clock frequency change for AK4396/WM8785
While the AK4396 and WM8785 datasheets say that the SPI clock cycle length must be at least 200 ns, 320 ns seems not to work reliably with the controller, so we better use 160 ns. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen')
-rw-r--r--sound/pci/oxygen/hifier.c2
-rw-r--r--sound/pci/oxygen/oxygen.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c
index 51c4d1ae9d02..3ea1f05228a1 100644
--- a/sound/pci/oxygen/hifier.c
+++ b/sound/pci/oxygen/hifier.c
@@ -56,7 +56,7 @@ static void ak4396_write(struct oxygen *chip, u8 reg, u8 value)
56{ 56{
57 oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER | 57 oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
58 OXYGEN_SPI_DATA_LENGTH_2 | 58 OXYGEN_SPI_DATA_LENGTH_2 |
59 OXYGEN_SPI_CLOCK_320 | 59 OXYGEN_SPI_CLOCK_160 |
60 (0 << OXYGEN_SPI_CODEC_SHIFT) | 60 (0 << OXYGEN_SPI_CODEC_SHIFT) |
61 OXYGEN_SPI_CEN_LATCH_CLOCK_HI, 61 OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
62 AK4396_WRITE | (reg << 8) | value); 62 AK4396_WRITE | (reg << 8) | value);
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 840e4a66eacd..f31a0eb409b0 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -129,7 +129,7 @@ static void ak4396_write(struct oxygen *chip, unsigned int codec,
129 }; 129 };
130 oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER | 130 oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
131 OXYGEN_SPI_DATA_LENGTH_2 | 131 OXYGEN_SPI_DATA_LENGTH_2 |
132 OXYGEN_SPI_CLOCK_320 | 132 OXYGEN_SPI_CLOCK_160 |
133 (codec_spi_map[codec] << OXYGEN_SPI_CODEC_SHIFT) | 133 (codec_spi_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
134 OXYGEN_SPI_CEN_LATCH_CLOCK_HI, 134 OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
135 AK4396_WRITE | (reg << 8) | value); 135 AK4396_WRITE | (reg << 8) | value);
@@ -139,7 +139,7 @@ static void wm8785_write(struct oxygen *chip, u8 reg, unsigned int value)
139{ 139{
140 oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER | 140 oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
141 OXYGEN_SPI_DATA_LENGTH_2 | 141 OXYGEN_SPI_DATA_LENGTH_2 |
142 OXYGEN_SPI_CLOCK_320 | 142 OXYGEN_SPI_CLOCK_160 |
143 (3 << OXYGEN_SPI_CODEC_SHIFT) | 143 (3 << OXYGEN_SPI_CODEC_SHIFT) |
144 OXYGEN_SPI_CEN_LATCH_CLOCK_LO, 144 OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
145 (reg << 9) | value); 145 (reg << 9) | value);