9 files changed, 35 insertions, 159 deletions

diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 4cf98c03af22..15dac0f20cd8 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -896,8 +896,7 @@ static struct snd_pcm_ops fsl_dma_ops = {
         .pointer        = fsl_dma_pointer,
 };
 
-static int __devinit fsl_soc_dma_probe(struct platform_device *pdev,
-                                       const struct of_device_id *match)
+static int __devinit fsl_soc_dma_probe(struct platform_device *pdev)
  {
         struct dma_object *dma;
         struct device_node *np = pdev->dev.of_node;
@@ -979,7 +978,7 @@ static const struct of_device_id fsl_soc_dma_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, fsl_soc_dma_ids);
 
-static struct of_platform_driver fsl_soc_dma_driver = {
+static struct platform_driver fsl_soc_dma_driver = {
         .driver = {
                 .name = "fsl-pcm-audio",
                 .owner = THIS_MODULE,
@@ -993,12 +992,12 @@ static int __init fsl_soc_dma_init(void)
 {
         pr_info("Freescale Elo DMA ASoC PCM Driver\n");
 
-        return of_register_platform_driver(&fsl_soc_dma_driver);
+        return platform_driver_register(&fsl_soc_dma_driver);
 }
 
 static void __exit fsl_soc_dma_exit(void)
 {
-        of_unregister_platform_driver(&fsl_soc_dma_driver);
+        platform_driver_unregister(&fsl_soc_dma_driver);
 }
 
 module_init(fsl_soc_dma_init);
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 4cc167a7aeb8..313e0ccedd5b 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -624,8 +624,7 @@ static void make_lowercase(char *s)
         }
 }
 
-static int __devinit fsl_ssi_probe(struct platform_device *pdev,
-                                   const struct of_device_id *match)
+static int __devinit fsl_ssi_probe(struct platform_device *pdev)
 {
         struct fsl_ssi_private *ssi_private;
         int ret = 0;
@@ -774,7 +773,7 @@ static const struct of_device_id fsl_ssi_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, fsl_ssi_ids);
 
-static struct of_platform_driver fsl_ssi_driver = {
+static struct platform_driver fsl_ssi_driver = {
         .driver = {
                 .name = "fsl-ssi-dai",
                 .owner = THIS_MODULE,
@@ -788,12 +787,12 @@ static int __init fsl_ssi_init(void)
 {
         printk(KERN_INFO "Freescale Synchronous Serial Interface (SSI) ASoC Driver\n");
 
-        return of_register_platform_driver(&fsl_ssi_driver);
+        return platform_driver_register(&fsl_ssi_driver);
 }
 
 static void __exit fsl_ssi_exit(void)
 {
-        of_unregister_platform_driver(&fsl_ssi_driver);
+        platform_driver_unregister(&fsl_ssi_driver);
 }
 
 module_init(fsl_ssi_init);
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index f92dca07cd35..fff695ccdd3e 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -368,8 +368,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
         .pcm_free       = &psc_dma_free,
 };
 
-static int mpc5200_hpcd_probe(struct of_device *op,
-                const struct of_device_id *match)
+static int mpc5200_hpcd_probe(struct of_device *op)
 {
         phys_addr_t fifo;
         struct psc_dma *psc_dma;
@@ -511,32 +510,31 @@ static int mpc5200_hpcd_remove(struct of_device *op)
 }
 
 static struct of_device_id mpc5200_hpcd_match[] = {
-        {
-                .compatible = "fsl,mpc5200-pcm",
-        },
+        { .compatible = "fsl,mpc5200-pcm", },
         {}
 };
 MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
 
-static struct of_platform_driver mpc5200_hpcd_of_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "mpc5200-pcm-audio",
-        .match_table    = mpc5200_hpcd_match,
+static struct platform_driver mpc5200_hpcd_of_driver = {
         .probe          = mpc5200_hpcd_probe,
         .remove         = mpc5200_hpcd_remove,
+        .dev = {
+                .owner          = THIS_MODULE,
+                .name           = "mpc5200-pcm-audio",
+                .of_match_table    = mpc5200_hpcd_match,
+        }
 };
 
 static int __init mpc5200_hpcd_init(void)
 {
-        return of_register_platform_driver(&mpc5200_hpcd_of_driver);
+        return platform_driver_register(&mpc5200_hpcd_of_driver);
 }
+module_init(mpc5200_hpcd_init);
 
 static void __exit mpc5200_hpcd_exit(void)
 {
-        of_unregister_platform_driver(&mpc5200_hpcd_of_driver);
+        platform_driver_unregister(&mpc5200_hpcd_of_driver);
 }
-
-module_init(mpc5200_hpcd_init);
 module_exit(mpc5200_hpcd_exit);
 
 MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 40acc8e2b1ca..ad36b095bb79 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -272,8 +272,7 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
  * - Probe/remove operations
  * - OF device match table
  */
-static int __devinit psc_ac97_of_probe(struct platform_device *op,
-                                      const struct of_device_id *match)
+static int __devinit psc_ac97_of_probe(struct platform_device *op)
 {
         int rc;
         struct snd_ac97 ac97;
@@ -316,7 +315,7 @@ static struct of_device_id psc_ac97_match[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(of, psc_ac97_match);
 
-static struct of_platform_driver psc_ac97_driver = {
+static struct platform_driver psc_ac97_driver = {
         .probe = psc_ac97_of_probe,
         .remove = __devexit_p(psc_ac97_of_remove),
         .driver = {
@@ -332,13 +331,13 @@ static struct of_platform_driver psc_ac97_driver = {
  */
 static int __init psc_ac97_init(void)
 {
-        return of_register_platform_driver(&psc_ac97_driver);
+        return platform_driver_register(&psc_ac97_driver);
 }
 module_init(psc_ac97_init);
 
 static void __exit psc_ac97_exit(void)
 {
-        of_unregister_platform_driver(&psc_ac97_driver);
+        platform_driver_unregister(&psc_ac97_driver);
 }
 module_exit(psc_ac97_exit);
 
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 9018fa5bf0db..87cf2a5c2b2c 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -150,8 +150,7 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{
  * - Probe/remove operations
  * - OF device match table
  */
-static int __devinit psc_i2s_of_probe(struct platform_device *op,
-                                      const struct of_device_id *match)
+static int __devinit psc_i2s_of_probe(struct platform_device *op)
 {
         int rc;
         struct psc_dma *psc_dma;
@@ -213,7 +212,7 @@ static struct of_device_id psc_i2s_match[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(of, psc_i2s_match);
 
-static struct of_platform_driver psc_i2s_driver = {
+static struct platform_driver psc_i2s_driver = {
         .probe = psc_i2s_of_probe,
         .remove = __devexit_p(psc_i2s_of_remove),
         .driver = {
@@ -229,13 +228,13 @@ static struct of_platform_driver psc_i2s_driver = {
  */
 static int __init psc_i2s_init(void)
 {
-        return of_register_platform_driver(&psc_i2s_driver);
+        return platform_driver_register(&psc_i2s_driver);
 }
 module_init(psc_i2s_init);
 
 static void __exit psc_i2s_exit(void)
 {
-        of_unregister_platform_driver(&psc_i2s_driver);
+        platform_driver_unregister(&psc_i2s_driver);
 }
 module_exit(psc_i2s_exit);
 
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index 161750443ebc..73dde4a1adc3 100644
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -139,7 +139,7 @@ static struct snd_soc_dai_link am3517evm_dai = {
         .cpu_dai_name ="omap-mcbsp-dai.0",
         .codec_dai_name = "tlv320aic23-hifi",
         .platform_name = "omap-pcm-audio",
-        .codec_name = "tlv320aic23-codec",
+        .codec_name = "tlv320aic23-codec.2-001a",
         .init = am3517evm_aic23_init,
         .ops = &am3517evm_ops,
 };
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index d203f4da18a0..2175f09e57b6 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -69,110 +69,6 @@ static struct omap_mcbsp_data mcbsp_data[NUM_LINKS];
  */
 static struct omap_pcm_dma_data omap_mcbsp_dai_dma_params[NUM_LINKS][2];
 
-#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
-static const int omap1_dma_reqs[][2] = {
-        { OMAP_DMA_MCBSP1_TX, OMAP_DMA_MCBSP1_RX },
-        { OMAP_DMA_MCBSP2_TX, OMAP_DMA_MCBSP2_RX },
-        { OMAP_DMA_MCBSP3_TX, OMAP_DMA_MCBSP3_RX },
-};
-static const unsigned long omap1_mcbsp_port[][2] = {
-        { OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
-          OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
-        { OMAP1510_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1,
-          OMAP1510_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1 },
-        { OMAP1510_MCBSP3_BASE + OMAP_MCBSP_REG_DXR1,
-          OMAP1510_MCBSP3_BASE + OMAP_MCBSP_REG_DRR1 },
-};
-#else
-static const int omap1_dma_reqs[][2] = {};
-static const unsigned long omap1_mcbsp_port[][2] = {};
-#endif
-
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-static const int omap24xx_dma_reqs[][2] = {
-        { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX },
-        { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX },
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
-        { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX },
-        { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX },
-        { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX },
-#endif
-};
-#else
-static const int omap24xx_dma_reqs[][2] = {};
-#endif
-
-#if defined(CONFIG_ARCH_OMAP4)
-static const int omap44xx_dma_reqs[][2] = {
-        { OMAP44XX_DMA_MCBSP1_TX, OMAP44XX_DMA_MCBSP1_RX },
-        { OMAP44XX_DMA_MCBSP2_TX, OMAP44XX_DMA_MCBSP2_RX },
-        { OMAP44XX_DMA_MCBSP3_TX, OMAP44XX_DMA_MCBSP3_RX },
-        { OMAP44XX_DMA_MCBSP4_TX, OMAP44XX_DMA_MCBSP4_RX },
-};
-#else
-static const int omap44xx_dma_reqs[][2] = {};
-#endif
-
-#if defined(CONFIG_ARCH_OMAP2420)
-static const unsigned long omap2420_mcbsp_port[][2] = {
-        { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
-          OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
-        { OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1,
-          OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1 },
-};
-#else
-static const unsigned long omap2420_mcbsp_port[][2] = {};
-#endif
-
-#if defined(CONFIG_ARCH_OMAP2430)
-static const unsigned long omap2430_mcbsp_port[][2] = {
-        { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP2430_MCBSP3_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP2430_MCBSP3_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP2430_MCBSP4_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP2430_MCBSP4_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP2430_MCBSP5_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP2430_MCBSP5_BASE + OMAP_MCBSP_REG_DRR },
-};
-#else
-static const unsigned long omap2430_mcbsp_port[][2] = {};
-#endif
-
-#if defined(CONFIG_ARCH_OMAP3)
-static const unsigned long omap34xx_mcbsp_port[][2] = {
-        { OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP34XX_MCBSP3_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP34XX_MCBSP3_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP34XX_MCBSP4_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP34XX_MCBSP4_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP34XX_MCBSP5_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP34XX_MCBSP5_BASE + OMAP_MCBSP_REG_DRR },
-};
-#else
-static const unsigned long omap34xx_mcbsp_port[][2] = {};
-#endif
-
-#if defined(CONFIG_ARCH_OMAP4)
-static const unsigned long omap44xx_mcbsp_port[][2] = {
-        { OMAP44XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP44XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP44XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP44XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP44XX_MCBSP3_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP44XX_MCBSP3_BASE + OMAP_MCBSP_REG_DRR },
-        { OMAP44XX_MCBSP4_BASE + OMAP_MCBSP_REG_DXR,
-          OMAP44XX_MCBSP4_BASE + OMAP_MCBSP_REG_DRR },
-};
-#else
-static const unsigned long omap44xx_mcbsp_port[][2] = {};
-#endif
-
 static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -346,24 +242,10 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
         unsigned int format, div, framesize, master;
 
         dma_data = &omap_mcbsp_dai_dma_params[cpu_dai->id][substream->stream];
-        if (cpu_class_is_omap1()) {
-                dma = omap1_dma_reqs[bus_id][substream->stream];
-                port = omap1_mcbsp_port[bus_id][substream->stream];
-        } else if (cpu_is_omap2420()) {
-                dma = omap24xx_dma_reqs[bus_id][substream->stream];
-                port = omap2420_mcbsp_port[bus_id][substream->stream];
-        } else if (cpu_is_omap2430()) {
-                dma = omap24xx_dma_reqs[bus_id][substream->stream];
-                port = omap2430_mcbsp_port[bus_id][substream->stream];
-        } else if (cpu_is_omap343x()) {
-                dma = omap24xx_dma_reqs[bus_id][substream->stream];
-                port = omap34xx_mcbsp_port[bus_id][substream->stream];
-         } else if (cpu_is_omap44xx()) {
-                dma = omap44xx_dma_reqs[bus_id][substream->stream];
-                port = omap44xx_mcbsp_port[bus_id][substream->stream];
-        } else {
-                return -ENODEV;
-        }
+
+        dma = omap_mcbsp_dma_ch_params(bus_id, substream->stream);
+        port = omap_mcbsp_dma_reg_params(bus_id, substream->stream);
+
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
                 dma_data->data_type = OMAP_DMA_DATA_TYPE_S16;
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index 110c106611d3..37dc7211ed3f 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -43,7 +43,7 @@ enum omap_mcbsp_div {
         OMAP_MCBSP_CLKGDV,              /* Sample rate generator divider */
 };
 
-#if defined(CONFIG_ARCH_OMAP2420)
+#if defined(CONFIG_SOC_OMAP2420)
 #define NUM_LINKS       2
 #endif
 #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
@@ -54,7 +54,7 @@ enum omap_mcbsp_div {
 #undef  NUM_LINKS
 #define NUM_LINKS       4
 #endif
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
 #undef  NUM_LINKS
 #define NUM_LINKS       5
 #endif
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index a08237acc53b..a3fdfb631469 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -1,6 +1,6 @@
 config SND_SOC_SAMSUNG
         tristate "ASoC support for Samsung"
-        depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PV310
+        depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_EXYNOS4
         select S3C64XX_DMA if ARCH_S3C64XX
         select S3C2410_DMA if ARCH_S3C2410
         help