17 files changed, 152 insertions, 114 deletions

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 872887624030..20b5982c996b 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -36,6 +36,9 @@
 #include <sound/timer.h>
 #include <sound/minors.h>
 #include <asm/io.h>
+#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
+#include <dma-coherence.h>
+#endif
 
 /*
  *  Compatibility
@@ -3184,6 +3187,10 @@ static int snd_pcm_default_mmap(struct snd_pcm_substream *substream,
                                          substream->runtime->dma_area,
                                          substream->runtime->dma_addr,
                                          area->vm_end - area->vm_start);
+#elif defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
+        if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV &&
+            !plat_device_is_coherent(substream->dma_buffer.dev.dev))
+                area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
 #endif /* ARCH_HAS_DMA_MMAP_COHERENT */
         /* mmap with fault handler */
         area->vm_ops = &snd_pcm_vm_ops_data_fault;
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 73943651caed..5040c7b862fe 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1160,6 +1160,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri,
 {
         struct snd_timer_user *tu = timeri->callback_data;
         struct snd_timer_tread r1;
+        unsigned long flags;
 
         if (event >= SNDRV_TIMER_EVENT_START &&
             event <= SNDRV_TIMER_EVENT_PAUSE)
@@ -1169,9 +1170,9 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri,
         r1.event = event;
         r1.tstamp = *tstamp;
         r1.val = resolution;
-        spin_lock(&tu->qlock);
+        spin_lock_irqsave(&tu->qlock, flags);
         snd_timer_user_append_to_tqueue(tu, &r1);
-        spin_unlock(&tu->qlock);
+        spin_unlock_irqrestore(&tu->qlock, flags);
         kill_fasync(&tu->fasync, SIGIO, POLL_IN);
         wake_up(&tu->qchange_sleep);
 }
diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h
index 1e123077923d..4ff6c8cc5077 100644
--- a/sound/drivers/pcsp/pcsp.h
+++ b/sound/drivers/pcsp/pcsp.h
@@ -16,7 +16,7 @@
 #include <asm/i8253.h>
 #else
 #include <asm/8253pit.h>
-static DEFINE_SPINLOCK(i8253_lock);
+static DEFINE_RAW_SPINLOCK(i8253_lock);
 #endif
 
 #define PCSP_SOUND_VERSION 0x400        /* read 4.00 */
diff --git a/sound/drivers/pcsp/pcsp_input.c b/sound/drivers/pcsp/pcsp_input.c
index 0444cdeb4bec..b5e2b54c2604 100644
--- a/sound/drivers/pcsp/pcsp_input.c
+++ b/sound/drivers/pcsp/pcsp_input.c
@@ -21,7 +21,7 @@ static void pcspkr_do_sound(unsigned int count)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&i8253_lock, flags);
+        raw_spin_lock_irqsave(&i8253_lock, flags);
 
         if (count) {
                 /* set command for counter 2, 2 byte write */
@@ -36,7 +36,7 @@ static void pcspkr_do_sound(unsigned int count)
                 outb(inb_p(0x61) & 0xFC, 0x61);
         }
 
-        spin_unlock_irqrestore(&i8253_lock, flags);
+        raw_spin_unlock_irqrestore(&i8253_lock, flags);
 }
 
 void pcspkr_stop_sound(void)
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c
index d77ffa9a9387..ce9e7d170c0d 100644
--- a/sound/drivers/pcsp/pcsp_lib.c
+++ b/sound/drivers/pcsp/pcsp_lib.c
@@ -66,7 +66,7 @@ static u64 pcsp_timer_update(struct snd_pcsp *chip)
         timer_cnt = val * CUR_DIV() / 256;
 
         if (timer_cnt && chip->enable) {
-                spin_lock_irqsave(&i8253_lock, flags);
+                raw_spin_lock_irqsave(&i8253_lock, flags);
                 if (!nforce_wa) {
                         outb_p(chip->val61, 0x61);
                         outb_p(timer_cnt, 0x42);
@@ -75,7 +75,7 @@ static u64 pcsp_timer_update(struct snd_pcsp *chip)
                         outb(chip->val61 ^ 2, 0x61);
                         chip->thalf = 1;
                 }
-                spin_unlock_irqrestore(&i8253_lock, flags);
+                raw_spin_unlock_irqrestore(&i8253_lock, flags);
         }
 
         chip->ns_rem = PCSP_PERIOD_NS();
@@ -159,10 +159,10 @@ static int pcsp_start_playing(struct snd_pcsp *chip)
                 return -EIO;
         }
 
-        spin_lock(&i8253_lock);
+        raw_spin_lock(&i8253_lock);
         chip->val61 = inb(0x61) | 0x03;
         outb_p(0x92, 0x43);     /* binary, mode 1, LSB only, ch 2 */
-        spin_unlock(&i8253_lock);
+        raw_spin_unlock(&i8253_lock);
         atomic_set(&chip->timer_active, 1);
         chip->thalf = 0;
 
@@ -179,11 +179,11 @@ static void pcsp_stop_playing(struct snd_pcsp *chip)
                 return;
 
         atomic_set(&chip->timer_active, 0);
-        spin_lock(&i8253_lock);
+        raw_spin_lock(&i8253_lock);
         /* restore the timer */
         outb_p(0xb6, 0x43);     /* binary, mode 3, LSB/MSB, ch 2 */
         outb(chip->val61 & 0xFC, 0x61);
-        spin_unlock(&i8253_lock);
+        raw_spin_unlock(&i8253_lock);
 }
 
 /*
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index cafc3a7316a8..ff18286fef9d 100644
--- a/sound/isa/sb/es968.c
+++ b/sound/isa/sb/es968.c
@@ -93,7 +93,7 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard,
                 return err;
         }
         port[dev] = pnp_port_start(pdev, 0);
-        dma8[dev] = pnp_dma(pdev, 1);
+        dma8[dev] = pnp_dma(pdev, 0);
         irq[dev] = pnp_irq(pdev, 0);
 
         return 0;
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c
index bb14e4c67e89..87910e992133 100644
--- a/sound/oss/dmasound/dmasound_paula.c
+++ b/sound/oss/dmasound/dmasound_paula.c
@@ -21,6 +21,7 @@
 #include <linux/ioport.h>
 #include <linux/soundcard.h>
 #include <linux/interrupt.h>
+#include <linux/platform_device.h>
 
 #include <asm/uaccess.h>
 #include <asm/setup.h>
@@ -710,31 +711,41 @@ static MACHINE machAmiga = {
 /*** Config & Setup **********************************************************/
 
 
-static int __init dmasound_paula_init(void)
+static int __init amiga_audio_probe(struct platform_device *pdev)
 {
-        int err;
-
-        if (MACH_IS_AMIGA && AMIGAHW_PRESENT(AMI_AUDIO)) {
-            if (!request_mem_region(CUSTOM_PHYSADDR+0xa0, 0x40,
-                                    "dmasound [Paula]"))
-                return -EBUSY;
-            dmasound.mach = machAmiga;
-            dmasound.mach.default_hard = def_hard ;
-            dmasound.mach.default_soft = def_soft ;
-            err = dmasound_init();
-            if (err)
-                release_mem_region(CUSTOM_PHYSADDR+0xa0, 0x40);
-            return err;
-        } else
-            return -ENODEV;
+        dmasound.mach = machAmiga;
+        dmasound.mach.default_hard = def_hard ;
+        dmasound.mach.default_soft = def_soft ;
+        return dmasound_init();
 }
 
-static void __exit dmasound_paula_cleanup(void)
+static int __exit amiga_audio_remove(struct platform_device *pdev)
 {
         dmasound_deinit();
-        release_mem_region(CUSTOM_PHYSADDR+0xa0, 0x40);
+        return 0;
+}
+
+static struct platform_driver amiga_audio_driver = {
+        .remove = __exit_p(amiga_audio_remove),
+        .driver   = {
+                .name   = "amiga-audio",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init amiga_audio_init(void)
+{
+        return platform_driver_probe(&amiga_audio_driver, amiga_audio_probe);
 }
 
-module_init(dmasound_paula_init);
-module_exit(dmasound_paula_cleanup);
+module_init(amiga_audio_init);
+
+static void __exit amiga_audio_exit(void)
+{
+        platform_driver_unregister(&amiga_audio_driver);
+}
+
+module_exit(amiga_audio_exit);
+
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:amiga-audio");
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 7de782a5b8f4..350ee8ac4153 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -766,7 +766,7 @@ static int build_input(struct hda_codec *codec)
                 for (n = 0; n < AUTO_PIN_LAST; n++) {
                         if (!spec->adc_nid[n])
                                 continue;
-                        err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[i]);
+                        err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[n]);
                         if (err < 0)
                                 return err;
                 }
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 61682e1d09da..feabb44c7ca4 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1195,10 +1195,12 @@ static int patch_cxt5045(struct hda_codec *codec)
 
         switch (codec->subsystem_id >> 16) {
         case 0x103c:
+        case 0x1631:
         case 0x1734:
-                /* HP & Fujitsu-Siemens laptops have really bad sound over 0dB
-                 * on NID 0x17. Fix max PCM level to 0 dB
-                 * (originally it has 0x2b steps with 0dB offset 0x14)
+        case 0x17aa:
+                /* HP, Packard Bell, Fujitsu-Siemens & Lenovo laptops have
+                 * really bad sound over 0dB on NID 0x17. Fix max PCM level to
+                 * 0 dB (originally it has 0x2b steps with 0dB offset 0x14)
                  */
                 snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
                                           (0x14 << AC_AMPCAP_OFFSET_SHIFT) |
@@ -2842,6 +2844,10 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
                       CXT5066_DELL_LAPTOP),
         SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
         SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),
+        SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),
+        SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),
+        SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),
         SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),
         {}
 };
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 7404dba16f83..886d8e46bb37 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -17871,7 +17871,6 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {
                                         ALC662_3ST_6ch_DIG),
         SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",
                            ALC663_ASUS_H13),
-        SND_PCI_QUIRK(0x8086, 0xd604, "Intel mobo", ALC662_3ST_2ch_DIG),
         {}
 };
 
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 7fb7d017a347..a0e06d82da1f 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -104,6 +104,7 @@ enum {
         STAC_DELL_M4_2,
         STAC_DELL_M4_3,
         STAC_HP_M4,
+        STAC_HP_DV4,
         STAC_HP_DV5,
         STAC_HP_HDX,
         STAC_HP_DV4_1222NR,
@@ -1544,11 +1545,9 @@ static unsigned int alienware_m17x_pin_configs[13] = {
         0x904601b0,
 };
 
-static unsigned int intel_dg45id_pin_configs[14] = {
+static unsigned int intel_dg45id_pin_configs[13] = {
         0x02214230, 0x02A19240, 0x01013214, 0x01014210,
-        0x01A19250, 0x01011212, 0x01016211, 0x40f000f0,
-        0x40f000f0, 0x40f000f0, 0x40f000f0, 0x014510A0,
-        0x074510B0, 0x40f000f0
+        0x01A19250, 0x01011212, 0x01016211
 };
 
 static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
@@ -1693,6 +1692,7 @@ static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
         [STAC_DELL_M4_2]        = dell_m4_2_pin_configs,
         [STAC_DELL_M4_3]        = dell_m4_3_pin_configs,
         [STAC_HP_M4]            = NULL,
+        [STAC_HP_DV4]           = NULL,
         [STAC_HP_DV5]           = NULL,
         [STAC_HP_HDX]           = NULL,
         [STAC_HP_DV4_1222NR]    = NULL,
@@ -1705,6 +1705,7 @@ static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
         [STAC_DELL_M4_2] = "dell-m4-2",
         [STAC_DELL_M4_3] = "dell-m4-3",
         [STAC_HP_M4] = "hp-m4",
+        [STAC_HP_DV4] = "hp-dv4",
         [STAC_HP_DV5] = "hp-dv5",
         [STAC_HP_HDX] = "hp-hdx",
         [STAC_HP_DV4_1222NR] = "hp-dv4-1222nr",
@@ -1723,7 +1724,7 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080,
                       "HP", STAC_HP_DV5),
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0,
-                      "HP dv4-7", STAC_HP_DV5),
+                      "HP dv4-7", STAC_HP_DV4),
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600,
                       "HP dv4-7", STAC_HP_DV5),
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3610,
@@ -4768,6 +4769,9 @@ static void set_hp_led_gpio(struct hda_codec *codec)
         struct sigmatel_spec *spec = codec->spec;
         unsigned int gpio;
 
+        if (spec->gpio_led)
+                return;
+
         gpio = snd_hda_param_read(codec, codec->afg, AC_PAR_GPIO_CAP);
         gpio &= AC_GPIO_IO_COUNT;
         if (gpio > 3)
@@ -5677,6 +5681,9 @@ again:
                 spec->num_smuxes = 1;
                 spec->num_dmuxes = 1;
                 /* fallthrough */
+        case STAC_HP_DV4:
+                spec->gpio_led = 0x01;
+                /* fallthrough */
         case STAC_HP_DV5:
                 snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010);
                 stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN);
@@ -5690,6 +5697,7 @@ again:
                 spec->num_dmics = 1;
                 spec->num_dmuxes = 1;
                 spec->num_smuxes = 1;
+                spec->gpio_led = 0x08;
                 break;
         }
 
@@ -5746,7 +5754,8 @@ again:
         }
 
         /* enable bass on HP dv7 */
-        if (spec->board_config == STAC_HP_DV5) {
+        if (spec->board_config == STAC_HP_DV4 ||
+            spec->board_config == STAC_HP_DV5) {
                 unsigned int cap;
                 cap = snd_hda_param_read(codec, 0x1, AC_PAR_GPIO_CAP);
                 cap &= AC_GPIO_IO_COUNT;
diff --git a/sound/pci/ice1712/maya44.c b/sound/pci/ice1712/maya44.c
index 3e1c20ae2f1c..726fd4b92e19 100644
--- a/sound/pci/ice1712/maya44.c
+++ b/sound/pci/ice1712/maya44.c
@@ -347,7 +347,7 @@ static int maya_gpio_sw_put(struct snd_kcontrol *kcontrol,
 
 /* known working input slots (0-4) */
 #define MAYA_LINE_IN    1       /* in-2 */
-#define MAYA_MIC_IN     4       /* in-5 */
+#define MAYA_MIC_IN     3       /* in-4 */
 
 static void wm8776_select_input(struct snd_maya44 *chip, int idx, int line)
 {
@@ -393,8 +393,8 @@ static int maya_rec_src_put(struct snd_kcontrol *kcontrol,
         int changed;
 
         mutex_lock(&chip->mutex);
-        changed = maya_set_gpio_bits(chip->ice, GPIO_MIC_RELAY,
-                                     sel ? GPIO_MIC_RELAY : 0);
+        changed = maya_set_gpio_bits(chip->ice, 1 << GPIO_MIC_RELAY,
+                                     sel ? (1 << GPIO_MIC_RELAY) : 0);
         wm8776_select_input(chip, 0, sel ? MAYA_MIC_IN : MAYA_LINE_IN);
         mutex_unlock(&chip->mutex);
         return changed;
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index 16c226bfcd2b..7c4986b27f2b 100644
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -56,6 +56,7 @@
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include "xonar.h"
+#include "cm9780.h"
 #include "cs4398.h"
 #include "cs4362a.h"
 
@@ -172,6 +173,8 @@ static void xonar_d1_init(struct oxygen *chip)
         oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
                             GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
 
+        oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
+
         xonar_init_cs53x1(chip);
         xonar_enable_output(chip);
 
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 376e14a9c273..78e612100782 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -23,6 +23,7 @@ config SND_PXA2XX_SOC_I2S
 
 config SND_PXA_SOC_SSP
         tristate
+        select PXA_SSP
 
 config SND_PXA2XX_SOC_CORGI
         tristate "SoC Audio support for Sharp Zaurus SL-C7x0"
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 544fd9566f4d..a1fd23e0e3d0 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -32,9 +32,8 @@
 
 #include <mach/hardware.h>
 #include <mach/dma.h>
-#include <mach/regs-ssp.h>
 #include <mach/audio.h>
-#include <mach/ssp.h>
+#include <plat/ssp.h>
 
 #include "pxa2xx-pcm.h"
 #include "pxa-ssp.h"
@@ -57,15 +56,15 @@ struct ssp_priv {
 static void dump_registers(struct ssp_device *ssp)
 {
         dev_dbg(&ssp->pdev->dev, "SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n",
-                 ssp_read_reg(ssp, SSCR0), ssp_read_reg(ssp, SSCR1),
-                 ssp_read_reg(ssp, SSTO));
+                 pxa_ssp_read_reg(ssp, SSCR0), pxa_ssp_read_reg(ssp, SSCR1),
+                 pxa_ssp_read_reg(ssp, SSTO));
 
         dev_dbg(&ssp->pdev->dev, "SSPSP 0x%08x SSSR 0x%08x SSACD 0x%08x\n",
-                 ssp_read_reg(ssp, SSPSP), ssp_read_reg(ssp, SSSR),
-                 ssp_read_reg(ssp, SSACD));
+                 pxa_ssp_read_reg(ssp, SSPSP), pxa_ssp_read_reg(ssp, SSSR),
+                 pxa_ssp_read_reg(ssp, SSACD));
 }
 
-static void ssp_enable(struct ssp_device *ssp)
+static void pxa_ssp_enable(struct ssp_device *ssp)
 {
         uint32_t sscr0;
 
@@ -73,7 +72,7 @@ static void ssp_enable(struct ssp_device *ssp)
         __raw_writel(sscr0, ssp->mmio_base + SSCR0);
 }
 
-static void ssp_disable(struct ssp_device *ssp)
+static void pxa_ssp_disable(struct ssp_device *ssp)
 {
         uint32_t sscr0;
 
@@ -87,7 +86,7 @@ struct pxa2xx_pcm_dma_data {
 };
 
 static struct pxa2xx_pcm_dma_params *
-ssp_get_dma_params(struct ssp_device *ssp, int width4, int out)
+pxa_ssp_get_dma_params(struct ssp_device *ssp, int width4, int out)
 {
         struct pxa2xx_pcm_dma_data *dma;
 
@@ -119,7 +118,7 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
 
         if (!cpu_dai->active) {
                 clk_enable(ssp->clk);
-                ssp_disable(ssp);
+                pxa_ssp_disable(ssp);
         }
 
         kfree(snd_soc_dai_get_dma_data(cpu_dai, substream));
@@ -137,7 +136,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
         struct ssp_device *ssp = priv->ssp;
 
         if (!cpu_dai->active) {
-                ssp_disable(ssp);
+                pxa_ssp_disable(ssp);
                 clk_disable(ssp->clk);
         }
 
@@ -160,7 +159,7 @@ static int pxa_ssp_suspend(struct snd_soc_dai *cpu_dai)
         priv->to  = __raw_readl(ssp->mmio_base + SSTO);
         priv->psp = __raw_readl(ssp->mmio_base + SSPSP);
 
-        ssp_disable(ssp);
+        pxa_ssp_disable(ssp);
         clk_disable(ssp->clk);
         return 0;
 }
@@ -180,7 +179,7 @@ static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai)
         __raw_writel(priv->psp, ssp->mmio_base + SSPSP);
 
         if (cpu_dai->active)
-                ssp_enable(ssp);
+                pxa_ssp_enable(ssp);
         else
                 clk_disable(ssp->clk);
 
@@ -196,9 +195,9 @@ static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai)
  * ssp_set_clkdiv - set SSP clock divider
  * @div: serial clock rate divider
  */
-static void ssp_set_scr(struct ssp_device *ssp, u32 div)
+static void pxa_ssp_set_scr(struct ssp_device *ssp, u32 div)
 {
-        u32 sscr0 = ssp_read_reg(ssp, SSCR0);
+        u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0);
 
         if (cpu_is_pxa25x() && ssp->type == PXA25x_SSP) {
                 sscr0 &= ~0x0000ff00;
@@ -207,15 +206,15 @@ static void ssp_set_scr(struct ssp_device *ssp, u32 div)
                 sscr0 &= ~0x000fff00;
                 sscr0 |= (div - 1) << 8;     /* 1..4096 */
         }
-        ssp_write_reg(ssp, SSCR0, sscr0);
+        pxa_ssp_write_reg(ssp, SSCR0, sscr0);
 }
 
 /**
- * ssp_get_clkdiv - get SSP clock divider
+ * pxa_ssp_get_clkdiv - get SSP clock divider
  */
-static u32 ssp_get_scr(struct ssp_device *ssp)
+static u32 pxa_ssp_get_scr(struct ssp_device *ssp)
 {
-        u32 sscr0 = ssp_read_reg(ssp, SSCR0);
+        u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0);
         u32 div;
 
         if (cpu_is_pxa25x() && ssp->type == PXA25x_SSP)
@@ -235,7 +234,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
         struct ssp_device *ssp = priv->ssp;
         int val;
 
-        u32 sscr0 = ssp_read_reg(ssp, SSCR0) &
+        u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0) &
                 ~(SSCR0_ECS |  SSCR0_NCS | SSCR0_MOD | SSCR0_ACS);
 
         dev_dbg(&ssp->pdev->dev,
@@ -263,7 +262,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
                 break;
         case PXA_SSP_CLK_AUDIO:
                 priv->sysclk = 0;
-                ssp_set_scr(ssp, 1);
+                pxa_ssp_set_scr(ssp, 1);
                 sscr0 |= SSCR0_ACS;
                 break;
         default:
@@ -274,8 +273,8 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
          * on PXA2xx.  On PXA3xx it must be enabled when doing so. */
         if (!cpu_is_pxa3xx())
                 clk_disable(ssp->clk);
-        val = ssp_read_reg(ssp, SSCR0) | sscr0;
-        ssp_write_reg(ssp, SSCR0, val);
+        val = pxa_ssp_read_reg(ssp, SSCR0) | sscr0;
+        pxa_ssp_write_reg(ssp, SSCR0, val);
         if (!cpu_is_pxa3xx())
                 clk_enable(ssp->clk);
 
@@ -294,11 +293,11 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
 
         switch (div_id) {
         case PXA_SSP_AUDIO_DIV_ACDS:
-                val = (ssp_read_reg(ssp, SSACD) & ~0x7) | SSACD_ACDS(div);
-                ssp_write_reg(ssp, SSACD, val);
+                val = (pxa_ssp_read_reg(ssp, SSACD) & ~0x7) | SSACD_ACDS(div);
+                pxa_ssp_write_reg(ssp, SSACD, val);
                 break;
         case PXA_SSP_AUDIO_DIV_SCDB:
-                val = ssp_read_reg(ssp, SSACD);
+                val = pxa_ssp_read_reg(ssp, SSACD);
                 val &= ~SSACD_SCDB;
 #if defined(CONFIG_PXA3xx)
                 if (cpu_is_pxa3xx())
@@ -321,10 +320,10 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
                 default:
                         return -EINVAL;
                 }
-                ssp_write_reg(ssp, SSACD, val);
+                pxa_ssp_write_reg(ssp, SSACD, val);
                 break;
         case PXA_SSP_DIV_SCR:
-                ssp_set_scr(ssp, div);
+                pxa_ssp_set_scr(ssp, div);
                 break;
         default:
                 return -ENODEV;
@@ -341,11 +340,11 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id,
 {
         struct ssp_priv *priv = cpu_dai->private_data;
         struct ssp_device *ssp = priv->ssp;
-        u32 ssacd = ssp_read_reg(ssp, SSACD) & ~0x70;
+        u32 ssacd = pxa_ssp_read_reg(ssp, SSACD) & ~0x70;
 
 #if defined(CONFIG_PXA3xx)
         if (cpu_is_pxa3xx())
-                ssp_write_reg(ssp, SSACDD, 0);
+                pxa_ssp_write_reg(ssp, SSACDD, 0);
 #endif
 
         switch (freq_out) {
@@ -383,7 +382,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id,
                         val = tmp;
 
                         val = (val << 16) | 64;
-                        ssp_write_reg(ssp, SSACDD, val);
+                        pxa_ssp_write_reg(ssp, SSACDD, val);
 
                         ssacd |= (0x6 << 4);
 
@@ -397,7 +396,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id,
                 return -EINVAL;
         }
 
-        ssp_write_reg(ssp, SSACD, ssacd);
+        pxa_ssp_write_reg(ssp, SSACD, ssacd);
 
         return 0;
 }
@@ -412,7 +411,7 @@ static int pxa_ssp_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai,
         struct ssp_device *ssp = priv->ssp;
         u32 sscr0;
 
-        sscr0 = ssp_read_reg(ssp, SSCR0);
+        sscr0 = pxa_ssp_read_reg(ssp, SSCR0);
         sscr0 &= ~(SSCR0_MOD | SSCR0_SlotsPerFrm(8) | SSCR0_EDSS | SSCR0_DSS);
 
         /* set slot width */
@@ -429,10 +428,10 @@ static int pxa_ssp_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai,
                 sscr0 |= SSCR0_SlotsPerFrm(slots);
 
                 /* set active slot mask */
-                ssp_write_reg(ssp, SSTSA, tx_mask);
-                ssp_write_reg(ssp, SSRSA, rx_mask);
+                pxa_ssp_write_reg(ssp, SSTSA, tx_mask);
+                pxa_ssp_write_reg(ssp, SSRSA, rx_mask);
         }
-        ssp_write_reg(ssp, SSCR0, sscr0);
+        pxa_ssp_write_reg(ssp, SSCR0, sscr0);
 
         return 0;
 }
@@ -447,12 +446,12 @@ static int pxa_ssp_set_dai_tristate(struct snd_soc_dai *cpu_dai,
         struct ssp_device *ssp = priv->ssp;
         u32 sscr1;
 
-        sscr1 = ssp_read_reg(ssp, SSCR1);
+        sscr1 = pxa_ssp_read_reg(ssp, SSCR1);
         if (tristate)
                 sscr1 &= ~SSCR1_TTE;
         else
                 sscr1 |= SSCR1_TTE;
-        ssp_write_reg(ssp, SSCR1, sscr1);
+        pxa_ssp_write_reg(ssp, SSCR1, sscr1);
 
         return 0;
 }
@@ -476,14 +475,14 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 return 0;
 
         /* we can only change the settings if the port is not in use */
-        if (ssp_read_reg(ssp, SSCR0) & SSCR0_SSE) {
+        if (pxa_ssp_read_reg(ssp, SSCR0) & SSCR0_SSE) {
                 dev_err(&ssp->pdev->dev,
                         "can't change hardware dai format: stream is in use");
                 return -EINVAL;
         }
 
         /* reset port settings */
-        sscr0 = ssp_read_reg(ssp, SSCR0) &
+        sscr0 = pxa_ssp_read_reg(ssp, SSCR0) &
                 (SSCR0_ECS |  SSCR0_NCS | SSCR0_MOD | SSCR0_ACS);
         sscr1 = SSCR1_RxTresh(8) | SSCR1_TxTresh(7);
         sspsp = 0;
@@ -535,9 +534,9 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 return -EINVAL;
         }
 
-        ssp_write_reg(ssp, SSCR0, sscr0);
-        ssp_write_reg(ssp, SSCR1, sscr1);
-        ssp_write_reg(ssp, SSPSP, sspsp);
+        pxa_ssp_write_reg(ssp, SSCR0, sscr0);
+        pxa_ssp_write_reg(ssp, SSCR1, sscr1);
+        pxa_ssp_write_reg(ssp, SSPSP, sspsp);
 
         dump_registers(ssp);
 
@@ -566,7 +565,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
         u32 sscr0;
         u32 sspsp;
         int width = snd_pcm_format_physical_width(params_format(params));
-        int ttsa = ssp_read_reg(ssp, SSTSA) & 0xf;
+        int ttsa = pxa_ssp_read_reg(ssp, SSTSA) & 0xf;
         struct pxa2xx_pcm_dma_params *dma_data;
 
         dma_data = snd_soc_dai_get_dma_data(dai, substream);
@@ -578,22 +577,22 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
          * to force 16-bit frame width on the wire (for S16_LE), even
          * with two channels. Use 16-bit DMA transfers for this case.
          */
-        dma_data = ssp_get_dma_params(ssp,
+        dma_data = pxa_ssp_get_dma_params(ssp,
                         ((chn == 2) && (ttsa != 1)) || (width == 32),
                         substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
 
         snd_soc_dai_set_dma_data(dai, substream, dma_data);
 
         /* we can only change the settings if the port is not in use */
-        if (ssp_read_reg(ssp, SSCR0) & SSCR0_SSE)
+        if (pxa_ssp_read_reg(ssp, SSCR0) & SSCR0_SSE)
                 return 0;
 
         /* clear selected SSP bits */
-        sscr0 = ssp_read_reg(ssp, SSCR0) & ~(SSCR0_DSS | SSCR0_EDSS);
-        ssp_write_reg(ssp, SSCR0, sscr0);
+        sscr0 = pxa_ssp_read_reg(ssp, SSCR0) & ~(SSCR0_DSS | SSCR0_EDSS);
+        pxa_ssp_write_reg(ssp, SSCR0, sscr0);
 
         /* bit size */
-        sscr0 = ssp_read_reg(ssp, SSCR0);
+        sscr0 = pxa_ssp_read_reg(ssp, SSCR0);
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
 #ifdef CONFIG_PXA3xx
@@ -609,13 +608,13 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
                 sscr0 |= (SSCR0_EDSS | SSCR0_DataSize(16));
                 break;
         }
-        ssp_write_reg(ssp, SSCR0, sscr0);
+        pxa_ssp_write_reg(ssp, SSCR0, sscr0);
 
         switch (priv->dai_fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
         case SND_SOC_DAIFMT_I2S:
-               sspsp = ssp_read_reg(ssp, SSPSP);
+               sspsp = pxa_ssp_read_reg(ssp, SSPSP);
 
-                if ((ssp_get_scr(ssp) == 4) && (width == 16)) {
+                if ((pxa_ssp_get_scr(ssp) == 4) && (width == 16)) {
                         /* This is a special case where the bitclk is 64fs
                         * and we're not dealing with 2*32 bits of audio
                         * samples.
@@ -649,7 +648,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
                         sspsp |= SSPSP_DMYSTRT(1);
                 }
 
-                ssp_write_reg(ssp, SSPSP, sspsp);
+                pxa_ssp_write_reg(ssp, SSPSP, sspsp);
                 break;
         default:
                 break;
@@ -680,45 +679,45 @@ static int pxa_ssp_trigger(struct snd_pcm_substream *substream, int cmd,
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_RESUME:
-                ssp_enable(ssp);
+                pxa_ssp_enable(ssp);
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                val = ssp_read_reg(ssp, SSCR1);
+                val = pxa_ssp_read_reg(ssp, SSCR1);
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         val |= SSCR1_TSRE;
                 else
                         val |= SSCR1_RSRE;
-                ssp_write_reg(ssp, SSCR1, val);
-                val = ssp_read_reg(ssp, SSSR);
-                ssp_write_reg(ssp, SSSR, val);
+                pxa_ssp_write_reg(ssp, SSCR1, val);
+                val = pxa_ssp_read_reg(ssp, SSSR);
+                pxa_ssp_write_reg(ssp, SSSR, val);
                 break;
         case SNDRV_PCM_TRIGGER_START:
-                val = ssp_read_reg(ssp, SSCR1);
+                val = pxa_ssp_read_reg(ssp, SSCR1);
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         val |= SSCR1_TSRE;
                 else
                         val |= SSCR1_RSRE;
-                ssp_write_reg(ssp, SSCR1, val);
-                ssp_enable(ssp);
+                pxa_ssp_write_reg(ssp, SSCR1, val);
+                pxa_ssp_enable(ssp);
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
-                val = ssp_read_reg(ssp, SSCR1);
+                val = pxa_ssp_read_reg(ssp, SSCR1);
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         val &= ~SSCR1_TSRE;
                 else
                         val &= ~SSCR1_RSRE;
-                ssp_write_reg(ssp, SSCR1, val);
+                pxa_ssp_write_reg(ssp, SSCR1, val);
                 break;
         case SNDRV_PCM_TRIGGER_SUSPEND:
-                ssp_disable(ssp);
+                pxa_ssp_disable(ssp);
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                val = ssp_read_reg(ssp, SSCR1);
+                val = pxa_ssp_read_reg(ssp, SSCR1);
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         val &= ~SSCR1_TSRE;
                 else
                         val &= ~SSCR1_RSRE;
-                ssp_write_reg(ssp, SSCR1, val);
+                pxa_ssp_write_reg(ssp, SSCR1, val);
                 break;
 
         default:
@@ -740,7 +739,7 @@ static int pxa_ssp_probe(struct platform_device *pdev,
         if (!priv)
                 return -ENOMEM;
 
-        priv->ssp = ssp_request(dai->id + 1, "SoC audio");
+        priv->ssp = pxa_ssp_request(dai->id + 1, "SoC audio");
         if (priv->ssp == NULL) {
                 ret = -ENODEV;
                 goto err_priv;
@@ -760,7 +759,7 @@ static void pxa_ssp_remove(struct platform_device *pdev,
                               struct snd_soc_dai *dai)
 {
         struct ssp_priv *priv = dai->private_data;
-        ssp_free(priv->ssp);
+        pxa_ssp_free(priv->ssp);
 }
 
 #define PXA_SSP_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c
index 612e18b4bf4e..0ec20b68e8cb 100644
--- a/sound/soc/txx9/txx9aclc-ac97.c
+++ b/sound/soc/txx9/txx9aclc-ac97.c
@@ -254,3 +254,4 @@ module_exit(txx9aclc_ac97_exit);
 MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
 MODULE_DESCRIPTION("TXx9 ACLC AC97 driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:txx9aclc-ac97");
diff --git a/sound/soc/txx9/txx9aclc-generic.c b/sound/soc/txx9/txx9aclc-generic.c
index 3175de9a92cb..95b17f731aec 100644
--- a/sound/soc/txx9/txx9aclc-generic.c
+++ b/sound/soc/txx9/txx9aclc-generic.c
@@ -96,3 +96,4 @@ module_exit(txx9aclc_generic_exit);
 MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
 MODULE_DESCRIPTION("Generic TXx9 ACLC ALSA SoC audio driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:txx9aclc-generic");