From: Clemens Ladisch Date: Mon, 21 Jan 2008 07:51:19 +0000 (+0100) Subject: [ALSA] oxygen: reduce SPI clock frequency for AK4396/WM8785 X-Git-Tag: v2.6.25-rc1~1127^2~69 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3b94253bc9c950d2038a2db4f9c804b50f82001a;p=linux-2.6-omap-h63xx.git [ALSA] oxygen: reduce SPI clock frequency for AK4396/WM8785 According to the datasheets, the SPI clock cycle must be at least 200 ns for the AK4396 and the WM8785, so we cannot use the default 160 ns. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela --- diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 0a7c6135c07..35b26014925 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -166,7 +166,7 @@ static void ak4396_write(struct oxygen *chip, unsigned int codec, }; oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER | OXYGEN_SPI_DATA_LENGTH_2 | - OXYGEN_SPI_CLOCK_160 | + OXYGEN_SPI_CLOCK_320 | (codec_spi_map[codec] << OXYGEN_SPI_CODEC_SHIFT) | OXYGEN_SPI_CEN_LATCH_CLOCK_HI, AK4396_WRITE | (reg << 8) | value); @@ -176,7 +176,7 @@ static void wm8785_write(struct oxygen *chip, u8 reg, unsigned int value) { oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER | OXYGEN_SPI_DATA_LENGTH_2 | - OXYGEN_SPI_CLOCK_160 | + OXYGEN_SPI_CLOCK_320 | (3 << OXYGEN_SPI_CODEC_SHIFT) | OXYGEN_SPI_CEN_LATCH_CLOCK_LO, (reg << 9) | value); diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c index ebafc65dc34..d0cdce041dd 100644 --- a/sound/pci/oxygen/oxygen_io.c +++ b/sound/pci/oxygen/oxygen_io.c @@ -174,7 +174,7 @@ void oxygen_write_spi(struct oxygen *chip, u8 control, unsigned int data) { unsigned int count; - /* should not need more than 3.84 us (24 * 160 ns) */ + /* should not need more than 7.68 us (24 * 320 ns) */ count = 10; while ((oxygen_read8(chip, OXYGEN_SPI_CONTROL) & OXYGEN_SPI_BUSY) && count > 0) {