Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / sound / pci / oxygen / oxygen_io.c

diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c
index d0cdce041dd800b589eb1e9a649191c1793a0044..5569606ee87ff22bfb0ac9b9a15e9635e7bd4ed4 100644 (file)
--- a/sound/pci/oxygen/oxygen_io.c
+++ b/sound/pci/oxygen/oxygen_io.c
@@ -85,14 +85,22 @@ EXPORT_SYMBOL(oxygen_write32_masked);
 
 static int oxygen_ac97_wait(struct oxygen *chip, unsigned int mask)
 {
-       unsigned long timeout = jiffies + msecs_to_jiffies(1);
-       do {
-               udelay(5);
-               cond_resched();
-               if (oxygen_read8(chip, OXYGEN_AC97_INTERRUPT_STATUS) & mask)
-                       return 0;
-       } while (time_after_eq(timeout, jiffies));
-       return -EIO;
+       u8 status = 0;
+
+       /*
+        * Reading the status register also clears the bits, so we have to save
+        * the read bits in status.
+        */
+       wait_event_timeout(chip->ac97_waitqueue,
+                          ({ status |= oxygen_read8(chip, OXYGEN_AC97_INTERRUPT_STATUS);
+                             status & mask; }),
+                          msecs_to_jiffies(1) + 1);
+       /*
+        * Check even after a timeout because this function should not require
+        * the AC'97 interrupt to be enabled.
+        */
+       status |= oxygen_read8(chip, OXYGEN_AC97_INTERRUPT_STATUS);
+       return status & mask ? 0 : -EIO;
 }
 
 /*
@@ -182,12 +190,31 @@ void oxygen_write_spi(struct oxygen *chip, u8 control, unsigned int data)
                --count;
        }
 
-       spin_lock_irq(&chip->reg_lock);
        oxygen_write8(chip, OXYGEN_SPI_DATA1, data);
        oxygen_write8(chip, OXYGEN_SPI_DATA2, data >> 8);
        if (control & OXYGEN_SPI_DATA_LENGTH_3)
                oxygen_write8(chip, OXYGEN_SPI_DATA3, data >> 16);
        oxygen_write8(chip, OXYGEN_SPI_CONTROL, control);
-       spin_unlock_irq(&chip->reg_lock);
 }
 EXPORT_SYMBOL(oxygen_write_spi);
+
+void oxygen_write_i2c(struct oxygen *chip, u8 device, u8 map, u8 data)
+{
+       unsigned long timeout;
+
+       /* should not need more than about 300 us */
+       timeout = jiffies + msecs_to_jiffies(1);
+       do {
+               if (!(oxygen_read16(chip, OXYGEN_2WIRE_BUS_STATUS)
+                     & OXYGEN_2WIRE_BUSY))
+                       break;
+               udelay(1);
+               cond_resched();
+       } while (time_after_eq(timeout, jiffies));
+
+       oxygen_write8(chip, OXYGEN_2WIRE_MAP, map);
+       oxygen_write8(chip, OXYGEN_2WIRE_DATA, data);
+       oxygen_write8(chip, OXYGEN_2WIRE_CONTROL,
+                     device | OXYGEN_2WIRE_DIR_WRITE);
+}
+EXPORT_SYMBOL(oxygen_write_i2c);