1 files changed, 66 insertions, 4 deletions

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index a56e68ea87bc..58d9026c8ca6 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.22
+ *  Version: 0.0.23
  *
  *  FEATURES currently supported:
  *    Front, Rear and Center/LFE.
@@ -77,6 +77,8 @@
  *    Add SPDIF capture using optional digital I/O module for SB Live 24bit. (Analog capture does not yet work.)
  *  0.0.22
  *    Add support for MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97. From kiksen, bug #901
+ *  0.0.23
+ *    Implement support for Line-in capture on SB Live 24bit.
  *
  *  BUGS:
  *    Some stability problems when unloading the snd-ca0106 kernel module.
@@ -173,15 +175,18 @@ static ca0106_details_t ca0106_chip_details[] = {
          /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
          { .serial = 0x10061102,
            .name   = "Live! 7.1 24bit [SB0410]",
-           .gpio_type = 1 } ,
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
          /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97.  */
          { .serial = 0x10071102,
            .name   = "Live! 7.1 24bit [SB0413]",
-           .gpio_type = 1 } ,
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
          /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
          { .serial = 0x10091462,
            .name   = "MSI K8N Diamond MB [SB0438]",
-           .gpio_type = 1 } ,
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
          { .serial = 0,
            .name   = "AudigyLS [Unknown]" }
 };
@@ -257,6 +262,59 @@ void snd_ca0106_ptr_write(ca0106_t *emu,
         spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
+int snd_ca0106_i2c_write(ca0106_t *emu,
+                                u32 reg,
+                                u32 value)
+{
+        u32 tmp;
+        int timeout=0;
+        int status;
+        int retry;
+        if ((reg > 0x7f) || (value > 0x1ff))
+        {
+                snd_printk("i2c_write: invalid values.\n");
+                return -EINVAL;
+        }
+
+        tmp = reg << 25 | value << 16;
+        snd_ca0106_ptr_write(emu, I2C_D0, 0, tmp);
+        snd_ca0106_ptr_write(emu, I2C_D1, 0, tmp);
+
+        for(retry=0;retry<10;retry++)
+        {
+                /* Send the data to i2c */
+                tmp = snd_ca0106_ptr_read(emu, I2C_A, 0);
+                tmp = tmp & ~(I2C_A_ADC_READ|I2C_A_ADC_LAST|I2C_A_ADC_START|I2C_A_ADC_ADD_MASK);
+                tmp = tmp | (I2C_A_ADC_LAST|I2C_A_ADC_START|I2C_A_ADC_ADD);
+                snd_ca0106_ptr_write(emu, I2C_A, 0, tmp);
+
+                /* Wait till the transaction ends */
+                while(1)
+                {
+                        status = snd_ca0106_ptr_read(emu, I2C_A, 0);
+                        //snd_printk("I2C:status=0x%x\n", status);
+                        timeout++;
+                        if((status & I2C_A_ADC_START)==0)
+                                break;
+
+                        if(timeout>1000)
+                                break;
+                }
+                //Read back and see if the transaction is successful
+                if((status & I2C_A_ADC_ABORT)==0)
+                        break;
+        }
+
+        if(retry==10)
+        {
+                snd_printk("Writing to ADC failed!\n");
+                return -EINVAL;
+        }
+    
+        return 0;
+}
+
+
 static void snd_ca0106_intr_enable(ca0106_t *emu, unsigned int intrenb)
 {
         unsigned long flags;
@@ -1177,6 +1235,10 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
         //outl(0x00000009, chip->port+HCFG);
         outl(HCFG_AC97 | HCFG_AUDIOENABLE, chip->port+HCFG); /* AC97 2.0, Enable outputs. */
 
+        if (chip->details->i2c_adc == 1) { /* The SB0410 and SB0413 use I2C to control ADC. */
+                snd_ca0106_i2c_write(chip, ADC_MUX, ADC_MUX_LINEIN); /* Enable Line-in capture. MIC in currently untested. */
+        }
+
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
                                   chip, &ops)) < 0) {
                 snd_ca0106_free(chip);