From f97da344ccc239b3098dc54bc6828be3ee24ee3c Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Wed, 30 Jan 2008 08:38:30 +0100 Subject: [PATCH] --- yaml --- r: 81735 b: refs/heads/master c: 2ea85986dd1fa96ccf0a2f37877d58a57ff6f583 h: refs/heads/master i: 81733: c7b6cc66843cbc915239c6f42beac4db98dd3345 81731: 9f5bf148ad44795d13d006e82667fb305aebb7f2 81727: 9ceac4d2de5c6207505e0cc8a49235ac33984812 v: v3 --- [refs] | 2 +- trunk/sound/pci/oxygen/hifier.c | 2 +- trunk/sound/pci/oxygen/oxygen.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c5a04d4682a5..0829930cafd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19e2e3c30485ba78a653dc521ed9e1f2b6a8bee1 +refs/heads/master: 2ea85986dd1fa96ccf0a2f37877d58a57ff6f583 diff --git a/trunk/sound/pci/oxygen/hifier.c b/trunk/sound/pci/oxygen/hifier.c index 51c4d1ae9d02..3ea1f05228a1 100644 --- a/trunk/sound/pci/oxygen/hifier.c +++ b/trunk/sound/pci/oxygen/hifier.c @@ -56,7 +56,7 @@ static void ak4396_write(struct oxygen *chip, u8 reg, u8 value) { oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER | OXYGEN_SPI_DATA_LENGTH_2 | - OXYGEN_SPI_CLOCK_320 | + OXYGEN_SPI_CLOCK_160 | (0 << OXYGEN_SPI_CODEC_SHIFT) | OXYGEN_SPI_CEN_LATCH_CLOCK_HI, AK4396_WRITE | (reg << 8) | value); diff --git a/trunk/sound/pci/oxygen/oxygen.c b/trunk/sound/pci/oxygen/oxygen.c index 840e4a66eacd..f31a0eb409b0 100644 --- a/trunk/sound/pci/oxygen/oxygen.c +++ b/trunk/sound/pci/oxygen/oxygen.c @@ -129,7 +129,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_320 | + OXYGEN_SPI_CLOCK_160 | (codec_spi_map[codec] << OXYGEN_SPI_CODEC_SHIFT) | OXYGEN_SPI_CEN_LATCH_CLOCK_HI, AK4396_WRITE | (reg << 8) | value); @@ -139,7 +139,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_320 | + OXYGEN_SPI_CLOCK_160 | (3 << OXYGEN_SPI_CODEC_SHIFT) | OXYGEN_SPI_CEN_LATCH_CLOCK_LO, (reg << 9) | value);