48 files changed, 692 insertions, 491 deletions
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index e6beb92c6933..b4590df07466 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -159,7 +159,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
        struct i2sbus_dev *dev;
        struct device_node *child = NULL, *sound = NULL;
        struct resource *r;
-        int i, layout = 0, rlen;
+        int i, layout = 0, rlen, ok = force;
        static const char *rnames[] = { "i2sbus: %s (control)",
                                        "i2sbus: %s (tx)",
                                        "i2sbus: %s (rx)" };
@@ -192,7 +192,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
                        layout = *layout_id;
                        snprintf(dev->sound.modalias, 32,
                                 "sound-layout-%d", layout);
-                        force = 1;
+                        ok = 1;
                }
        }
        /* for the time being, until we can handle non-layout-id
@@ -201,7 +201,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
         * When there are two i2s busses and only one has a layout-id,
         * then this depends on the order, but that isn't important
         * either as the second one in that case is just a modem. */
-        if (!force) {
+        if (!ok) {
                kfree(dev);
                return -ENODEV;
        }
diff --git a/sound/aoa/soundbus/soundbus.h b/sound/aoa/soundbus/soundbus.h
index 622cd37a0118..a0f223c13f66 100644
--- a/sound/aoa/soundbus/soundbus.h
+++ b/sound/aoa/soundbus/soundbus.h
@@ -8,7 +8,7 @@
 #ifndef __SOUNDBUS_H
 #define __SOUNDBUS_H
-#include <asm/of_device.h>
+#include <linux/of_device.h>
 #include <sound/pcm.h>
 #include <linux/list.h>
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 99026dfb81ea..34c1d94f921e 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -50,7 +50,7 @@ unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
        mutex_lock(&car_mutex);
        /* set up primary or secondary codec space */
-        if ((cpu_is_pxa21x() || cpu_is_pxa25x()) && reg == AC97_GPIO_STATUS)
+        if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS)
                reg_addr = ac97->num ? &SMC_REG_BASE : &PMC_REG_BASE;
        else
                reg_addr = ac97->num ? &SAC_REG_BASE : &PAC_REG_BASE;
@@ -90,7 +90,7 @@ void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
        mutex_lock(&car_mutex);
        /* set up primary or secondary codec space */
-        if ((cpu_is_pxa21x() || cpu_is_pxa25x()) && reg == AC97_GPIO_STATUS)
+        if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS)
                reg_addr = ac97->num ? &SMC_REG_BASE : &PMC_REG_BASE;
        else
                reg_addr = ac97->num ? &SAC_REG_BASE : &PAC_REG_BASE;
@@ -200,7 +200,7 @@ static inline void pxa_ac97_cold_pxa3xx(void)
 bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)
 {
 #ifdef CONFIG_PXA25x
-        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+        if (cpu_is_pxa25x())
                pxa_ac97_warm_pxa25x();
        else
 #endif
@@ -230,7 +230,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_try_warm_reset);
 bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)
 {
 #ifdef CONFIG_PXA25x
-        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+        if (cpu_is_pxa25x())
                pxa_ac97_cold_pxa25x();
        else
 #endif
@@ -301,7 +301,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend);
 int pxa2xx_ac97_hw_resume(void)
 {
-        if (cpu_is_pxa21x() || cpu_is_pxa25x() || cpu_is_pxa27x()) {
+        if (cpu_is_pxa25x() || cpu_is_pxa27x()) {
                pxa_gpio_mode(GPIO31_SYNC_AC97_MD);
                pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);
                pxa_gpio_mode(GPIO28_BITCLK_AC97_MD);
@@ -325,7 +325,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
        if (ret < 0)
                goto err;
-        if (cpu_is_pxa21x() || cpu_is_pxa25x() || cpu_is_pxa27x()) {
+        if (cpu_is_pxa25x() || cpu_is_pxa27x()) {
                pxa_gpio_mode(GPIO31_SYNC_AC97_MD);
                pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);
                pxa_gpio_mode(GPIO28_BITCLK_AC97_MD);
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index cba71d867542..c2635beb4c88 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -44,7 +44,7 @@ static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = {
        .name                   = "AC97 PCM out",
        .dev_addr               = __PREG(PCDR),
-        .drcmr                  = &DRCMRTXPCDR,
+        .drcmr                  = &DRCMR(12),
        .dcmd                   = DCMD_INCSRCADDR | DCMD_FLOWTRG |
                                  DCMD_BURST32 | DCMD_WIDTH4,
 };
@@ -52,7 +52,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_in = {
        .name                   = "AC97 PCM in",
        .dev_addr               = __PREG(PCDR),
-        .drcmr                  = &DRCMRRXPCDR,
+        .drcmr                  = &DRCMR(11),
        .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                  DCMD_BURST32 | DCMD_WIDTH4,
 };
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 1c93eb77cb99..75a0d746fb60 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -194,7 +194,7 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)
                goto out;
        ret = -ENOMEM;
-        rtd = kmalloc(sizeof(*rtd), GFP_KERNEL);
+        rtd = kzalloc(sizeof(*rtd), GFP_KERNEL);
        if (!rtd)
                goto out;
        rtd->dma_desc_array =
diff --git a/sound/core/control.c b/sound/core/control.c
index 6d71f9a7ccbb..b0bf42691047 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -225,8 +225,13 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol,
        kctl.id.iface = ncontrol->iface;
        kctl.id.device = ncontrol->device;
        kctl.id.subdevice = ncontrol->subdevice;
-        if (ncontrol->name)
+        if (ncontrol->name) {
                strlcpy(kctl.id.name, ncontrol->name, sizeof(kctl.id.name));
+                if (strcmp(ncontrol->name, kctl.id.name) != 0)
+                        snd_printk(KERN_WARNING
+                                   "Control name '%s' truncated to '%s'\n",
+                                   ncontrol->name, kctl.id.name);
+        }
        kctl.id.index = ncontrol->index;
        kctl.count = ncontrol->count ? ncontrol->count : 1;
        access = ncontrol->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :
diff --git a/sound/core/init.c b/sound/core/init.c
index 8af467df9245..ef2352c2e451 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -549,9 +549,9 @@ int snd_card_register(struct snd_card *card)
                return -EINVAL;
 #ifndef CONFIG_SYSFS_DEPRECATED
        if (!card->card_dev) {
-                card->card_dev = device_create_drvdata(sound_class, card->dev,
+                card->card_dev = device_create(sound_class, card->dev,
-                                                       MKDEV(0, 0), NULL,
+                                               MKDEV(0, 0), NULL,
-                                                       "card%i", card->number);
+                                               "card%i", card->number);
                if (IS_ERR(card->card_dev))
                        card->card_dev = NULL;
        }
diff --git a/sound/core/jack.c b/sound/core/jack.c
index 8133a2b173a5..bd2d9e6b55e9 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -147,6 +147,9 @@ EXPORT_SYMBOL(snd_jack_set_parent);
 */
 void snd_jack_report(struct snd_jack *jack, int status)
 {
+        if (!jack)
+                return;
        if (jack->type & SND_JACK_HEADPHONE)
                input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT,
                                    status & SND_JACK_HEADPHONE);
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index a7b46ec72f32..1b3534d67686 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -33,9 +33,6 @@
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
 #include <sound/memalloc.h>
-#ifdef CONFIG_SBUS
-#include <asm/sbus.h>
-#endif
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>");
@@ -162,39 +159,6 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
 }
 #endif /* CONFIG_HAS_DMA */
-#ifdef CONFIG_SBUS
-static void *snd_malloc_sbus_pages(struct device *dev, size_t size,
-                                   dma_addr_t *dma_addr)
-{
-        struct sbus_dev *sdev = (struct sbus_dev *)dev;
-        int pg;
-        void *res;
-        if (WARN_ON(!dma_addr))
-                return NULL;
-        pg = get_order(size);
-        res = sbus_alloc_consistent(sdev, PAGE_SIZE * (1 << pg), dma_addr);
-        if (res != NULL)
-                inc_snd_pages(pg);
-        return res;
-}
-static void snd_free_sbus_pages(struct device *dev, size_t size,
-                                void *ptr, dma_addr_t dma_addr)
-{
-        struct sbus_dev *sdev = (struct sbus_dev *)dev;
-        int pg;
-        if (ptr == NULL)
-                return;
-        pg = get_order(size);
-        dec_snd_pages(pg);
-        sbus_free_consistent(sdev, PAGE_SIZE * (1 << pg), ptr, dma_addr);
-}
-#endif /* CONFIG_SBUS */
 /*
 *
 *  ALSA generic memory management
@@ -231,11 +195,6 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
                dmab->area = snd_malloc_pages(size, (unsigned long)device);
                dmab->addr = 0;
                break;
-#ifdef CONFIG_SBUS
-        case SNDRV_DMA_TYPE_SBUS:
-                dmab->area = snd_malloc_sbus_pages(device, size, &dmab->addr);
-                break;
-#endif
 #ifdef CONFIG_HAS_DMA
        case SNDRV_DMA_TYPE_DEV:
                dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr);
@@ -306,11 +265,6 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
        case SNDRV_DMA_TYPE_CONTINUOUS:
                snd_free_pages(dmab->area, dmab->bytes);
                break;
-#ifdef CONFIG_SBUS
-        case SNDRV_DMA_TYPE_SBUS:
-                snd_free_sbus_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
-                break;
-#endif
 #ifdef CONFIG_HAS_DMA
        case SNDRV_DMA_TYPE_DEV:
                snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
@@ -419,7 +373,7 @@ static int snd_mem_proc_read(struct seq_file *seq, void *offset)
        long pages = snd_allocated_pages >> (PAGE_SHIFT-12);
        struct snd_mem_list *mem;
        int devno;
-        static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG", "SBUS" };
+        static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG" };
        mutex_lock(&list_mutex);
        seq_printf(seq, "pages  : %li bytes (%li pages per %likB)\n",
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 6ea5cfb83998..921691080f35 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -908,12 +908,12 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
 EXPORT_SYMBOL(snd_pcm_hw_rule_add);
 /**
- * snd_pcm_hw_constraint_mask
+ * snd_pcm_hw_constraint_mask - apply the given bitmap mask constraint
 * @runtime: PCM runtime instance
 * @var: hw_params variable to apply the mask
 * @mask: the bitmap mask
 *
- * Apply the constraint of the given bitmap mask to a mask parameter.
+ * Apply the constraint of the given bitmap mask to a 32-bit mask parameter.
 */
 int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
                               u_int32_t mask)
@@ -928,12 +928,12 @@ int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param
 }
 /**
- * snd_pcm_hw_constraint_mask64
+ * snd_pcm_hw_constraint_mask64 - apply the given bitmap mask constraint
 * @runtime: PCM runtime instance
 * @var: hw_params variable to apply the mask
 * @mask: the 64bit bitmap mask
 *
- * Apply the constraint of the given bitmap mask to a mask parameter.
+ * Apply the constraint of the given bitmap mask to a 64-bit mask parameter.
 */
 int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
                                 u_int64_t mask)
@@ -949,7 +949,7 @@ int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_par
 }
 /**
- * snd_pcm_hw_constraint_integer
+ * snd_pcm_hw_constraint_integer - apply an integer constraint to an interval
 * @runtime: PCM runtime instance
 * @var: hw_params variable to apply the integer constraint
 *
@@ -964,7 +964,7 @@ int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_pa
 EXPORT_SYMBOL(snd_pcm_hw_constraint_integer);
 /**
- * snd_pcm_hw_constraint_minmax
+ * snd_pcm_hw_constraint_minmax - apply a min/max range constraint to an interval
 * @runtime: PCM runtime instance
 * @var: hw_params variable to apply the range
 * @min: the minimal value
@@ -995,7 +995,7 @@ static int snd_pcm_hw_rule_list(struct snd_pcm_hw_params *params,
 /**
- * snd_pcm_hw_constraint_list
+ * snd_pcm_hw_constraint_list - apply a list of constraints to a parameter
 * @runtime: PCM runtime instance
 * @cond: condition bits
 * @var: hw_params variable to apply the list constraint
@@ -1031,7 +1031,7 @@ static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params,
 }
 /**
- * snd_pcm_hw_constraint_ratnums
+ * snd_pcm_hw_constraint_ratnums - apply ratnums constraint to a parameter
 * @runtime: PCM runtime instance
 * @cond: condition bits
 * @var: hw_params variable to apply the ratnums constraint
@@ -1064,7 +1064,7 @@ static int snd_pcm_hw_rule_ratdens(struct snd_pcm_hw_params *params,
 }
 /**
- * snd_pcm_hw_constraint_ratdens
+ * snd_pcm_hw_constraint_ratdens - apply ratdens constraint to a parameter
 * @runtime: PCM runtime instance
 * @cond: condition bits
 * @var: hw_params variable to apply the ratdens constraint
@@ -1095,7 +1095,7 @@ static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params,
 }
 /**
- * snd_pcm_hw_constraint_msbits
+ * snd_pcm_hw_constraint_msbits - add a hw constraint msbits rule
 * @runtime: PCM runtime instance
 * @cond: condition bits
 * @width: sample bits width
@@ -1123,7 +1123,7 @@ static int snd_pcm_hw_rule_step(struct snd_pcm_hw_params *params,
 }
 /**
- * snd_pcm_hw_constraint_step
+ * snd_pcm_hw_constraint_step - add a hw constraint step rule
 * @runtime: PCM runtime instance
 * @cond: condition bits
 * @var: hw_params variable to apply the step constraint
@@ -1154,7 +1154,7 @@ static int snd_pcm_hw_rule_pow2(struct snd_pcm_hw_params *params, struct snd_pcm
 }               
 /**
- * snd_pcm_hw_constraint_pow2
+ * snd_pcm_hw_constraint_pow2 - add a hw constraint power-of-2 rule
 * @runtime: PCM runtime instance
 * @cond: condition bits
 * @var: hw_params variable to apply the power-of-2 constraint
@@ -1202,13 +1202,13 @@ void _snd_pcm_hw_params_any(struct snd_pcm_hw_params *params)
 EXPORT_SYMBOL(_snd_pcm_hw_params_any);
 /**
- * snd_pcm_hw_param_value
+ * snd_pcm_hw_param_value - return @params field @var value
 * @params: the hw_params instance
 * @var: parameter to retrieve
- * @dir: pointer to the direction (-1,0,1) or NULL
+ * @dir: pointer to the direction (-1,0,1) or %NULL
 *
- * Return the value for field PAR if it's fixed in configuration space 
+ * Return the value for field @var if it's fixed in configuration space
- *  defined by PARAMS. Return -EINVAL otherwise
+ * defined by @params. Return -%EINVAL otherwise.
 */
 int snd_pcm_hw_param_value(const struct snd_pcm_hw_params *params,
                           snd_pcm_hw_param_t var, int *dir)
@@ -1271,13 +1271,13 @@ static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params,
 /**
- * snd_pcm_hw_param_first
+ * snd_pcm_hw_param_first - refine config space and return minimum value
 * @pcm: PCM instance
 * @params: the hw_params instance
 * @var: parameter to retrieve
- * @dir: pointer to the direction (-1,0,1) or NULL
+ * @dir: pointer to the direction (-1,0,1) or %NULL
 *
- * Inside configuration space defined by PARAMS remove from PAR all 
+ * Inside configuration space defined by @params remove from @var all
 * values > minimum. Reduce configuration space accordingly.
 * Return the minimum.
 */
@@ -1317,13 +1317,13 @@ static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params,
 /**
- * snd_pcm_hw_param_last
+ * snd_pcm_hw_param_last - refine config space and return maximum value
 * @pcm: PCM instance
 * @params: the hw_params instance
 * @var: parameter to retrieve
- * @dir: pointer to the direction (-1,0,1) or NULL
+ * @dir: pointer to the direction (-1,0,1) or %NULL
 *
- * Inside configuration space defined by PARAMS remove from PAR all 
+ * Inside configuration space defined by @params remove from @var all
 * values < maximum. Reduce configuration space accordingly.
 * Return the maximum.
 */
@@ -1345,11 +1345,11 @@ int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm,
 EXPORT_SYMBOL(snd_pcm_hw_param_last);
 /**
- * snd_pcm_hw_param_choose
+ * snd_pcm_hw_param_choose - choose a configuration defined by @params
 * @pcm: PCM instance
 * @params: the hw_params instance
 *
- * Choose one configuration from configuration space defined by PARAMS
+ * Choose one configuration from configuration space defined by @params.
 * The configuration chosen is that obtained fixing in this order:
 * first access, first format, first subformat, min channels,
 * min rate, min period time, max buffer size, min tick time
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index 89b7f549bebd..ea2bf82c9373 100644
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -319,6 +319,7 @@ EXPORT_SYMBOL(snd_pcm_format_physical_width);
 /**
 * snd_pcm_format_size - return the byte size of samples on the given format
 * @format: the format to check
+ * @samples: sampling rate
 *
 * Returns the byte size of the given samples for the format, or a
 * negative error code if unknown format.
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index e61e12506ded..aef18682c035 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -875,10 +875,8 @@ static struct action_ops snd_pcm_action_start = {
 };
 /**
- * snd_pcm_start
+ * snd_pcm_start - start all linked streams
 * @substream: the PCM substream instance
- *
- * Start all linked streams.
 */
 int snd_pcm_start(struct snd_pcm_substream *substream)
 {
@@ -926,12 +924,11 @@ static struct action_ops snd_pcm_action_stop = {
 };
 /**
- * snd_pcm_stop
+ * snd_pcm_stop - try to stop all running streams in the substream group
 * @substream: the PCM substream instance
 * @state: PCM state after stopping the stream
 *
- * Try to stop all running streams in the substream group.
+ * The state of each stream is then changed to the given state unconditionally.
- * The state of each stream is changed to the given value after that unconditionally.
 */
 int snd_pcm_stop(struct snd_pcm_substream *substream, int state)
 {
@@ -941,11 +938,10 @@ int snd_pcm_stop(struct snd_pcm_substream *substream, int state)
 EXPORT_SYMBOL(snd_pcm_stop);
 /**
- * snd_pcm_drain_done
+ * snd_pcm_drain_done - stop the DMA only when the given stream is playback
 * @substream: the PCM substream
 *
- * Stop the DMA only when the given stream is playback.
+ * After stopping, the state is changed to SETUP.
- * The state is changed to SETUP.
 * Unlike snd_pcm_stop(), this affects only the given stream.
 */
 int snd_pcm_drain_done(struct snd_pcm_substream *substream)
@@ -1065,10 +1061,9 @@ static struct action_ops snd_pcm_action_suspend = {
 };
 /**
- * snd_pcm_suspend
+ * snd_pcm_suspend - trigger SUSPEND to all linked streams
 * @substream: the PCM substream
 *
- * Trigger SUSPEND to all linked streams.
 * After this call, all streams are changed to SUSPENDED state.
 */
 int snd_pcm_suspend(struct snd_pcm_substream *substream)
@@ -1088,10 +1083,9 @@ int snd_pcm_suspend(struct snd_pcm_substream *substream)
 EXPORT_SYMBOL(snd_pcm_suspend);
 /**
- * snd_pcm_suspend_all
+ * snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm
 * @pcm: the PCM instance
 *
- * Trigger SUSPEND to all substreams in the given pcm.
 * After this call, all streams are changed to SUSPENDED state.
 */
 int snd_pcm_suspend_all(struct snd_pcm *pcm)
@@ -1313,11 +1307,9 @@ static struct action_ops snd_pcm_action_prepare = {
 };
 /**
- * snd_pcm_prepare
+ * snd_pcm_prepare - prepare the PCM substream to be triggerable
 * @substream: the PCM substream instance
 * @file: file to refer f_flags
- *
- * Prepare the PCM substream to be triggerable.
 */
 static int snd_pcm_prepare(struct snd_pcm_substream *substream,
                           struct file *file)
diff --git a/sound/core/sound.c b/sound/core/sound.c
index c0685e2f0afa..44a69bb8d4f0 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -274,9 +274,8 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
                return minor;
        }
        snd_minors[minor] = preg;
-        preg->dev = device_create_drvdata(sound_class, device,
+        preg->dev = device_create(sound_class, device, MKDEV(major, minor),
-                                          MKDEV(major, minor),
+                                  private_data, "%s", name);
-                                          private_data, "%s", name);
        if (IS_ERR(preg->dev)) {
                snd_minors[minor] = NULL;
                mutex_unlock(&sound_mutex);
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index e5e749f3e0ef..73be7e14a603 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -51,7 +51,7 @@ static int emu10k1_playback_constraints(struct snd_pcm_runtime *runtime)
        if (err < 0)
                return err;
        err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX);
-        if (err) < 0)
+        if (err < 0)
                return err;
        return 0;
 }
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index 83e90057270e..c13a178383ba 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -87,8 +87,7 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea)
 static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
                             unsigned int cmd, unsigned long data)
 {
-        struct video_device *dev = video_devdata(file);
+        struct snd_tea575x *tea = video_drvdata(file);
-        struct snd_tea575x *tea = video_get_drvdata(dev);
        void __user *arg = (void __user *)data;
        
        switch(cmd) {
@@ -175,6 +174,21 @@ static void snd_tea575x_release(struct video_device *vfd)
 {
 }
+static int snd_tea575x_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct snd_tea575x *tea = video_drvdata(file);
+        return test_and_set_bit(0, &tea->in_use) ? -EBUSY : 0;
+}
+static int snd_tea575x_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct snd_tea575x *tea = video_drvdata(file);
+        clear_bit(0, &tea->in_use);
+        return 0;
+}
 /*
 * initialize all the tea575x chips
 */
@@ -193,9 +207,10 @@ void snd_tea575x_init(struct snd_tea575x *tea)
        tea->vd.release = snd_tea575x_release;
        video_set_drvdata(&tea->vd, tea);
        tea->vd.fops = &tea->fops;
+        tea->in_use = 0;
        tea->fops.owner = tea->card->module;
-        tea->fops.open = video_exclusive_open;
+        tea->fops.open = snd_tea575x_exclusive_open;
-        tea->fops.release = video_exclusive_release;
+        tea->fops.release = snd_tea575x_exclusive_release;
        tea->fops.ioctl = snd_tea575x_ioctl;
        if (video_register_device(&tea->vd, VFL_TYPE_RADIO, tea->dev_nr - 1) < 0) {
                snd_printk(KERN_ERR "unable to register tea575x tuner\n");
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index eb9bc365530d..c180598f1710 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -1,7 +1,7 @@
 /*
 *      Initialisation code for Cyrix/NatSemi VSA1 softaudio
 *
- *      (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+ *      (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
 *
 * XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.
 * The older version (VSA1) provides fairly good soundblaster emulation
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index b493660deb36..e5d423994918 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -26,7 +26,7 @@
 #include <asm/cpu/dac.h>
 #include <asm/cpu/timer.h>
 #include <asm/machvec.h>
-#include <asm/hp6xx.h>
+#include <mach/hp6xx.h>
 #include <asm/hd64461.h>
 #define MODNAME "sh_dac_audio"
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 7d89c081a086..61aaedae6b7e 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -560,19 +560,18 @@ static int __init oss_init(void)
        sound_dmap_flag = (dmabuf > 0 ? 1 : 0);
        for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
-                device_create_drvdata(sound_class, NULL,
+                device_create(sound_class, NULL,
-                                      MKDEV(SOUND_MAJOR, dev_list[i].minor),
+                              MKDEV(SOUND_MAJOR, dev_list[i].minor), NULL,
-                                      NULL, "%s", dev_list[i].name);
+                              "%s", dev_list[i].name);
                if (!dev_list[i].num)
                        continue;
                for (j = 1; j < *dev_list[i].num; j++)
-                        device_create_drvdata(sound_class, NULL,
+                        device_create(sound_class, NULL,
-                                              MKDEV(SOUND_MAJOR,
+                                      MKDEV(SOUND_MAJOR,
-                                                    dev_list[i].minor + (j*0x10)),
+                                            dev_list[i].minor + (j*0x10)),
-                                              NULL,
+                                      NULL, "%s%d", dev_list[i].name, j);
-                                              "%s%d", dev_list[i].name, j);
        }
        if (sound_nblocks >= 1024)
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 6704acbca8c0..bd510eceff1f 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1927,9 +1927,9 @@ static int snd_ac97_dev_register(struct snd_device *device)
        ac97->dev.bus = &ac97_bus_type;
        ac97->dev.parent = ac97->bus->card->dev;
        ac97->dev.release = ac97_device_release;
-        snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s",
+        dev_set_name(&ac97->dev, "%d-%d:%s",
-                 ac97->bus->card->number, ac97->num,
+                     ac97->bus->card->number, ac97->num,
-                 snd_ac97_get_short_name(ac97));
+                     snd_ac97_get_short_name(ac97));
        if ((err = device_register(&ac97->dev)) < 0) {
                snd_printk(KERN_ERR "Can't register ac97 bus\n");
                ac97->dev.bus = NULL;
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 92f3a976ef2e..a7f38e63303f 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -932,7 +932,7 @@ snd_ad1889_create(struct snd_card *card,
                goto free_and_ret;
        chip->bar = pci_resource_start(pci, 0);
-        chip->iobase = ioremap_nocache(chip->bar, pci_resource_len(pci, 0));
+        chip->iobase = pci_ioremap_bar(pci, 0);
        if (chip->iobase == NULL) {
                printk(KERN_ERR PFX "unable to reserve region.\n");
                err = -EBUSY;
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 085a52b8c807..226fe8237d31 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1609,7 +1609,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
                return err;
        }
        chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
        if (chip->remap_addr == NULL) {
                snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
                snd_atiixp_free(chip);
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 2f106306c7fe..0e6e5cc1c501 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1252,7 +1252,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
                return err;
        }
        chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
        if (chip->remap_addr == NULL) {
                snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
                snd_atiixp_free(chip);
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 68368e490074..a36d4d1fd419 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -180,8 +180,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
        if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0)
                goto regions_out;
-        chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
+        chip->mmio = pci_ioremap_bar(pci, 0);
-                                     pci_resource_len(pci, 0));
        if (!chip->mmio) {
                printk(KERN_ERR "MMIO area remap failed.\n");
                err = -ENOMEM;
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 3aa8d973540a..1aa1c0402540 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -749,8 +749,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
                pci_disable_device(pci);
                return err;
        }
-        chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
+        chip->mmio = pci_ioremap_bar(pci, 0);
-                                     pci_resource_len(pci, 0));
        if (!chip->mmio) {
                snd_printk(KERN_ERR "cannot remap io memory\n");
                err = -ENOMEM;
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index a7d89662acf6..88fbf285d2b7 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -759,7 +759,6 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)
                               SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
                               SPCS_GENERATIONSTATUS | 0x00001200 |
                               0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT );
-        }
 #endif
        return 0;
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index ef9308f7c45b..192e7842e181 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1382,8 +1382,8 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
        chip->ba0_addr = pci_resource_start(pci, 0);
        chip->ba1_addr = pci_resource_start(pci, 1);
-        chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0));
+        chip->ba0 = pci_ioremap_bar(pci, 0);
-        chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1));
+        chip->ba1 = pci_ioremap_bar(pci, 1);
        if (!chip->ba0 || !chip->ba1) {
                snd_cs4281_free(chip);
                return -ENOMEM;
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 7ff8b68e997e..6dea5b5cc774 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -2,7 +2,7 @@
 * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio
 *
 *      (C) Copyright 2007 Ash Willis <ashwillis@programmer.net>
- *      (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+ *      (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
 *
 * This driver was ported (shamelessly ripped ;) from oss/kahlua.c but I did
 * mess with it a bit. The chip seems to have to have trouble with full duplex
@@ -132,7 +132,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,
        }
        chip->pci_base = pci_resource_start(pci, 0);
-        mem = ioremap_nocache(chip->pci_base, pci_resource_len(pci, 0));
+        mem = pci_ioremap_bar(pci, 0);
        if (mem == NULL) {
                kfree(chip);
                pci_disable_device(pci);
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 6447754ae56e..ba1ab737b55f 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -64,6 +64,7 @@ static struct hda_vendor_id hda_vendor_ids[] = {
        { 0x14f1, "Conexant" },
        { 0x17e8, "Chrontel" },
        { 0x1854, "LG" },
+        { 0x1aec, "Wolfson Microelectronics" },
        { 0x434d, "C-Media" },
        { 0x8384, "SigmaTel" },
        {} /* terminator */
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 9f316c1b2790..35722ec920cb 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -45,6 +45,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/mutex.h>
+#include <linux/reboot.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include "hda_codec.h"
@@ -397,6 +398,9 @@ struct azx {
        /* for pending irqs */
        struct work_struct irq_pending_work;
+        /* reboot notifier (for mysterious hangup problem at power-down) */
+        struct notifier_block reboot_notifier;
 };
 /* driver types */
@@ -1979,12 +1983,36 @@ static int azx_resume(struct pci_dev *pci)
 /*
+ * reboot notifier for hang-up problem at power-down
+ */
+static int azx_halt(struct notifier_block *nb, unsigned long event, void *buf)
+{
+        struct azx *chip = container_of(nb, struct azx, reboot_notifier);
+        azx_stop_chip(chip);
+        return NOTIFY_OK;
+}
+static void azx_notifier_register(struct azx *chip)
+{
+        chip->reboot_notifier.notifier_call = azx_halt;
+        register_reboot_notifier(&chip->reboot_notifier);
+}
+static void azx_notifier_unregister(struct azx *chip)
+{
+        if (chip->reboot_notifier.notifier_call)
+                unregister_reboot_notifier(&chip->reboot_notifier);
+}
+/*
 * destructor
 */
 static int azx_free(struct azx *chip)
 {
        int i;
+        azx_notifier_unregister(chip);
        if (chip->initialized) {
                azx_clear_irq_pending(chip);
                for (i = 0; i < chip->num_streams; i++)
@@ -2158,7 +2186,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
        }
        chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci,0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
        if (chip->remap_addr == NULL) {
                snd_printk(KERN_ERR SFX "ioremap error\n");
                err = -ENXIO;
@@ -2348,6 +2376,7 @@ static int __devinit azx_probe(struct pci_dev *pci,
        pci_set_drvdata(pci, card);
        chip->running = 1;
        power_down_all_codecs(chip);
+        azx_notifier_register(chip);
        dev++;
        return err;
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 2b00c4afdf97..d3fd432cb3ea 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -3860,6 +3860,7 @@ static const char *ad1884a_models[AD1884A_MODELS] = {
 static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
        SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
+        SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
        SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
        {}
 };
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c
index 1a65775d28e1..2eed2c8b98da 100644
--- a/sound/pci/hda/patch_nvhdmi.c
+++ b/sound/pci/hda/patch_nvhdmi.c
@@ -116,6 +116,7 @@ static int nvhdmi_build_pcms(struct hda_codec *codec)
        codec->pcm_info = info;
        info->name = "NVIDIA HDMI";
+        info->pcm_type = HDA_PCM_TYPE_HDMI;
        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = nvhdmi_pcm_digital_playback;
        return 0;
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0b6e682c46d0..4eceab9bd109 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -307,6 +307,13 @@ struct alc_spec {
        /* for PLL fix */
        hda_nid_t pll_nid;
        unsigned int pll_coef_idx, pll_coef_bit;
+#ifdef SND_HDA_NEEDS_RESUME
+#define ALC_MAX_PINS    16
+        unsigned int num_pins;
+        hda_nid_t pin_nids[ALC_MAX_PINS];
+        unsigned int pin_cfgs[ALC_MAX_PINS];
+#endif
 };
 /*
@@ -822,6 +829,27 @@ static void alc_sku_automute(struct hda_codec *codec)
                            spec->jack_present ? 0 : PIN_OUT);
 }
+static void alc_mic_automute(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int present;
+        unsigned int mic_nid = spec->autocfg.input_pins[AUTO_PIN_MIC];
+        unsigned int fmic_nid = spec->autocfg.input_pins[AUTO_PIN_FRONT_MIC];
+        unsigned int mix_nid = spec->capsrc_nids[0];
+        unsigned int capsrc_idx_mic, capsrc_idx_fmic;
+        capsrc_idx_mic = mic_nid - 0x18;
+        capsrc_idx_fmic = fmic_nid - 0x18;
+        present = snd_hda_codec_read(codec, mic_nid, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        snd_hda_codec_write(codec, mix_nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                    0x7000 | (capsrc_idx_mic << 8) | (present ? 0 : 0x80));
+        snd_hda_codec_write(codec, mix_nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                    0x7000 | (capsrc_idx_fmic << 8) | (present ? 0x80 : 0));
+        snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, capsrc_idx_fmic,
+                         HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+}
 /* unsolicited event for HP jack sensing */
 static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
 {
@@ -829,10 +857,17 @@ static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
                res >>= 28;
        else
                res >>= 26;
-        if (res != ALC880_HP_EVENT)
+        if (res == ALC880_HP_EVENT)
-                return;
+                alc_sku_automute(codec);
+        if (res == ALC880_MIC_EVENT)
+                alc_mic_automute(codec);
+}
+static void alc_inithook(struct hda_codec *codec)
+{
        alc_sku_automute(codec);
+        alc_mic_automute(codec);
 }
 /* additional initialization for ALC888 variants */
@@ -1018,10 +1053,17 @@ do_sku:
                else
                        return;
        }
+        if (spec->autocfg.hp_pins[0])
-        snd_hda_codec_write(codec, spec->autocfg.hp_pins[0], 0,
+                snd_hda_codec_write(codec, spec->autocfg.hp_pins[0], 0,
-                            AC_VERB_SET_UNSOLICITED_ENABLE,
+                        AC_VERB_SET_UNSOLICITED_ENABLE,
-                            AC_USRSP_EN | ALC880_HP_EVENT);
+                        AC_USRSP_EN | ALC880_HP_EVENT);
+        if (spec->autocfg.input_pins[AUTO_PIN_MIC] &&
+                spec->autocfg.input_pins[AUTO_PIN_FRONT_MIC])
+                snd_hda_codec_write(codec,
+                        spec->autocfg.input_pins[AUTO_PIN_MIC], 0,
+                        AC_VERB_SET_UNSOLICITED_ENABLE,
+                        AC_USRSP_EN | ALC880_MIC_EVENT);
        spec->unsol_event = alc_sku_unsol_event;
 }
@@ -2743,6 +2785,64 @@ static void alc_free(struct hda_codec *codec)
        codec->spec = NULL; /* to be sure */
 }
+#ifdef SND_HDA_NEEDS_RESUME
+static void store_pin_configs(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t nid, end_nid;
+        end_nid = codec->start_nid + codec->num_nodes;
+        for (nid = codec->start_nid; nid < end_nid; nid++) {
+                unsigned int wid_caps = get_wcaps(codec, nid);
+                unsigned int wid_type =
+                        (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+                if (wid_type != AC_WID_PIN)
+                        continue;
+                if (spec->num_pins >= ARRAY_SIZE(spec->pin_nids))
+                        break;
+                spec->pin_nids[spec->num_pins] = nid;
+                spec->pin_cfgs[spec->num_pins] =
+                        snd_hda_codec_read(codec, nid, 0,
+                                           AC_VERB_GET_CONFIG_DEFAULT, 0);
+                spec->num_pins++;
+        }
+}
+static void resume_pin_configs(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+        for (i = 0; i < spec->num_pins; i++) {
+                hda_nid_t pin_nid = spec->pin_nids[i];
+                unsigned int pin_config = spec->pin_cfgs[i];
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_0,
+                                    pin_config & 0x000000ff);
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_1,
+                                    (pin_config & 0x0000ff00) >> 8);
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_2,
+                                    (pin_config & 0x00ff0000) >> 16);
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3,
+                                    pin_config >> 24);
+        }
+}
+static int alc_resume(struct hda_codec *codec)
+{
+        resume_pin_configs(codec);
+        codec->patch_ops.init(codec);
+        snd_hda_codec_resume_amp(codec);
+        snd_hda_codec_resume_cache(codec);
+        return 0;
+}
+#else
+#define store_pin_configs(codec)
+#endif
 /*
 */
 static struct hda_codec_ops alc_patch_ops = {
@@ -2751,6 +2851,9 @@ static struct hda_codec_ops alc_patch_ops = {
        .init = alc_init,
        .free = alc_free,
        .unsol_event = alc_unsol_event,
+#ifdef SND_HDA_NEEDS_RESUME
+        .resume = alc_resume,
+#endif
 #ifdef CONFIG_SND_HDA_POWER_SAVE
        .check_power_status = alc_check_power_status,
 #endif
@@ -3797,6 +3900,7 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
        spec->num_mux_defs = 1;
        spec->input_mux = &spec->private_imux;
+        store_pin_configs(codec);
        return 1;
 }
@@ -3808,7 +3912,7 @@ static void alc880_auto_init(struct hda_codec *codec)
        alc880_auto_init_extra_out(codec);
        alc880_auto_init_analog_input(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 /*
@@ -4961,7 +5065,7 @@ static struct hda_verb alc260_test_init_verbs[] = {
 */
 static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,
-                                        const char *pfx)
+                                        const char *pfx, int *vol_bits)
 {
        hda_nid_t nid_vol;
        unsigned long vol_val, sw_val;
@@ -4983,10 +5087,14 @@ static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,
        } else
                return 0; /* N/A */
-        snprintf(name, sizeof(name), "%s Playback Volume", pfx);
+        if (!(*vol_bits & (1 << nid_vol))) {
-        err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val);
+                /* first control for the volume widget */
-        if (err < 0)
+                snprintf(name, sizeof(name), "%s Playback Volume", pfx);
-                return err;
+                err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val);
+                if (err < 0)
+                        return err;
+                *vol_bits |= (1 << nid_vol);
+        }
        snprintf(name, sizeof(name), "%s Playback Switch", pfx);
        err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val);
        if (err < 0)
@@ -5000,6 +5108,7 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
 {
        hda_nid_t nid;
        int err;
+        int vols = 0;
        spec->multiout.num_dacs = 1;
        spec->multiout.dac_nids = spec->private_dac_nids;
@@ -5007,21 +5116,22 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
        nid = cfg->line_out_pins[0];
        if (nid) {
-                err = alc260_add_playback_controls(spec, nid, "Front");
+                err = alc260_add_playback_controls(spec, nid, "Front", &vols);
                if (err < 0)
                        return err;
        }
        nid = cfg->speaker_pins[0];
        if (nid) {
-                err = alc260_add_playback_controls(spec, nid, "Speaker");
+                err = alc260_add_playback_controls(spec, nid, "Speaker", &vols);
                if (err < 0)
                        return err;
        }
        nid = cfg->hp_pins[0];
        if (nid) {
-                err = alc260_add_playback_controls(spec, nid, "Headphone");
+                err = alc260_add_playback_controls(spec, nid, "Headphone",
+                                                   &vols);
                if (err < 0)
                        return err;
        }
@@ -5209,6 +5319,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
        }
        spec->num_mixers++;
+        store_pin_configs(codec);
        return 1;
 }
@@ -5219,7 +5330,7 @@ static void alc260_auto_init(struct hda_codec *codec)
        alc260_auto_init_multi_out(codec);
        alc260_auto_init_analog_input(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 #ifdef CONFIG_SND_HDA_POWER_SAVE
@@ -6629,7 +6740,7 @@ static void alc882_auto_init(struct hda_codec *codec)
        alc882_auto_init_analog_input(codec);
        alc882_auto_init_input_src(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 static int patch_alc883(struct hda_codec *codec); /* called in patch_alc882() */
@@ -8306,8 +8417,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
        SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),
        SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
        SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
+        SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V),
        SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x1043, 0x8317, "Asus M90V", ALC888_ASUS_M90V),
        SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),
        SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),
        SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG),
@@ -8758,7 +8869,7 @@ static void alc883_auto_init(struct hda_codec *codec)
        alc883_auto_init_analog_input(codec);
        alc883_auto_init_input_src(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 static int patch_alc883(struct hda_codec *codec)
@@ -8802,8 +8913,13 @@ static int patch_alc883(struct hda_codec *codec)
        switch (codec->vendor_id) {
        case 0x10ec0888:
-                spec->stream_name_analog = "ALC888 Analog";
+                if (codec->revision_id == 0x100101) {
-                spec->stream_name_digital = "ALC888 Digital";
+                        spec->stream_name_analog = "ALC1200 Analog";
+                        spec->stream_name_digital = "ALC1200 Digital";
+                } else {
+                        spec->stream_name_analog = "ALC888 Analog";
+                        spec->stream_name_digital = "ALC888 Digital";
+                }
                break;
        case 0x10ec0889:
                spec->stream_name_analog = "ALC889 Analog";
@@ -10267,6 +10383,7 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
        if (err < 0)
                return err;
+        store_pin_configs(codec);
        return 1;
 }
@@ -10285,7 +10402,7 @@ static void alc262_auto_init(struct hda_codec *codec)
        alc262_auto_init_analog_input(codec);
        alc262_auto_init_input_src(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 /*
@@ -10343,7 +10460,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {
        SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD),
        SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
                      ALC262_TOSHIBA_RX1),
-        SND_PCI_QUIRK(0x1179, 0x0268, "Toshiba S06", ALC262_TOSHIBA_S06),
+        SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),
        SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),
        SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
        SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
@@ -11401,6 +11518,7 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
        if (err < 0)
                return err;
+        store_pin_configs(codec);
        return 1;
 }
@@ -11417,7 +11535,7 @@ static void alc268_auto_init(struct hda_codec *codec)
        alc268_auto_init_mono_speaker_out(codec);
        alc268_auto_init_analog_input(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 /*
@@ -12184,6 +12302,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
        spec->mixers[spec->num_mixers] = alc269_capture_mixer;
        spec->num_mixers++;
+        store_pin_configs(codec);
        return 1;
 }
@@ -12200,7 +12319,7 @@ static void alc269_auto_init(struct hda_codec *codec)
        alc269_auto_init_hp_out(codec);
        alc269_auto_init_analog_input(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 /*
@@ -13270,6 +13389,7 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
        spec->mixers[spec->num_mixers] = alc861_capture_mixer;
        spec->num_mixers++;
+        store_pin_configs(codec);
        return 1;
 }
@@ -13281,7 +13401,7 @@ static void alc861_auto_init(struct hda_codec *codec)
        alc861_auto_init_hp_out(codec);
        alc861_auto_init_analog_input(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 #ifdef CONFIG_SND_HDA_POWER_SAVE
@@ -14381,6 +14501,7 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
        if (err < 0)
                return err;
+        store_pin_configs(codec);
        return 1;
 }
@@ -14393,7 +14514,7 @@ static void alc861vd_auto_init(struct hda_codec *codec)
        alc861vd_auto_init_analog_input(codec);
        alc861vd_auto_init_input_src(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 static int patch_alc861vd(struct hda_codec *codec)
@@ -15667,7 +15788,7 @@ static const char *alc662_models[ALC662_MODEL_LAST] = {
 static struct snd_pci_quirk alc662_cfg_tbl[] = {
        SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M51VA", ALC663_ASUS_M51VA),
-        SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS M51VA", ALC663_ASUS_G50V),
+        SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS G50V", ALC663_ASUS_G50V),
        SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG),
        SND_PCI_QUIRK(0x1043, 0x82a1, "ASUS Eeepc", ALC662_ASUS_EEEPC_P701),
        SND_PCI_QUIRK(0x1043, 0x82d1, "ASUS Eeepc EP20", ALC662_ASUS_EEEPC_EP20),
@@ -15680,6 +15801,7 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {
        SND_PCI_QUIRK(0x1043, 0x11d3, "ASUS NB", ALC663_ASUS_MODE1),
        SND_PCI_QUIRK(0x1043, 0x1203, "ASUS NB", ALC663_ASUS_MODE1),
        SND_PCI_QUIRK(0x1043, 0x19e3, "ASUS NB", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x1993, "ASUS N20", ALC663_ASUS_MODE1),
        SND_PCI_QUIRK(0x1043, 0x19c3, "ASUS F5Z/F6x", ALC662_ASUS_MODE2),
        SND_PCI_QUIRK(0x1043, 0x1339, "ASUS NB", ALC662_ASUS_MODE2),
        SND_PCI_QUIRK(0x1043, 0x1913, "ASUS NB", ALC662_ASUS_MODE2),
@@ -16211,6 +16333,8 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
        spec->mixers[spec->num_mixers] = alc662_capture_mixer;
        spec->num_mixers++;
+        store_pin_configs(codec);
        return 1;
 }
@@ -16223,7 +16347,7 @@ static void alc662_auto_init(struct hda_codec *codec)
        alc662_auto_init_analog_input(codec);
        alc662_auto_init_input_src(codec);
        if (spec->unsol_event)
-                alc_sku_automute(codec);
+                alc_inithook(codec);
 }
 static int patch_alc662(struct hda_codec *codec)
@@ -16268,6 +16392,9 @@ static int patch_alc662(struct hda_codec *codec)
        if (codec->vendor_id == 0x10ec0663) {
                spec->stream_name_analog = "ALC663 Analog";
                spec->stream_name_digital = "ALC663 Digital";
+        } else if (codec->vendor_id == 0x10ec0272) {
+                spec->stream_name_analog = "ALC272 Analog";
+                spec->stream_name_digital = "ALC272 Digital";
        } else {
                spec->stream_name_analog = "ALC662 Analog";
                spec->stream_name_digital = "ALC662 Digital";
@@ -16305,6 +16432,7 @@ struct hda_codec_preset snd_hda_preset_realtek[] = {
        { .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 },
        { .id = 0x10ec0268, .name = "ALC268", .patch = patch_alc268 },
        { .id = 0x10ec0269, .name = "ALC269", .patch = patch_alc269 },
+        { .id = 0x10ec0272, .name = "ALC272", .patch = patch_alc662 },
        { .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",
          .patch = patch_alc861 },
        { .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },
@@ -16323,7 +16451,10 @@ struct hda_codec_preset snd_hda_preset_realtek[] = {
        { .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A",
          .patch = patch_alc882 }, /* should be patch_alc883() in future */
        { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
+        { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc883 },
        { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },
+        { .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",
+          .patch = patch_alc883 },
        { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 },
        {} /* terminator */
 };
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index c461baa83c2a..df9b0bc7f878 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -322,8 +322,8 @@ static hda_nid_t stac92hd71bxx_mux_nids[2] = {
        0x1a, 0x1b
 };
-static hda_nid_t stac92hd71bxx_dmux_nids[1] = {
+static hda_nid_t stac92hd71bxx_dmux_nids[2] = {
-        0x1c,
+        0x1c, 0x1d,
 };
 static hda_nid_t stac92hd71bxx_smux_nids[2] = {
@@ -566,10 +566,8 @@ static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol,
                        nid = codec->slave_dig_outs[smux_idx - 1];
                if (spec->cur_smux[smux_idx] == smux->num_items - 1)
                        val = AMP_OUT_MUTE;
-                if (smux_idx == 0)
-                        nid = spec->multiout.dig_out_nid;
                else
-                        nid = codec->slave_dig_outs[smux_idx - 1];
+                        val = AMP_OUT_UNMUTE;
                /* un/mute SPDIF out */
                snd_hda_codec_write_cache(codec, nid, 0,
                        AC_VERB_SET_AMP_GAIN_MUTE, val);
@@ -861,20 +859,18 @@ static struct hda_verb stac92hd71bxx_core_init[] = {
        { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
        /* connect headphone jack to dac1 */
        { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
-        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */
        /* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */
        { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
        { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
        { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 };
-#define HD_DISABLE_PORTF 3
+#define HD_DISABLE_PORTF 2
 static struct hda_verb stac92hd71bxx_analog_core_init[] = {
        /* start of config #1 */
        /* connect port 0f to audio mixer */
        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2},
-        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */
        /* unmute right and left channels for node 0x0f */
        { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
        /* start of config #2 */
@@ -883,10 +879,6 @@ static struct hda_verb stac92hd71bxx_analog_core_init[] = {
        { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
        /* connect headphone jack to dac1 */
        { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
-        /* connect port 0d to audio mixer */
-        { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x2},
-        /* unmute dac0 input in audio mixer */
-        { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0x701f},
        /* unmute right and left channels for nodes 0x0a, 0xd */
        { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
        { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -1107,6 +1099,7 @@ static struct snd_kcontrol_new stac92hd83xxx_mixer[] = {
 static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = {
        STAC_INPUT_SOURCE(2),
+        STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2),
        HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT),
        HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT),
@@ -1119,8 +1112,17 @@ static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = {
        HDA_CODEC_MUTE("PC Beep Switch", 0x17, 0x2, HDA_INPUT),
        */
-        HDA_CODEC_MUTE("Analog Loopback 1", 0x17, 0x3, HDA_INPUT),
+        HDA_CODEC_MUTE("Import0 Mux Capture Switch", 0x17, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Analog Loopback 2", 0x17, 0x4, HDA_INPUT),
+        HDA_CODEC_VOLUME("Import0 Mux Capture Volume", 0x17, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Import1 Mux Capture Switch", 0x17, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Import1 Mux Capture Volume", 0x17, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("DAC0 Capture Switch", 0x17, 0x3, HDA_INPUT),
+        HDA_CODEC_VOLUME("DAC0 Capture Volume", 0x17, 0x3, HDA_INPUT),
+        HDA_CODEC_MUTE("DAC1 Capture Switch", 0x17, 0x4, HDA_INPUT),
+        HDA_CODEC_VOLUME("DAC1 Capture Volume", 0x17, 0x4, HDA_INPUT),
        { } /* end */
 };
@@ -1278,7 +1280,7 @@ static int stac92xx_build_controls(struct hda_codec *codec)
                        return err;
                spec->multiout.share_spdif = 1;
        }
-        if (spec->dig_in_nid && (!spec->gpio_dir & 0x01)) {
+        if (spec->dig_in_nid && !(spec->gpio_dir & 0x01)) {
                err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
                if (err < 0)
                        return err;
@@ -1649,7 +1651,7 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
 static unsigned int ref92hd71bxx_pin_configs[11] = {
        0x02214030, 0x02a19040, 0x01a19020, 0x01014010,
-        0x0181302e, 0x01114010, 0x01019020, 0x90a000f0,
+        0x0181302e, 0x01014010, 0x01019020, 0x90a000f0,
        0x90a000f0, 0x01452050, 0x01452050,
 };
@@ -2812,7 +2814,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
        static const char *chname[4] = {
                "Front", "Surround", NULL /*CLFE*/, "Side"
        };
-        hda_nid_t nid;
+        hda_nid_t nid = 0;
        int i, err;
        struct sigmatel_spec *spec = codec->spec;
@@ -3000,7 +3002,7 @@ static int stac92xx_auto_create_mono_output_ctls(struct hda_codec *codec)
 /* labels for amp mux outputs */
 static const char *stac92xx_amp_labels[3] = {
-        "Front Microphone", "Microphone", "Line In"
+        "Front Microphone", "Microphone", "Line In",
 };
 /* create amp out controls mux on capable codecs */
@@ -4327,6 +4329,16 @@ static struct hda_codec_ops stac92hd71bxx_patch_ops = {
 #endif
 };
+static struct hda_input_mux stac92hd71bxx_dmux = {
+        .num_items = 4,
+        .items = {
+                { "Analog Inputs", 0x00 },
+                { "Mixer", 0x01 },
+                { "Digital Mic 1", 0x02 },
+                { "Digital Mic 2", 0x03 },
+        }
+};
 static int patch_stac92hd71bxx(struct hda_codec *codec)
 {
        struct sigmatel_spec *spec;
@@ -4341,6 +4353,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
        spec->num_pins = ARRAY_SIZE(stac92hd71bxx_pin_nids);
        spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids);
        spec->pin_nids = stac92hd71bxx_pin_nids;
+        memcpy(&spec->private_dimux, &stac92hd71bxx_dmux,
+                        sizeof(stac92hd71bxx_dmux));
        spec->board_config = snd_hda_check_board_config(codec,
                                                        STAC_92HD71BXX_MODELS,
                                                        stac92hd71bxx_models,
@@ -4392,6 +4406,7 @@ again:
                /* no output amps */
                spec->num_pwrs = 0;
                spec->mixer = stac92hd71bxx_analog_mixer;
+                spec->dinput_mux = &spec->private_dimux;
                /* disable VSW */
                spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF];
@@ -4409,12 +4424,13 @@ again:
                spec->num_pwrs = 0;
                /* fallthru */
        default:
+                spec->dinput_mux = &spec->private_dimux;
                spec->mixer = stac92hd71bxx_analog_mixer;
                spec->init = stac92hd71bxx_analog_core_init;
                codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
        }
-        spec->aloopback_mask = 0x20;
+        spec->aloopback_mask = 0x50;
        spec->aloopback_shift = 0;
        if (spec->board_config > STAC_92HD71BXX_REF) {
@@ -4456,6 +4472,10 @@ again:
        spec->multiout.num_dacs = 1;
        spec->multiout.hp_nid = 0x11;
        spec->multiout.dac_nids = stac92hd71bxx_dac_nids;
+        if (spec->dinput_mux)
+                spec->private_dimux.num_items +=
+                        spec->num_dmics -
+                                (ARRAY_SIZE(stac92hd71bxx_dmic_nids) - 1);
        err = stac92xx_parse_auto_config(codec, 0x21, 0x23);
        if (!err) {
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 5b442383fcda..58d7cda03de5 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2688,12 +2688,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                return err;
        }
-        if (ice_has_con_ac97(ice))
+        if (ice_has_con_ac97(ice)) {
                err = snd_ice1712_pcm(ice, pcm_dev++, NULL);
                if (err < 0) {
                        snd_card_free(card);
                        return err;
                }
+        }
        err = snd_ice1712_ac97_mixer(ice);
        if (err < 0) {
@@ -2715,12 +2716,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                }
        }
-        if (ice_has_con_ac97(ice))
+        if (ice_has_con_ac97(ice)) {
                err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL);
                if (err < 0) {
                        snd_card_free(card);
                        return err;
                }
+        }
        if (!c->no_mpu401) {
                err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index c88d1eace1c4..19d3391e229f 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2702,6 +2702,7 @@ static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = {
        SND_PCI_QUIRK(0x0e11, 0x008a, "AD1885", 41000),
        SND_PCI_QUIRK(0x1028, 0x00be, "AD1885", 44100),
        SND_PCI_QUIRK(0x1028, 0x0177, "AD1980", 48000),
+        SND_PCI_QUIRK(0x1028, 0x01ad, "AD1981B", 48000),
        SND_PCI_QUIRK(0x1043, 0x80f3, "AD1985", 48000),
        { }     /* terminator */
 };
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 2d0dce649a64..ae7601f353a7 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1314,8 +1314,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
        }
        for (i = 0; i < 2; i++) {
                mgr->mem[i].phys = pci_resource_start(pci, i);
-                mgr->mem[i].virt = ioremap_nocache(mgr->mem[i].phys,
+                mgr->mem[i].virt = pci_ioremap_bar(pci, i);
-                                                   pci_resource_len(pci, i));
                if (!mgr->mem[i].virt) {
                        printk(KERN_ERR "unable to remap resource 0x%lx\n",
                               mgr->mem[i].phys);
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 20d0e328288a..8f9e3859c37c 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -666,6 +666,7 @@ static int snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
        card->avs.avs_audio_width = PS3AV_CMD_AUDIO_WORD_BITS_16;
        card->avs.avs_audio_format = PS3AV_CMD_AUDIO_FORMAT_PCM;
        card->avs.avs_audio_source = PS3AV_CMD_AUDIO_SOURCE_SERIAL;
+        memcpy(card->avs.avs_cs_info, ps3av_mode_cs_info, 8);
        ret = snd_ps3_change_avsetting(card);
@@ -685,6 +686,7 @@ static int snd_ps3_set_avsetting(struct snd_pcm_substream *substream)
 {
        struct snd_ps3_card_info *card = snd_pcm_substream_chip(substream);
        struct snd_ps3_avsetting_info avs;
+        int ret;
        avs = card->avs;
@@ -729,19 +731,92 @@ static int snd_ps3_set_avsetting(struct snd_pcm_substream *substream)
                return 1;
        }
-        if ((card->avs.avs_audio_width != avs.avs_audio_width) ||
+        memcpy(avs.avs_cs_info, ps3av_mode_cs_info, 8);
-            (card->avs.avs_audio_rate != avs.avs_audio_rate)) {
-                card->avs = avs;
-                snd_ps3_change_avsetting(card);
+        if (memcmp(&card->avs, &avs, sizeof(avs))) {
                pr_debug("%s: after freq=%d width=%d\n", __func__,
                         card->avs.avs_audio_rate, card->avs.avs_audio_width);
-                return 0;
+                card->avs = avs;
+                snd_ps3_change_avsetting(card);
+                ret = 0;
        } else
+                ret = 1;
+        /* check CS non-audio bit and mute accordingly */
+        if (avs.avs_cs_info[0] & 0x02)
+                ps3av_audio_mute_analog(1); /* mute if non-audio */
+        else
+                ps3av_audio_mute_analog(0);
+        return ret;
+}
+/*
+ * SPDIF status bits controls
+ */
+static int snd_ps3_spdif_mask_info(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
+        uinfo->count = 1;
+        return 0;
+}
+/* FIXME: ps3av_set_audio_mode() assumes only consumer mode */
+static int snd_ps3_spdif_cmask_get(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_value *ucontrol)
+{
+        memset(ucontrol->value.iec958.status, 0xff, 8);
+        return 0;
+}
+static int snd_ps3_spdif_pmask_get(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_value *ucontrol)
+{
+        return 0;
+}
+static int snd_ps3_spdif_default_get(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+        memcpy(ucontrol->value.iec958.status, ps3av_mode_cs_info, 8);
+        return 0;
+}
+static int snd_ps3_spdif_default_put(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+        if (memcmp(ps3av_mode_cs_info, ucontrol->value.iec958.status, 8)) {
+                memcpy(ps3av_mode_cs_info, ucontrol->value.iec958.status, 8);
                return 1;
+        }
+        return 0;
 }
+static struct snd_kcontrol_new spdif_ctls[] = {
+        {
+                .access = SNDRV_CTL_ELEM_ACCESS_READ,
+                .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+                .info = snd_ps3_spdif_mask_info,
+                .get = snd_ps3_spdif_cmask_get,
+        },
+        {
+                .access = SNDRV_CTL_ELEM_ACCESS_READ,
+                .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+                .info = snd_ps3_spdif_mask_info,
+                .get = snd_ps3_spdif_pmask_get,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+                .info = snd_ps3_spdif_mask_info,
+                .get = snd_ps3_spdif_default_get,
+                .put = snd_ps3_spdif_default_put,
+        },
+};
 static int snd_ps3_map_mmio(void)
@@ -842,7 +917,7 @@ static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
 static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
 {
-        int ret;
+        int i, ret;
        u64 lpar_addr, lpar_size;
        BUG_ON(!firmware_has_feature(FW_FEATURE_PS3_LV1));
@@ -903,6 +978,15 @@ static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
        strcpy(the_card.card->driver, "PS3");
        strcpy(the_card.card->shortname, "PS3");
        strcpy(the_card.card->longname, "PS3 sound");
+        /* create control elements */
+        for (i = 0; i < ARRAY_SIZE(spdif_ctls); i++) {
+                ret = snd_ctl_add(the_card.card,
+                                  snd_ctl_new1(&spdif_ctls[i], &the_card));
+                if (ret < 0)
+                        goto clean_card;
+        }
        /* create PCM devices instance */
        /* NOTE:this driver works assuming pcm:substream = 1:1 */
        ret = snd_pcm_new(the_card.card,
diff --git a/sound/ppc/snd_ps3.h b/sound/ppc/snd_ps3.h
index 4b7e6fbbe500..326fb29e82d8 100644
--- a/sound/ppc/snd_ps3.h
+++ b/sound/ppc/snd_ps3.h
@@ -51,6 +51,7 @@ struct snd_ps3_avsetting_info {
        uint32_t avs_audio_width;
        uint32_t avs_audio_format; /* fixed */
        uint32_t avs_audio_source; /* fixed */
+        unsigned char avs_cs_info[8];
 };
 /*
 * PS3 audio 'card' instance
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index dd7fa0b329c7..2718eaf7895f 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -18,13 +18,13 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <asm/mach-types.h>
-#include <asm/hardware/scoop.h>
 #include <mach/pxa-regs.h>
 #include <mach/hardware.h>
 #include <mach/corgi.h>
@@ -54,8 +54,8 @@ static void corgi_ext_control(struct snd_soc_codec *codec)
        switch (corgi_jack_func) {
        case CORGI_HP:
                /* set = unmute headphone */
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
+                gpio_set_value(CORGI_GPIO_MUTE_L, 1);
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+                gpio_set_value(CORGI_GPIO_MUTE_R, 1);
                snd_soc_dapm_disable_pin(codec, "Mic Jack");
                snd_soc_dapm_disable_pin(codec, "Line Jack");
                snd_soc_dapm_enable_pin(codec, "Headphone Jack");
@@ -63,24 +63,24 @@ static void corgi_ext_control(struct snd_soc_codec *codec)
                break;
        case CORGI_MIC:
                /* reset = mute headphone */
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
+                gpio_set_value(CORGI_GPIO_MUTE_L, 0);
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+                gpio_set_value(CORGI_GPIO_MUTE_R, 0);
                snd_soc_dapm_enable_pin(codec, "Mic Jack");
                snd_soc_dapm_disable_pin(codec, "Line Jack");
                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
                snd_soc_dapm_disable_pin(codec, "Headset Jack");
                break;
        case CORGI_LINE:
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
+                gpio_set_value(CORGI_GPIO_MUTE_L, 0);
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+                gpio_set_value(CORGI_GPIO_MUTE_R, 0);
                snd_soc_dapm_disable_pin(codec, "Mic Jack");
                snd_soc_dapm_enable_pin(codec, "Line Jack");
                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
                snd_soc_dapm_disable_pin(codec, "Headset Jack");
                break;
        case CORGI_HEADSET:
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
+                gpio_set_value(CORGI_GPIO_MUTE_L, 0);
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+                gpio_set_value(CORGI_GPIO_MUTE_R, 1);
                snd_soc_dapm_enable_pin(codec, "Mic Jack");
                snd_soc_dapm_disable_pin(codec, "Line Jack");
                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
@@ -114,8 +114,8 @@ static int corgi_shutdown(struct snd_pcm_substream *substream)
        struct snd_soc_codec *codec = rtd->socdev->codec;
        /* set = unmute headphone */
-        set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
+        gpio_set_value(CORGI_GPIO_MUTE_L, 1);
-        set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+        gpio_set_value(CORGI_GPIO_MUTE_R, 1);
        return 0;
 }
@@ -218,22 +218,14 @@ static int corgi_set_spk(struct snd_kcontrol *kcontrol,
 static int corgi_amp_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *k, int event)
 {
-        if (SND_SOC_DAPM_EVENT_ON(event))
+        gpio_set_value(CORGI_GPIO_APM_ON, SND_SOC_DAPM_EVENT_ON(event));
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);
-        else
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);
        return 0;
 }
 static int corgi_mic_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *k, int event)
 {
-        if (SND_SOC_DAPM_EVENT_ON(event))
+        gpio_set_value(CORGI_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event));
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MIC_BIAS);
-        else
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MIC_BIAS);
        return 0;
 }
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index a80ae074b090..a7a3a9c5c6ff 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -49,7 +49,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
        .name                   = "AC97 PCM Stereo out",
        .dev_addr               = __PREG(PCDR),
-        .drcmr                  = &DRCMRTXPCDR,
+        .drcmr                  = &DRCMR(12),
        .dcmd                   = DCMD_INCSRCADDR | DCMD_FLOWTRG |
                                  DCMD_BURST32 | DCMD_WIDTH4,
 };
@@ -57,7 +57,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_in = {
        .name                   = "AC97 PCM Stereo in",
        .dev_addr               = __PREG(PCDR),
-        .drcmr                  = &DRCMRRXPCDR,
+        .drcmr                  = &DRCMR(11),
        .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                  DCMD_BURST32 | DCMD_WIDTH4,
 };
@@ -65,7 +65,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_in = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_out = {
        .name                   = "AC97 Aux PCM (Slot 5) Mono out",
        .dev_addr               = __PREG(MODR),
-        .drcmr                  = &DRCMRTXMODR,
+        .drcmr                  = &DRCMR(10),
        .dcmd                   = DCMD_INCSRCADDR | DCMD_FLOWTRG |
                                  DCMD_BURST16 | DCMD_WIDTH2,
 };
@@ -73,7 +73,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_out = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_in = {
        .name                   = "AC97 Aux PCM (Slot 5) Mono in",
        .dev_addr               = __PREG(MODR),
-        .drcmr                  = &DRCMRRXMODR,
+        .drcmr                  = &DRCMR(9),
        .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                  DCMD_BURST16 | DCMD_WIDTH2,
 };
@@ -81,7 +81,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_in = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_mic_mono_in = {
        .name                   = "AC97 Mic PCM (Slot 6) Mono in",
        .dev_addr               = __PREG(MCDR),
-        .drcmr                  = &DRCMRRXMCDR,
+        .drcmr                  = &DRCMR(8),
        .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                  DCMD_BURST16 | DCMD_WIDTH2,
 };
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 64057b1d220d..e758034db5c3 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -39,6 +39,45 @@ struct pxa2xx_gpio {
        u32 frm;
 };
+/*
+ * I2S Controller Register and Bit Definitions
+ */
+#define SACR0           __REG(0x40400000)  /* Global Control Register */
+#define SACR1           __REG(0x40400004)  /* Serial Audio I 2 S/MSB-Justified Control Register */
+#define SASR0           __REG(0x4040000C)  /* Serial Audio I 2 S/MSB-Justified Interface and FIFO Status Register */
+#define SAIMR           __REG(0x40400014)  /* Serial Audio Interrupt Mask Register */
+#define SAICR           __REG(0x40400018)  /* Serial Audio Interrupt Clear Register */
+#define SADIV           __REG(0x40400060)  /* Audio Clock Divider Register. */
+#define SADR            __REG(0x40400080)  /* Serial Audio Data Register (TX and RX FIFO access Register). */
+#define SACR0_RFTH(x)   ((x) << 12)     /* Rx FIFO Interrupt or DMA Trigger Threshold */
+#define SACR0_TFTH(x)   ((x) << 8)      /* Tx FIFO Interrupt or DMA Trigger Threshold */
+#define SACR0_STRF      (1 << 5)        /* FIFO Select for EFWR Special Function */
+#define SACR0_EFWR      (1 << 4)        /* Enable EFWR Function  */
+#define SACR0_RST       (1 << 3)        /* FIFO, i2s Register Reset */
+#define SACR0_BCKD      (1 << 2)        /* Bit Clock Direction */
+#define SACR0_ENB       (1 << 0)        /* Enable I2S Link */
+#define SACR1_ENLBF     (1 << 5)        /* Enable Loopback */
+#define SACR1_DRPL      (1 << 4)        /* Disable Replaying Function */
+#define SACR1_DREC      (1 << 3)        /* Disable Recording Function */
+#define SACR1_AMSL      (1 << 0)        /* Specify Alternate Mode */
+#define SASR0_I2SOFF    (1 << 7)        /* Controller Status */
+#define SASR0_ROR       (1 << 6)        /* Rx FIFO Overrun */
+#define SASR0_TUR       (1 << 5)        /* Tx FIFO Underrun */
+#define SASR0_RFS       (1 << 4)        /* Rx FIFO Service Request */
+#define SASR0_TFS       (1 << 3)        /* Tx FIFO Service Request */
+#define SASR0_BSY       (1 << 2)        /* I2S Busy */
+#define SASR0_RNE       (1 << 1)        /* Rx FIFO Not Empty */
+#define SASR0_TNF       (1 << 0)        /* Tx FIFO Not Empty */
+#define SAICR_ROR       (1 << 6)        /* Clear Rx FIFO Overrun Interrupt */
+#define SAICR_TUR       (1 << 5)        /* Clear Tx FIFO Underrun Interrupt */
+#define SAIMR_ROR       (1 << 6)        /* Enable Rx FIFO Overrun Condition Interrupt */
+#define SAIMR_TUR       (1 << 5)        /* Enable Tx FIFO Underrun Condition Interrupt */
+#define SAIMR_RFS       (1 << 4)        /* Enable Rx FIFO Service Interrupt */
+#define SAIMR_TFS       (1 << 3)        /* Enable Tx FIFO Service Interrupt */
 struct pxa_i2s_port {
        u32 sadiv;
@@ -54,7 +93,7 @@ static struct clk *clk_i2s;
 static struct pxa2xx_pcm_dma_params pxa2xx_i2s_pcm_stereo_out = {
        .name                   = "I2S PCM Stereo out",
        .dev_addr               = __PREG(SADR),
-        .drcmr                  = &DRCMRTXSADR,
+        .drcmr                  = &DRCMR(3),
        .dcmd                   = DCMD_INCSRCADDR | DCMD_FLOWTRG |
                                  DCMD_BURST32 | DCMD_WIDTH4,
 };
@@ -62,7 +101,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_i2s_pcm_stereo_out = {
 static struct pxa2xx_pcm_dma_params pxa2xx_i2s_pcm_stereo_in = {
        .name                   = "I2S PCM Stereo in",
        .dev_addr               = __PREG(SADR),
-        .drcmr                  = &DRCMRRXSADR,
+        .drcmr                  = &DRCMR(2),
        .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                  DCMD_BURST32 | DCMD_WIDTH4,
 };
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 8f89188e541e..d307b6757e95 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -19,16 +19,15 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <asm/mach-types.h>
-#include <asm/hardware/scoop.h>
 #include <mach/pxa-regs.h>
 #include <mach/hardware.h>
-#include <mach/akita.h>
 #include <mach/spitz.h>
 #include "../codecs/wm8750.h"
 #include "pxa2xx-pcm.h"
@@ -63,8 +62,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                snd_soc_dapm_disable_pin(codec, "Mic Jack");
                snd_soc_dapm_disable_pin(codec, "Line Jack");
                snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 1);
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                break;
        case SPITZ_MIC:
                /* enable mic jack and bias, mute hp */
@@ -72,8 +71,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                snd_soc_dapm_disable_pin(codec, "Headset Jack");
                snd_soc_dapm_disable_pin(codec, "Line Jack");
                snd_soc_dapm_enable_pin(codec, "Mic Jack");
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                break;
        case SPITZ_LINE:
                /* enable line jack, disable mic bias and mute hp */
@@ -81,8 +80,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                snd_soc_dapm_disable_pin(codec, "Headset Jack");
                snd_soc_dapm_disable_pin(codec, "Mic Jack");
                snd_soc_dapm_enable_pin(codec, "Line Jack");
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                break;
        case SPITZ_HEADSET:
                /* enable and unmute headset jack enable mic bias, mute L hp */
@@ -90,8 +89,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                snd_soc_dapm_enable_pin(codec, "Mic Jack");
                snd_soc_dapm_disable_pin(codec, "Line Jack");
                snd_soc_dapm_enable_pin(codec, "Headset Jack");
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                break;
        case SPITZ_HP_OFF:
@@ -100,8 +99,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                snd_soc_dapm_disable_pin(codec, "Headset Jack");
                snd_soc_dapm_disable_pin(codec, "Mic Jack");
                snd_soc_dapm_disable_pin(codec, "Line Jack");
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                break;
        }
        snd_soc_dapm_sync(codec);
@@ -215,23 +214,14 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol,
 static int spitz_mic_bias(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *k, int event)
 {
-        if (machine_is_borzoi() || machine_is_spitz()) {
+        if (machine_is_borzoi() || machine_is_spitz())
-                if (SND_SOC_DAPM_EVENT_ON(event))
+                gpio_set_value(SPITZ_GPIO_MIC_BIAS,
-                        set_scoop_gpio(&spitzscoop2_device.dev,
+                                SND_SOC_DAPM_EVENT_ON(event));
-                                SPITZ_SCP2_MIC_BIAS);
-                else
+        if (machine_is_akita())
-                        reset_scoop_gpio(&spitzscoop2_device.dev,
+                gpio_set_value(AKITA_GPIO_MIC_BIAS,
-                                SPITZ_SCP2_MIC_BIAS);
+                                SND_SOC_DAPM_EVENT_ON(event));
-        }
-        if (machine_is_akita()) {
-                if (SND_SOC_DAPM_EVENT_ON(event))
-                        akita_set_ioexp(&akitaioexp_device.dev,
-                                AKITA_IOEXP_MIC_BIAS);
-                else
-                        akita_reset_ioexp(&akitaioexp_device.dev,
-                                AKITA_IOEXP_MIC_BIAS);
-        }
        return 0;
 }
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 4ae07e236b36..a75b289a5d78 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -57,7 +57,7 @@ module_exit(cleanup_soundcore);
 /*
 *      OSS sound core handling. Breaks out sound functions to submodules
 *      
- *      Author:         Alan Cox <alan.cox@linux.org>
+ *      Author:         Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 *      Fixes:
 *
@@ -220,9 +220,8 @@ static int sound_insert_unit(struct sound_unit **list, const struct file_operati
        else
                sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
-        device_create_drvdata(sound_class, dev,
+        device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor),
-                              MKDEV(SOUND_MAJOR, s->unit_minor),
+                      NULL, s->name+6);
-                              NULL, s->name+6);
        return r;
 fail:
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 49acee0c4840..f87933e48812 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1,6 +1,6 @@
 /*
 * Driver for AMD7930 sound chips found on Sparcs.
- * Copyright (C) 2002 David S. Miller <davem@redhat.com>
+ * Copyright (C) 2002, 2008 David S. Miller <davem@davemloft.net>
 *
 * Based entirely upon drivers/sbus/audio/amd7930.c which is:
 * Copyright (C) 1996,1997 Thomas K. Dyas (tdyas@eden.rutgers.edu)
@@ -35,6 +35,8 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/moduleparam.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -44,7 +46,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/sbus.h>
 #include <asm/prom.h>
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -335,8 +336,8 @@ struct snd_amd7930 {
        int                     pgain;
        int                     mgain;
+        struct of_device        *op;
        unsigned int            irq;
-        unsigned int            regs_size;
        struct snd_amd7930      *next;
 };
@@ -905,13 +906,16 @@ static int __devinit snd_amd7930_mixer(struct snd_amd7930 *amd)
 static int snd_amd7930_free(struct snd_amd7930 *amd)
 {
+        struct of_device *op = amd->op;
        amd7930_idle(amd);
        if (amd->irq)
                free_irq(amd->irq, amd);
        if (amd->regs)
-                sbus_iounmap(amd->regs, amd->regs_size);
+                of_iounmap(&op->resource[0], amd->regs,
+                           resource_size(&op->resource[0]));
        kfree(amd);
@@ -930,13 +934,12 @@ static struct snd_device_ops snd_amd7930_dev_ops = {
 };
 static int __devinit snd_amd7930_create(struct snd_card *card,
-                                        struct resource *rp,
+                                        struct of_device *op,
-                                        unsigned int reg_size,
                                        int irq, int dev,
                                        struct snd_amd7930 **ramd)
 {
-        unsigned long flags;
        struct snd_amd7930 *amd;
+        unsigned long flags;
        int err;
        *ramd = NULL;
@@ -946,9 +949,10 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
        spin_lock_init(&amd->lock);
        amd->card = card;
-        amd->regs_size = reg_size;
+        amd->op = op;
-        amd->regs = sbus_ioremap(rp, 0, amd->regs_size, "amd7930");
+        amd->regs = of_ioremap(&op->resource[0], 0,
+                               resource_size(&op->resource[0]), "amd7930");
        if (!amd->regs) {
                snd_printk("amd7930-%d: Unable to map chip registers.\n", dev);
                return -EIO;
@@ -997,12 +1001,15 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
        return 0;
 }
-static int __devinit amd7930_attach_common(struct resource *rp, int irq)
+static int __devinit amd7930_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
+        struct resource *rp = &op->resource[0];
        static int dev_num;
        struct snd_card *card;
        struct snd_amd7930 *amd;
-        int err;
+        int err, irq;
+        irq = op->irqs[0];
        if (dev_num >= SNDRV_CARDS)
                return -ENODEV;
@@ -1023,8 +1030,7 @@ static int __devinit amd7930_attach_common(struct resource *rp, int irq)
                (unsigned long long)rp->start,
                irq);
-        if ((err = snd_amd7930_create(card, rp,
+        if ((err = snd_amd7930_create(card, op,
-                                      (rp->end - rp->start) + 1,
                                      irq, dev_num, &amd)) < 0)
                goto out_err;
@@ -1049,43 +1055,7 @@ out_err:
        return err;
 }
-static int __devinit amd7930_obio_attach(struct device_node *dp)
+static const struct of_device_id amd7930_match[] = {
-{
-        const struct linux_prom_registers *regs;
-        const struct linux_prom_irqs *irqp;
-        struct resource res, *rp;
-        int len;
-        irqp = of_get_property(dp, "intr", &len);
-        if (!irqp) {
-                snd_printk("%s: Firmware node lacks IRQ property.\n",
-                           dp->full_name);
-                return -ENODEV;
-        }
-        regs = of_get_property(dp, "reg", &len);
-        if (!regs) {
-                snd_printk("%s: Firmware node lacks register property.\n",
-                           dp->full_name);
-                return -ENODEV;
-        }
-        rp = &res;
-        rp->start = regs->phys_addr;
-        rp->end = rp->start + regs->reg_size - 1;
-        rp->flags = IORESOURCE_IO | (regs->which_io & 0xff);
-        return amd7930_attach_common(rp, irqp->pri);
-}
-static int __devinit amd7930_sbus_probe(struct of_device *dev, const struct of_device_id *match)
-{
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-        return amd7930_attach_common(&sdev->resource[0], sdev->irqs[0]);
-}
-static struct of_device_id amd7930_match[] = {
        {
                .name = "audio",
        },
@@ -1100,20 +1070,7 @@ static struct of_platform_driver amd7930_sbus_driver = {
 static int __init amd7930_init(void)
 {
-        struct device_node *dp;
+        return of_register_driver(&amd7930_sbus_driver, &of_bus_type);
-        /* Try to find the sun4c "audio" node first. */
-        dp = of_find_node_by_path("/");
-        dp = dp->child;
-        while (dp) {
-                if (!strcmp(dp->name, "audio"))
-                        amd7930_obio_attach(dp);
-                dp = dp->sibling;
-        }
-        /* Probe each SBUS for amd7930 chips. */
-        return of_register_driver(&amd7930_sbus_driver, &sbus_bus_type);
 }
 static void __exit amd7930_exit(void)
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 791d2fb821d1..d44bf98e965e 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1,6 +1,6 @@
 /*
 * Driver for CS4231 sound chips found on Sparcs.
- * Copyright (C) 2002 David S. Miller <davem@redhat.com>
+ * Copyright (C) 2002, 2008 David S. Miller <davem@davemloft.net>
 *
 * Based entirely upon drivers/sbus/audio/cs4231.c which is:
 * Copyright (C) 1996, 1997, 1998 Derrick J Brashear (shadow@andrew.cmu.edu)
@@ -17,7 +17,8 @@
 #include <linux/moduleparam.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -29,13 +30,12 @@
 #ifdef CONFIG_SBUS
 #define SBUS_SUPPORT
-#include <asm/sbus.h>
 #endif
 #if defined(CONFIG_PCI) && defined(CONFIG_SPARC64)
 #define EBUS_SUPPORT
 #include <linux/pci.h>
-#include <asm/ebus.h>
+#include <asm/ebus_dma.h>
 #endif
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -70,8 +70,6 @@ struct cs4231_dma_control {
        int             (*request)(struct cs4231_dma_control *dma_cont,
                                   dma_addr_t bus_addr, size_t len);
        unsigned int    (*address)(struct cs4231_dma_control *dma_cont);
-        void            (*preallocate)(struct snd_cs4231 *chip,
-                                       struct snd_pcm *pcm);
 #ifdef EBUS_SUPPORT
        struct          ebus_dma_info   ebus_info;
 #endif
@@ -114,21 +112,12 @@ struct snd_cs4231 {
        struct mutex            mce_mutex;      /* mutex for mce register */
        struct mutex            open_mutex;     /* mutex for ALSA open/close */
-        union {
+        struct of_device        *op;
-#ifdef SBUS_SUPPORT
-                struct sbus_dev         *sdev;
-#endif
-#ifdef EBUS_SUPPORT
-                struct pci_dev          *pdev;
-#endif
-        } dev_u;
        unsigned int            irq[2];
        unsigned int            regs_size;
        struct snd_cs4231       *next;
 };
-static struct snd_cs4231 *cs4231_list;
 /* Eventually we can use sound/isa/cs423x/cs4231_lib.c directly, but for
 * now....  -DaveM
 */
@@ -267,27 +256,19 @@ static unsigned char snd_cs4231_original_image[32] =
 static u8 __cs4231_readb(struct snd_cs4231 *cp, void __iomem *reg_addr)
 {
-#ifdef EBUS_SUPPORT
        if (cp->flags & CS4231_FLAG_EBUS)
                return readb(reg_addr);
        else
-#endif
-#ifdef SBUS_SUPPORT
                return sbus_readb(reg_addr);
-#endif
 }
 static void __cs4231_writeb(struct snd_cs4231 *cp, u8 val,
                            void __iomem *reg_addr)
 {
-#ifdef EBUS_SUPPORT
        if (cp->flags & CS4231_FLAG_EBUS)
                return writeb(val, reg_addr);
        else
-#endif
-#ifdef SBUS_SUPPORT
                return sbus_writeb(val, reg_addr);
-#endif
 }
 /*
@@ -1258,7 +1239,9 @@ static int __init snd_cs4231_pcm(struct snd_card *card)
        pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
        strcpy(pcm->name, "CS4231");
-        chip->p_dma.preallocate(chip, pcm);
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                              &chip->op->dev,
+                                              64 * 1024, 128 * 1024);
        chip->pcm = pcm;
@@ -1627,8 +1610,7 @@ static int __init cs4231_attach_finish(struct snd_card *card)
        if (err < 0)
                goto out_err;
-        chip->next = cs4231_list;
+        dev_set_drvdata(&chip->op->dev, chip);
-        cs4231_list = chip;
        dev++;
        return 0;
@@ -1783,24 +1765,19 @@ static unsigned int sbus_dma_addr(struct cs4231_dma_control *dma_cont)
        return sbus_readl(base->regs + base->dir + APCVA);
 }
-static void sbus_dma_preallocate(struct snd_cs4231 *chip, struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_SBUS,
-                                        snd_dma_sbus_data(chip->dev_u.sdev),
-                                        64 * 1024, 128 * 1024);
-}
 /*
 * Init and exit routines
 */
 static int snd_cs4231_sbus_free(struct snd_cs4231 *chip)
 {
+        struct of_device *op = chip->op;
        if (chip->irq[0])
                free_irq(chip->irq[0], chip);
        if (chip->port)
-                sbus_iounmap(chip->port, chip->regs_size);
+                of_iounmap(&op->resource[0], chip->port, chip->regs_size);
        return 0;
 }
@@ -1817,7 +1794,7 @@ static struct snd_device_ops snd_cs4231_sbus_dev_ops = {
 };
 static int __init snd_cs4231_sbus_create(struct snd_card *card,
-                                         struct sbus_dev *sdev,
+                                         struct of_device *op,
                                         int dev)
 {
        struct snd_cs4231 *chip = card->private_data;
@@ -1828,13 +1805,13 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
        spin_lock_init(&chip->p_dma.sbus_info.lock);
        mutex_init(&chip->mce_mutex);
        mutex_init(&chip->open_mutex);
-        chip->dev_u.sdev = sdev;
+        chip->op = op;
-        chip->regs_size = sdev->reg_addrs[0].reg_size;
+        chip->regs_size = resource_size(&op->resource[0]);
        memcpy(&chip->image, &snd_cs4231_original_image,
               sizeof(snd_cs4231_original_image));
-        chip->port = sbus_ioremap(&sdev->resource[0], 0,
+        chip->port = of_ioremap(&op->resource[0], 0,
-                                  chip->regs_size, "cs4231");
+                                chip->regs_size, "cs4231");
        if (!chip->port) {
                snd_printdd("cs4231-%d: Unable to map chip registers.\n", dev);
                return -EIO;
@@ -1849,22 +1826,20 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
        chip->p_dma.enable = sbus_dma_enable;
        chip->p_dma.request = sbus_dma_request;
        chip->p_dma.address = sbus_dma_addr;
-        chip->p_dma.preallocate = sbus_dma_preallocate;
        chip->c_dma.prepare = sbus_dma_prepare;
        chip->c_dma.enable = sbus_dma_enable;
        chip->c_dma.request = sbus_dma_request;
        chip->c_dma.address = sbus_dma_addr;
-        chip->c_dma.preallocate = sbus_dma_preallocate;
-        if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
+        if (request_irq(op->irqs[0], snd_cs4231_sbus_interrupt,
                        IRQF_SHARED, "cs4231", chip)) {
                snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
-                            dev, sdev->irqs[0]);
+                            dev, op->irqs[0]);
                snd_cs4231_sbus_free(chip);
                return -EBUSY;
        }
-        chip->irq[0] = sdev->irqs[0];
+        chip->irq[0] = op->irqs[0];
        if (snd_cs4231_probe(chip) < 0) {
                snd_cs4231_sbus_free(chip);
@@ -1881,9 +1856,9 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
        return 0;
 }
-static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
+static int __devinit cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct resource *rp = &sdev->resource[0];
+        struct resource *rp = &op->resource[0];
        struct snd_card *card;
        int err;
@@ -1895,9 +1870,9 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
                card->shortname,
                rp->flags & 0xffL,
                (unsigned long long)rp->start,
-                sdev->irqs[0]);
+                op->irqs[0]);
-        err = snd_cs4231_sbus_create(card, sdev, dev);
+        err = snd_cs4231_sbus_create(card, op, dev);
        if (err < 0) {
                snd_card_free(card);
                return err;
@@ -1950,30 +1925,25 @@ static unsigned int _ebus_dma_addr(struct cs4231_dma_control *dma_cont)
        return ebus_dma_addr(&dma_cont->ebus_info);
 }
-static void _ebus_dma_preallocate(struct snd_cs4231 *chip, struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                      snd_dma_pci_data(chip->dev_u.pdev),
-                                      64*1024, 128*1024);
-}
 /*
 * Init and exit routines
 */
 static int snd_cs4231_ebus_free(struct snd_cs4231 *chip)
 {
+        struct of_device *op = chip->op;
        if (chip->c_dma.ebus_info.regs) {
                ebus_dma_unregister(&chip->c_dma.ebus_info);
-                iounmap(chip->c_dma.ebus_info.regs);
+                of_iounmap(&op->resource[2], chip->c_dma.ebus_info.regs, 0x10);
        }
        if (chip->p_dma.ebus_info.regs) {
                ebus_dma_unregister(&chip->p_dma.ebus_info);
-                iounmap(chip->p_dma.ebus_info.regs);
+                of_iounmap(&op->resource[1], chip->p_dma.ebus_info.regs, 0x10);
        }
        if (chip->port)
-                iounmap(chip->port);
+                of_iounmap(&op->resource[0], chip->port, 0x10);
        return 0;
 }
@@ -1990,7 +1960,7 @@ static struct snd_device_ops snd_cs4231_ebus_dev_ops = {
 };
 static int __init snd_cs4231_ebus_create(struct snd_card *card,
-                                         struct linux_ebus_device *edev,
+                                         struct of_device *op,
                                         int dev)
 {
        struct snd_cs4231 *chip = card->private_data;
@@ -2002,35 +1972,35 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
        mutex_init(&chip->mce_mutex);
        mutex_init(&chip->open_mutex);
        chip->flags |= CS4231_FLAG_EBUS;
-        chip->dev_u.pdev = edev->bus->self;
+        chip->op = op;
        memcpy(&chip->image, &snd_cs4231_original_image,
               sizeof(snd_cs4231_original_image));
        strcpy(chip->c_dma.ebus_info.name, "cs4231(capture)");
        chip->c_dma.ebus_info.flags = EBUS_DMA_FLAG_USE_EBDMA_HANDLER;
        chip->c_dma.ebus_info.callback = snd_cs4231_ebus_capture_callback;
        chip->c_dma.ebus_info.client_cookie = chip;
-        chip->c_dma.ebus_info.irq = edev->irqs[0];
+        chip->c_dma.ebus_info.irq = op->irqs[0];
        strcpy(chip->p_dma.ebus_info.name, "cs4231(play)");
        chip->p_dma.ebus_info.flags = EBUS_DMA_FLAG_USE_EBDMA_HANDLER;
        chip->p_dma.ebus_info.callback = snd_cs4231_ebus_play_callback;
        chip->p_dma.ebus_info.client_cookie = chip;
-        chip->p_dma.ebus_info.irq = edev->irqs[1];
+        chip->p_dma.ebus_info.irq = op->irqs[1];
        chip->p_dma.prepare = _ebus_dma_prepare;
        chip->p_dma.enable = _ebus_dma_enable;
        chip->p_dma.request = _ebus_dma_request;
        chip->p_dma.address = _ebus_dma_addr;
-        chip->p_dma.preallocate = _ebus_dma_preallocate;
        chip->c_dma.prepare = _ebus_dma_prepare;
        chip->c_dma.enable = _ebus_dma_enable;
        chip->c_dma.request = _ebus_dma_request;
        chip->c_dma.address = _ebus_dma_addr;
-        chip->c_dma.preallocate = _ebus_dma_preallocate;
-        chip->port = ioremap(edev->resource[0].start, 0x10);
+        chip->port = of_ioremap(&op->resource[0], 0, 0x10, "cs4231");
-        chip->p_dma.ebus_info.regs = ioremap(edev->resource[1].start, 0x10);
+        chip->p_dma.ebus_info.regs =
-        chip->c_dma.ebus_info.regs = ioremap(edev->resource[2].start, 0x10);
+                of_ioremap(&op->resource[1], 0, 0x10, "cs4231_pdma");
+        chip->c_dma.ebus_info.regs =
+                of_ioremap(&op->resource[2], 0, 0x10, "cs4231_cdma");
        if (!chip->port || !chip->p_dma.ebus_info.regs ||
            !chip->c_dma.ebus_info.regs) {
                snd_cs4231_ebus_free(chip);
@@ -2078,7 +2048,7 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
        return 0;
 }
-static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
+static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match)
 {
        struct snd_card *card;
        int err;
@@ -2089,10 +2059,10 @@ static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
        sprintf(card->longname, "%s at 0x%lx, irq %d",
                card->shortname,
-                edev->resource[0].start,
+                op->resource[0].start,
-                edev->irqs[0]);
+                op->irqs[0]);
-        err = snd_cs4231_ebus_create(card, edev, dev);
+        err = snd_cs4231_ebus_create(card, op, dev);
        if (err < 0) {
                snd_card_free(card);
                return err;
@@ -2102,68 +2072,57 @@ static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
 }
 #endif
-static int __init cs4231_init(void)
+static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match)
 {
-#ifdef SBUS_SUPPORT
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
-#endif
 #ifdef EBUS_SUPPORT
-        struct linux_ebus *ebus;
+        if (!strcmp(op->node->parent->name, "ebus"))
-        struct linux_ebus_device *edev;
+                return cs4231_ebus_probe(op, match);
 #endif
-        int found;
-        found = 0;
 #ifdef SBUS_SUPPORT
-        for_all_sbusdev(sdev, sbus) {
+        if (!strcmp(op->node->parent->name, "sbus") ||
-                if (!strcmp(sdev->prom_name, "SUNW,CS4231")) {
+            !strcmp(op->node->parent->name, "sbi"))
-                        if (cs4231_sbus_attach(sdev) == 0)
+                return cs4231_sbus_probe(op, match);
-                                found++;
-                }
-        }
 #endif
-#ifdef EBUS_SUPPORT
+        return -ENODEV;
-        for_each_ebus(ebus) {
+}
-                for_each_ebusdev(edev, ebus) {
-                        int match = 0;
-                        if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) {
-                                match = 1;
-                        } else if (!strcmp(edev->prom_node->name, "audio")) {
-                                const char *compat;
-                                compat = of_get_property(edev->prom_node,
-                                                         "compatible", NULL);
-                                if (compat && !strcmp(compat, "SUNW,CS4231"))
-                                        match = 1;
-                        }
-                        if (match &&
+static int __devexit cs4231_remove(struct of_device *op)
-                            cs4231_ebus_attach(edev) == 0)
+{
-                                found++;
+        struct snd_cs4231 *chip = dev_get_drvdata(&op->dev);
-                }
-        }
-#endif
+        snd_card_free(chip->card);
-        return (found > 0) ? 0 : -EIO;
+        return 0;
 }
-static void __exit cs4231_exit(void)
+static const struct of_device_id cs4231_match[] = {
-{
+        {
-        struct snd_cs4231 *p = cs4231_list;
+                .name = "SUNW,CS4231",
+        },
+        {
+                .name = "audio",
+                .compatible = "SUNW,CS4231",
+        },
+        {},
+};
-        while (p != NULL) {
+MODULE_DEVICE_TABLE(of, cs4231_match);
-                struct snd_cs4231 *next = p->next;
-                snd_card_free(p->card);
+static struct of_platform_driver cs4231_driver = {
+        .name           = "audio",
+        .match_table    = cs4231_match,
+        .probe          = cs4231_probe,
+        .remove         = __devexit_p(cs4231_remove),
+};
-                p = next;
+static int __init cs4231_init(void)
-        }
+{
+        return of_register_driver(&cs4231_driver, &of_bus_type);
+}
-        cs4231_list = NULL;
+static void __exit cs4231_exit(void)
+{
+        of_unregister_driver(&cs4231_driver);
 }
 module_init(cs4231_init);
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index c534a2a849fa..c257ad8bdfbc 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -57,6 +57,7 @@
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -66,7 +67,7 @@
 #include <sound/initval.h>
 #include <linux/of.h>
-#include <asm/sbus.h>
+#include <linux/of_device.h>
 #include <asm/atomic.h>
 MODULE_AUTHOR("Rudolf Koenig, Brent Baccala and Martin Habets");
@@ -297,7 +298,7 @@ struct dbri_streaminfo {
 /* This structure holds the information for both chips (DBRI & CS4215) */
 struct snd_dbri {
        int regs_size, irq;     /* Needed for unload */
-        struct sbus_dev *sdev;  /* SBUS device info */
+        struct of_device *op;   /* OF device info */
        spinlock_t lock;
        struct dbri_dma *dma;   /* Pointer to our DMA block */
@@ -2093,14 +2094,15 @@ static int snd_dbri_hw_params(struct snd_pcm_substream *substream,
         */
        if (info->dvma_buffer == 0) {
                if (DBRI_STREAMNO(substream) == DBRI_PLAY)
-                        direction = SBUS_DMA_TODEVICE;
+                        direction = DMA_TO_DEVICE;
                else
-                        direction = SBUS_DMA_FROMDEVICE;
+                        direction = DMA_FROM_DEVICE;
-                info->dvma_buffer = sbus_map_single(dbri->sdev,
+                info->dvma_buffer =
-                                        runtime->dma_area,
+                        dma_map_single(&dbri->op->dev,
-                                        params_buffer_bytes(hw_params),
+                                       runtime->dma_area,
-                                        direction);
+                                       params_buffer_bytes(hw_params),
+                                       direction);
        }
        direction = params_buffer_bytes(hw_params);
@@ -2121,12 +2123,12 @@ static int snd_dbri_hw_free(struct snd_pcm_substream *substream)
         */
        if (info->dvma_buffer) {
                if (DBRI_STREAMNO(substream) == DBRI_PLAY)
-                        direction = SBUS_DMA_TODEVICE;
+                        direction = DMA_TO_DEVICE;
                else
-                        direction = SBUS_DMA_FROMDEVICE;
+                        direction = DMA_FROM_DEVICE;
-                sbus_unmap_single(dbri->sdev, info->dvma_buffer,
+                dma_unmap_single(&dbri->op->dev, info->dvma_buffer,
-                                  substream->runtime->buffer_size, direction);
+                                 substream->runtime->buffer_size, direction);
                info->dvma_buffer = 0;
        }
        if (info->pipe != -1) {
@@ -2519,31 +2521,32 @@ static void __devinit snd_dbri_proc(struct snd_card *card)
 static void snd_dbri_free(struct snd_dbri *dbri);
 static int __devinit snd_dbri_create(struct snd_card *card,
-                                  struct sbus_dev *sdev,
+                                     struct of_device *op,
-                                  int irq, int dev)
+                                     int irq, int dev)
 {
        struct snd_dbri *dbri = card->private_data;
        int err;
        spin_lock_init(&dbri->lock);
-        dbri->sdev = sdev;
+        dbri->op = op;
        dbri->irq = irq;
-        dbri->dma = sbus_alloc_consistent(sdev, sizeof(struct dbri_dma),
+        dbri->dma = dma_alloc_coherent(&op->dev,
-                                          &dbri->dma_dvma);
+                                       sizeof(struct dbri_dma),
+                                       &dbri->dma_dvma, GFP_ATOMIC);
        memset((void *)dbri->dma, 0, sizeof(struct dbri_dma));
        dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n",
                dbri->dma, dbri->dma_dvma);
        /* Map the registers into memory. */
-        dbri->regs_size = sdev->reg_addrs[0].reg_size;
+        dbri->regs_size = resource_size(&op->resource[0]);
-        dbri->regs = sbus_ioremap(&sdev->resource[0], 0,
+        dbri->regs = of_ioremap(&op->resource[0], 0,
-                                  dbri->regs_size, "DBRI Registers");
+                                dbri->regs_size, "DBRI Registers");
        if (!dbri->regs) {
                printk(KERN_ERR "DBRI: could not allocate registers\n");
-                sbus_free_consistent(sdev, sizeof(struct dbri_dma),
+                dma_free_coherent(&op->dev, sizeof(struct dbri_dma),
-                                     (void *)dbri->dma, dbri->dma_dvma);
+                                  (void *)dbri->dma, dbri->dma_dvma);
                return -EIO;
        }
@@ -2551,9 +2554,9 @@ static int __devinit snd_dbri_create(struct snd_card *card,
                          "DBRI audio", dbri);
        if (err) {
                printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq);
-                sbus_iounmap(dbri->regs, dbri->regs_size);
+                of_iounmap(&op->resource[0], dbri->regs, dbri->regs_size);
-                sbus_free_consistent(sdev, sizeof(struct dbri_dma),
+                dma_free_coherent(&op->dev, sizeof(struct dbri_dma),
-                                     (void *)dbri->dma, dbri->dma_dvma);
+                                  (void *)dbri->dma, dbri->dma_dvma);
                return err;
        }
@@ -2577,27 +2580,23 @@ static void snd_dbri_free(struct snd_dbri *dbri)
                free_irq(dbri->irq, dbri);
        if (dbri->regs)
-                sbus_iounmap(dbri->regs, dbri->regs_size);
+                of_iounmap(&dbri->op->resource[0], dbri->regs, dbri->regs_size);
        if (dbri->dma)
-                sbus_free_consistent(dbri->sdev, sizeof(struct dbri_dma),
+                dma_free_coherent(&dbri->op->dev,
-                                     (void *)dbri->dma, dbri->dma_dvma);
+                                  sizeof(struct dbri_dma),
+                                  (void *)dbri->dma, dbri->dma_dvma);
 }
-static int __devinit dbri_probe(struct of_device *of_dev,
+static int __devinit dbri_probe(struct of_device *op, const struct of_device_id *match)
-                                const struct of_device_id *match)
 {
-        struct sbus_dev *sdev = to_sbus_device(&of_dev->dev);
        struct snd_dbri *dbri;
-        int irq;
        struct resource *rp;
        struct snd_card *card;
        static int dev = 0;
+        int irq;
        int err;
-        dprintk(D_GEN, "DBRI: Found %s in SBUS slot %d\n",
-                sdev->prom_name, sdev->slot);
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
        if (!enable[dev]) {
@@ -2605,7 +2604,7 @@ static int __devinit dbri_probe(struct of_device *of_dev,
                return -ENOENT;
        }
-        irq = sdev->irqs[0];
+        irq = op->irqs[0];
        if (irq <= 0) {
                printk(KERN_ERR "DBRI-%d: No IRQ.\n", dev);
                return -ENODEV;
@@ -2618,12 +2617,12 @@ static int __devinit dbri_probe(struct of_device *of_dev,
        strcpy(card->driver, "DBRI");
        strcpy(card->shortname, "Sun DBRI");
-        rp = &sdev->resource[0];
+        rp = &op->resource[0];
        sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d",
                card->shortname,
                rp->flags & 0xffL, (unsigned long long)rp->start, irq);
-        err = snd_dbri_create(card, sdev, irq, dev);
+        err = snd_dbri_create(card, op, irq, dev);
        if (err < 0) {
                snd_card_free(card);
                return err;
@@ -2640,7 +2639,7 @@ static int __devinit dbri_probe(struct of_device *of_dev,
        /* /proc file handling */
        snd_dbri_proc(card);
-        dev_set_drvdata(&of_dev->dev, card);
+        dev_set_drvdata(&op->dev, card);
        err = snd_card_register(card);
        if (err < 0)
@@ -2648,7 +2647,7 @@ static int __devinit dbri_probe(struct of_device *of_dev,
        printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n",
               dev, dbri->regs,
-               dbri->irq, sdev->prom_name[9], dbri->mm.version);
+               dbri->irq, op->node->name[9], dbri->mm.version);
        dev++;
        return 0;
@@ -2659,19 +2658,19 @@ _err:
        return err;
 }
-static int __devexit dbri_remove(struct of_device *dev)
+static int __devexit dbri_remove(struct of_device *op)
 {
-        struct snd_card *card = dev_get_drvdata(&dev->dev);
+        struct snd_card *card = dev_get_drvdata(&op->dev);
        snd_dbri_free(card->private_data);
        snd_card_free(card);
-        dev_set_drvdata(&dev->dev, NULL);
+        dev_set_drvdata(&op->dev, NULL);
        return 0;
 }
-static struct of_device_id dbri_match[] = {
+static const struct of_device_id dbri_match[] = {
        {
                .name = "SUNW,DBRIe",
        },
@@ -2693,7 +2692,7 @@ static struct of_platform_driver dbri_sbus_driver = {
 /* Probe for the dbri chip and then attach the driver. */
 static int __init dbri_init(void)
 {
-        return of_register_driver(&dbri_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&dbri_sbus_driver, &of_bus_type);
 }
 static void __exit dbri_exit(void)
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 69689e79bf79..92115755d98e 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -1480,6 +1480,36 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                }
        }
 },
+{
+        /* Advanced modes of the Edirol UA-25EX.
+         * For the standard mode, UA-25EX has ID 0582:00e7, which
+         * offers only 16-bit PCM at 44.1 kHz and no MIDI.
+         */
+        USB_DEVICE_VENDOR_SPEC(0x0582, 0x00e6),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "EDIROL",
+                .product_name = "UA-25EX",
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const struct snd_usb_audio_quirk[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
 /* Guillemot devices */
 {
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index b441fe2cd190..c2515b680f9f 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -118,12 +118,11 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
        void *vaddr;
        struct us122l *us122l = area->vm_private_data;
        struct usb_stream *s;
-        int vm_f = VM_FAULT_SIGBUS;
        mutex_lock(&us122l->mutex);
        s = us122l->sk.s;
        if (!s)
-                goto out;
+                goto unlock;
        offset = vmf->pgoff << PAGE_SHIFT;
        if (offset < PAGE_ALIGN(s->read_size))
@@ -131,7 +130,7 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
        else {
                offset -= PAGE_ALIGN(s->read_size);
                if (offset >= PAGE_ALIGN(s->write_size))
-                        goto out;
+                        goto unlock;
                vaddr = us122l->sk.write_page + offset;
        }
@@ -141,9 +140,11 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
        mutex_unlock(&us122l->mutex);
        vmf->page = page;
-        vm_f = 0;
-out:
+        return 0;
-        return vm_f;
+unlock:
+        mutex_unlock(&us122l->mutex);
+        return VM_FAULT_SIGBUS;
 }
 static void usb_stream_hwdep_vm_close(struct vm_area_struct *area)