Merge branch 'master'

8 files changed, 61 insertions, 42 deletions

diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 2e0a31613ee6..db12b038286b 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -960,7 +960,7 @@ static int wm_adc_mux_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucont
         if (change)
                 wm_put(ice, WM_ADC_MUX, nval);
         snd_ice1712_restore_gpio_status(ice);
-        return 0;
+        return change;
 }
 
 /*
@@ -1672,9 +1672,9 @@ static int __devinit aureon_add_controls(ice1712_t *ice)
                 snd_ice1712_save_gpio_status(ice);
                 id = aureon_cs8415_get(ice, CS8415_ID);
                 if (id != 0x41)
-                        snd_printk("No CS8415 chip. Skipping CS8415 controls.\n");
+                        snd_printk(KERN_INFO "No CS8415 chip. Skipping CS8415 controls.\n");
                 else if ((id & 0x0F) != 0x01)
-                        snd_printk("Detected unsupported CS8415 rev. (%c)\n", (char)((id & 0x0F) + 'A' - 1));
+                        snd_printk(KERN_INFO "Detected unsupported CS8415 rev. (%c)\n", (char)((id & 0x0F) + 'A' - 1));
                 else {
                         for (i = 0; i< ARRAY_SIZE(cs8415_controls); i++) {
                                 snd_kcontrol_t *kctl;
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index 39fbe662965d..576f69d482c9 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -546,7 +546,7 @@ static int __devinit snd_ice1712_delta_init(ice1712_t *ice)
         case ICE1712_SUBDEVICE_DELTA1010LT:
         case ICE1712_SUBDEVICE_VX442:
                 if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) {
-                        snd_printk("unable to create I2C bus\n");
+                        snd_printk(KERN_ERR "unable to create I2C bus\n");
                         return err;
                 }
                 ice->i2c->private_data = ice;
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c
index e36efa1bdac3..c8ec5cac3c17 100644
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
@@ -438,7 +438,7 @@ static int __devinit snd_ice1712_ews_init(ice1712_t *ice)
 
         /* create i2c */
         if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) {
-                snd_printk("unable to create I2C bus\n");
+                snd_printk(KERN_ERR "unable to create I2C bus\n");
                 return err;
         }
         ice->i2c->private_data = ice;
@@ -448,7 +448,7 @@ static int __devinit snd_ice1712_ews_init(ice1712_t *ice)
         switch (ice->eeprom.subvendor) {
         case ICE1712_SUBDEVICE_DMX6FIRE:
                 if ((err = snd_i2c_device_create(ice->i2c, "PCF9554", ICE1712_6FIRE_PCF9554_ADDR, &ice->spec.i2cdevs[EWS_I2C_6FIRE])) < 0) {
-                        snd_printk("PCF9554 initialization failed\n");
+                        snd_printk(KERN_ERR "PCF9554 initialization failed\n");
                         return err;
                 }
                 snd_ice1712_6fire_write_pca(ice, PCF9554_REG_CONFIG, 0x80);
@@ -791,7 +791,7 @@ static int snd_ice1712_6fire_read_pca(ice1712_t *ice, unsigned char reg)
         byte = 0;
         if (snd_i2c_readbytes(ice->spec.i2cdevs[EWS_I2C_6FIRE], &byte, 1) != 1) {
                 snd_i2c_unlock(ice->i2c);
-                printk("cannot read pca\n");
+                printk(KERN_ERR "cannot read pca\n");
                 return -EIO;
         }
         snd_i2c_unlock(ice->i2c);
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index a6d98013c331..5aca37798c32 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -387,7 +387,7 @@ int __devinit snd_ice1712_init_cs8427(ice1712_t *ice, int addr)
         if ((err = snd_cs8427_create(ice->i2c, addr,
                                      (ice->cs8427_timeout * HZ) / 1000,
                                      &ice->cs8427)) < 0) {
-                snd_printk("CS8427 initialization failed\n");
+                snd_printk(KERN_ERR "CS8427 initialization failed\n");
                 return err;
         }
         ice->spdif.ops.open = open_cs8427;
@@ -2348,12 +2348,12 @@ static int __devinit snd_ice1712_read_eeprom(ice1712_t *ice, const char *modelna
         if (ice->eeprom.size < 6)
                 ice->eeprom.size = 32; /* FIXME: any cards without the correct size? */
         else if (ice->eeprom.size > 32) {
-                snd_printk("invalid EEPROM (size = %i)\n", ice->eeprom.size);
+                snd_printk(KERN_ERR "invalid EEPROM (size = %i)\n", ice->eeprom.size);
                 return -EIO;
         }
         ice->eeprom.version = snd_ice1712_read_i2c(ice, dev, 0x05);
         if (ice->eeprom.version != 1) {
-                snd_printk("invalid EEPROM version %i\n", ice->eeprom.version);
+                snd_printk(KERN_ERR "invalid EEPROM version %i\n", ice->eeprom.version);
                 /* return -EIO; */
         }
         size = ice->eeprom.size - 6;
@@ -2524,7 +2524,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card,
         /* check, if we can restrict PCI DMA transfers to 28 bits */
         if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
-                snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -2573,7 +2573,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card,
         ice->profi_port = pci_resource_start(pci, 3);
 
         if (request_irq(pci->irq, snd_ice1712_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1712", (void *) ice)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ice1712_free(ice);
                 return -EIO;
         }
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index c3ce8f93740b..5b4293f5a652 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -675,9 +675,12 @@ static snd_pcm_hardware_t snd_vt1724_spdif =
                                  SNDRV_PCM_INFO_MMAP_VALID |
                                  SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START),
         .formats =              SNDRV_PCM_FMTBIT_S32_LE,
-        .rates =                SNDRV_PCM_RATE_32000|SNDRV_PCM_RATE_44100|SNDRV_PCM_RATE_48000,
+        .rates =                (SNDRV_PCM_RATE_32000|SNDRV_PCM_RATE_44100|
+                                 SNDRV_PCM_RATE_48000|SNDRV_PCM_RATE_88200|
+                                 SNDRV_PCM_RATE_96000|SNDRV_PCM_RATE_176400|
+                                 SNDRV_PCM_RATE_192000),
         .rate_min =             32000,
-        .rate_max =             48000,
+        .rate_max =             192000,
         .channels_min =         2,
         .channels_max =         2,
         .buffer_bytes_max =     (1UL << 18),    /* 16bits dword */
@@ -905,6 +908,10 @@ static void update_spdif_rate(ice1712_t *ice, unsigned int rate)
         case 44100: break;
         case 48000: nval |= 2 << 12; break;
         case 32000: nval |= 3 << 12; break;
+        case 88200: nval |= 4 << 12; break;
+        case 96000: nval |= 5 << 12; break;
+        case 192000: nval |= 6 << 12; break;
+        case 176400: nval |= 7 << 12; break;
         }
         if (val != nval)
                 update_spdif_bits(ice, nval);
@@ -1292,22 +1299,32 @@ static int snd_vt1724_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
 
 static unsigned int encode_spdif_bits(snd_aes_iec958_t *diga)
 {
-        unsigned int val;
+        unsigned int val, rbits;
 
         val = diga->status[0] & 0x03; /* professional, non-audio */
         if (val & 0x01) {
                 /* professional */
                 if ((diga->status[0] & IEC958_AES0_PRO_EMPHASIS) == IEC958_AES0_PRO_EMPHASIS_5015)
                         val |= 1U << 3;
-                switch (diga->status[0] & IEC958_AES0_PRO_FS) {
-                case IEC958_AES0_PRO_FS_44100:
-                        break;
-                case IEC958_AES0_PRO_FS_32000:
-                        val |= 3U << 12;
-                        break;
-                default:
-                        val |= 2U << 12;
-                        break;
+                rbits = (diga->status[4] >> 3) & 0x0f;
+                if (rbits) {
+                        switch (rbits) {
+                        case 2: val |= 5 << 12; break; /* 96k */
+                        case 3: val |= 6 << 12; break; /* 192k */
+                        case 10: val |= 4 << 12; break; /* 88.2k */
+                        case 11: val |= 7 << 12; break; /* 176.4k */
+                        }
+                } else {
+                        switch (diga->status[0] & IEC958_AES0_PRO_FS) {
+                        case IEC958_AES0_PRO_FS_44100:
+                                break;
+                        case IEC958_AES0_PRO_FS_32000:
+                                val |= 3U << 12;
+                                break;
+                        default:
+                                val |= 2U << 12;
+                                break;
+                        }
                 }
         } else {
                 /* consumer */
@@ -2154,7 +2171,7 @@ static int __devinit snd_vt1724_create(snd_card_t * card,
         ice->profi_port = pci_resource_start(pci, 1);
 
         if (request_irq(pci->irq, snd_vt1724_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1724", (void *) ice)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_vt1724_free(ice);
                 return -EIO;
         }
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index a5f852b1f575..773a1ecb75ce 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -794,8 +794,7 @@ static int __devinit pontis_init(ice1712_t *ice)
         /* initialize WM8776 codec */
         for (i = 0; i < ARRAY_SIZE(wm_inits); i += 2)
                 wm_put(ice, wm_inits[i], wm_inits[i+1]);
-        set_current_state(TASK_UNINTERRUPTIBLE);
-        schedule_timeout(1);
+        schedule_timeout_uninterruptible(1);
         for (i = 0; i < ARRAY_SIZE(wm_inits2); i += 2)
                 wm_put(ice, wm_inits2[i], wm_inits2[i+1]);
 
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index d48d42524ac5..1fe21009ca84 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -128,17 +128,6 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
         .mask_flags = 0,
 };
 
-static unsigned int rates[] = {
-        32000, 44100, 48000, 64000, 88200, 96000,
-        176400, 192000,
-};
-
-static snd_pcm_hw_constraint_list_t revo_rates = {
-        .count = ARRAY_SIZE(rates),
-        .list = rates,
-        .mask = 0,
-};
-
 static int __devinit revo_init(ice1712_t *ice)
 {
         akm4xxx_t *ak;
@@ -173,8 +162,6 @@ static int __devinit revo_init(ice1712_t *ice)
                 break;
         }
 
-        ice->hw_rates = &revo_rates; /* AK codecs don't support lower than 32k */
-
         return 0;
 }
 
diff --git a/sound/pci/ice1712/vt1720_mobo.c b/sound/pci/ice1712/vt1720_mobo.c
index ab61e383024f..90c85cd95479 100644
--- a/sound/pci/ice1712/vt1720_mobo.c
+++ b/sound/pci/ice1712/vt1720_mobo.c
@@ -71,6 +71,22 @@ static unsigned char k8x800_eeprom[] __devinitdata = {
         0x00,   /* - */
 };
 
+static unsigned char sn25p_eeprom[] __devinitdata = {
+        0x01,   /* SYSCONF: clock 256, 1ADC, 2DACs */
+        0x02,   /* ACLINK: ACLINK, packed */
+        0x00,   /* I2S: - */
+        0x41,   /* SPDIF: - */
+        0xff,   /* GPIO_DIR */
+        0xff,   /* GPIO_DIR1 */
+        0x00,   /* - */
+        0xff,   /* GPIO_MASK */
+        0xff,   /* GPIO_MASK1 */
+        0x00,   /* - */
+        0x00,   /* GPIO_STATE */
+        0x00,   /* GPIO_STATE1 */
+        0x00,   /* - */
+};
+
 
 /* entry point */
 struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = {
@@ -113,11 +129,11 @@ struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = {
         {
                 .subvendor = VT1720_SUBDEVICE_SN25P,
                 .name = "Shuttle SN25P",
-                /* identical with k8x800 */
+                .model = "sn25p",
                 .chip_init = k8x800_init,
                 .build_controls = k8x800_add_controls,
                 .eeprom_size = sizeof(k8x800_eeprom),
-                .eeprom_data = k8x800_eeprom,
+                .eeprom_data = sn25p_eeprom,
         },
         { } /* terminator */
 };