Merge ../scsi-misc-2.6

[powerpc.git] / sound / pci / emu10k1 / io.c

diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index 5d116dd..029e785 100644 (file)
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -29,6 +29,7 @@
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/emu10k1.h>
+#include <linux/delay.h>
 
 unsigned int snd_emu10k1_ptr_read(struct snd_emu10k1 * emu, unsigned int reg, unsigned int chn)
 {
@@ -61,6 +62,8 @@ unsigned int snd_emu10k1_ptr_read(struct snd_emu10k1 * emu, unsigned int reg, un
        }
 }
 
+EXPORT_SYMBOL(snd_emu10k1_ptr_read);
+
 void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data)
 {
        unsigned int regptr;
@@ -91,6 +94,8 @@ void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned i
        }
 }
 
+EXPORT_SYMBOL(snd_emu10k1_ptr_write);
+
 unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, 
                                          unsigned int reg, 
                                          unsigned int chn)
@@ -123,6 +128,45 @@ void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu,
        spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
+int snd_emu10k1_spi_write(struct snd_emu10k1 * emu,
+                                  unsigned int data)
+{
+       unsigned int reset, set;
+       unsigned int reg, tmp;
+       int n, result;
+       if (emu->card_capabilities->ca0108_chip)
+               reg = 0x3c; /* PTR20, reg 0x3c */
+       else {
+               /* For other chip types the SPI register
+                * is currently unknown. */
+               return 1;
+       }
+       if (data > 0xffff) /* Only 16bit values allowed */
+               return 1;
+
+       tmp = snd_emu10k1_ptr20_read(emu, reg, 0);
+       reset = (tmp & ~0x3ffff) | 0x20000; /* Set xxx20000 */
+       set = reset | 0x10000; /* Set xxx1xxxx */
+       snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);
+       tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* write post */
+       snd_emu10k1_ptr20_write(emu, reg, 0, set | data);
+       result = 1;
+       /* Wait for status bit to return to 0 */
+       for (n = 0; n < 100; n++) {
+               udelay(10);
+               tmp = snd_emu10k1_ptr20_read(emu, reg, 0);
+               if (!(tmp & 0x10000)) {
+                       result = 0;
+                       break;
+               }
+       }
+       if (result) /* Timed out */
+               return 1;
+       snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);
+       tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* Write post */
+       return 0;
+}
+
 void snd_emu10k1_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb)
 {
        unsigned long flags;