1 files changed, 154 insertions, 90 deletions

diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index a521aa90ddee..a61ccd2d505f 100644
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -17,6 +17,7 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
@@ -61,7 +62,8 @@ static unsigned short au1xpsc_ac97_read(struct snd_ac97 *ac97,
 {
         /* FIXME */
         struct au1xpsc_audio_data *pscdata = au1xpsc_ac97_workdata;
-        unsigned short data, retry, tmo;
+        unsigned short retry, tmo;
+        unsigned long data;
 
         au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
         au_sync();
@@ -74,20 +76,26 @@ static unsigned short au1xpsc_ac97_read(struct snd_ac97 *ac97,
                           AC97_CDC(pscdata));
                 au_sync();
 
-                tmo = 2000;
-                while ((!(au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD))
-                        && --tmo)
-                        udelay(2);
+                tmo = 20;
+                do {
+                        udelay(21);
+                        if (au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)
+                                break;
+                } while (--tmo);
 
-                data = au_readl(AC97_CDC(pscdata)) & 0xffff;
+                data = au_readl(AC97_CDC(pscdata));
 
                 au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
                 au_sync();
 
                 mutex_unlock(&pscdata->lock);
+
+                if (reg != ((data >> 16) & 0x7f))
+                        tmo = 1;        /* wrong register, try again */
+
         } while (--retry && !tmo);
 
-        return retry ? data : 0xffff;
+        return retry ? data & 0xffff : 0xffff;
 }
 
 /* AC97 controller writes to codec register */
@@ -109,10 +117,12 @@ static void au1xpsc_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
                           AC97_CDC(pscdata));
                 au_sync();
 
-                tmo = 2000;
-                while ((!(au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD))
-                       && --tmo)
-                        udelay(2);
+                tmo = 20;
+                do {
+                        udelay(21);
+                        if (au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)
+                                break;
+                } while (--tmo);
 
                 au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
                 au_sync();
@@ -195,7 +205,7 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
         /* FIXME */
         struct au1xpsc_audio_data *pscdata = au1xpsc_ac97_workdata;
         unsigned long r, ro, stat;
-        int chans, stype = SUBSTREAM_TYPE(substream);
+        int chans, t, stype = SUBSTREAM_TYPE(substream);
 
         chans = params_channels(params);
 
@@ -237,8 +247,12 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
                 au_sync();
 
                 /* ...wait for it... */
-                while (au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR)
-                        asm volatile ("nop");
+                t = 100;
+                while ((au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR) && --t)
+                        msleep(1);
+
+                if (!t)
+                        printk(KERN_ERR "PSC-AC97: can't disable!\n");
 
                 /* ...write config... */
                 au_writel(r, AC97_CFG(pscdata));
@@ -249,8 +263,12 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
                 au_sync();
 
                 /* ...and wait for ready bit */
-                while (!(au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR))
-                        asm volatile ("nop");
+                t = 100;
+                while ((!(au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR)) && --t)
+                        msleep(1);
+
+                if (!t)
+                        printk(KERN_ERR "PSC-AC97: can't enable!\n");
 
                 mutex_unlock(&pscdata->lock);
 
@@ -300,19 +318,55 @@ static int au1xpsc_ac97_trigger(struct snd_pcm_substream *substream,
 static int au1xpsc_ac97_probe(struct platform_device *pdev,
                               struct snd_soc_dai *dai)
 {
+        return au1xpsc_ac97_workdata ? 0 : -ENODEV;
+}
+
+static void au1xpsc_ac97_remove(struct platform_device *pdev,
+                                struct snd_soc_dai *dai)
+{
+}
+
+static struct snd_soc_dai_ops au1xpsc_ac97_dai_ops = {
+        .trigger        = au1xpsc_ac97_trigger,
+        .hw_params      = au1xpsc_ac97_hw_params,
+};
+
+struct snd_soc_dai au1xpsc_ac97_dai = {
+        .name                   = "au1xpsc_ac97",
+        .ac97_control           = 1,
+        .probe                  = au1xpsc_ac97_probe,
+        .remove                 = au1xpsc_ac97_remove,
+        .playback = {
+                .rates          = AC97_RATES,
+                .formats        = AC97_FMTS,
+                .channels_min   = 2,
+                .channels_max   = 2,
+        },
+        .capture = {
+                .rates          = AC97_RATES,
+                .formats        = AC97_FMTS,
+                .channels_min   = 2,
+                .channels_max   = 2,
+        },
+        .ops = &au1xpsc_ac97_dai_ops,
+};
+EXPORT_SYMBOL_GPL(au1xpsc_ac97_dai);
+
+static int __devinit au1xpsc_ac97_drvprobe(struct platform_device *pdev)
+{
         int ret;
         struct resource *r;
         unsigned long sel;
+        struct au1xpsc_audio_data *wd;
 
         if (au1xpsc_ac97_workdata)
                 return -EBUSY;
 
-        au1xpsc_ac97_workdata =
-                kzalloc(sizeof(struct au1xpsc_audio_data), GFP_KERNEL);
-        if (!au1xpsc_ac97_workdata)
+        wd = kzalloc(sizeof(struct au1xpsc_audio_data), GFP_KERNEL);
+        if (!wd)
                 return -ENOMEM;
 
-        mutex_init(&au1xpsc_ac97_workdata->lock);
+        mutex_init(&wd->lock);
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!r) {
@@ -321,81 +375,95 @@ static int au1xpsc_ac97_probe(struct platform_device *pdev,
         }
 
         ret = -EBUSY;
-        au1xpsc_ac97_workdata->ioarea =
-                request_mem_region(r->start, r->end - r->start + 1,
+        wd->ioarea = request_mem_region(r->start, r->end - r->start + 1,
                                         "au1xpsc_ac97");
-        if (!au1xpsc_ac97_workdata->ioarea)
+        if (!wd->ioarea)
                 goto out0;
 
-        au1xpsc_ac97_workdata->mmio = ioremap(r->start, 0xffff);
-        if (!au1xpsc_ac97_workdata->mmio)
+        wd->mmio = ioremap(r->start, 0xffff);
+        if (!wd->mmio)
                 goto out1;
 
         /* configuration: max dma trigger threshold, enable ac97 */
-        au1xpsc_ac97_workdata->cfg = PSC_AC97CFG_RT_FIFO8 |
-                                     PSC_AC97CFG_TT_FIFO8 |
-                                     PSC_AC97CFG_DE_ENABLE;
+        wd->cfg = PSC_AC97CFG_RT_FIFO8 | PSC_AC97CFG_TT_FIFO8 |
+                  PSC_AC97CFG_DE_ENABLE;
 
-        /* preserve PSC clock source set up by platform (dev.platform_data
-         * is already occupied by soc layer)
-         */
-        sel = au_readl(PSC_SEL(au1xpsc_ac97_workdata)) & PSC_SEL_CLK_MASK;
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_ac97_workdata));
+        /* preserve PSC clock source set up by platform  */
+        sel = au_readl(PSC_SEL(wd)) & PSC_SEL_CLK_MASK;
+        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
         au_sync();
-        au_writel(0, PSC_SEL(au1xpsc_ac97_workdata));
+        au_writel(0, PSC_SEL(wd));
         au_sync();
-        au_writel(PSC_SEL_PS_AC97MODE | sel, PSC_SEL(au1xpsc_ac97_workdata));
+        au_writel(PSC_SEL_PS_AC97MODE | sel, PSC_SEL(wd));
         au_sync();
-        /* next up: cold reset.  Dont check for PSC-ready now since
-         * there may not be any codec clock yet.
-         */
 
-        return 0;
+        ret = snd_soc_register_dai(&au1xpsc_ac97_dai);
+        if (ret)
+                goto out1;
 
+        wd->dmapd = au1xpsc_pcm_add(pdev);
+        if (wd->dmapd) {
+                platform_set_drvdata(pdev, wd);
+                au1xpsc_ac97_workdata = wd;     /* MDEV */
+                return 0;
+        }
+
+        snd_soc_unregister_dai(&au1xpsc_ac97_dai);
 out1:
-        release_resource(au1xpsc_ac97_workdata->ioarea);
-        kfree(au1xpsc_ac97_workdata->ioarea);
+        release_resource(wd->ioarea);
+        kfree(wd->ioarea);
 out0:
-        kfree(au1xpsc_ac97_workdata);
-        au1xpsc_ac97_workdata = NULL;
+        kfree(wd);
         return ret;
 }
 
-static void au1xpsc_ac97_remove(struct platform_device *pdev,
-                                struct snd_soc_dai *dai)
+static int __devexit au1xpsc_ac97_drvremove(struct platform_device *pdev)
 {
+        struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);
+
+        if (wd->dmapd)
+                au1xpsc_pcm_destroy(wd->dmapd);
+
+        snd_soc_unregister_dai(&au1xpsc_ac97_dai);
+
         /* disable PSC completely */
-        au_writel(0, AC97_CFG(au1xpsc_ac97_workdata));
+        au_writel(0, AC97_CFG(wd));
         au_sync();
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_ac97_workdata));
+        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
         au_sync();
 
-        iounmap(au1xpsc_ac97_workdata->mmio);
-        release_resource(au1xpsc_ac97_workdata->ioarea);
-        kfree(au1xpsc_ac97_workdata->ioarea);
-        kfree(au1xpsc_ac97_workdata);
-        au1xpsc_ac97_workdata = NULL;
+        iounmap(wd->mmio);
+        release_resource(wd->ioarea);
+        kfree(wd->ioarea);
+        kfree(wd);
+
+        au1xpsc_ac97_workdata = NULL;   /* MDEV */
+
+        return 0;
 }
 
-static int au1xpsc_ac97_suspend(struct snd_soc_dai *dai)
+#ifdef CONFIG_PM
+static int au1xpsc_ac97_drvsuspend(struct device *dev)
 {
+        struct au1xpsc_audio_data *wd = dev_get_drvdata(dev);
+
         /* save interesting registers and disable PSC */
-        au1xpsc_ac97_workdata->pm[0] =
-                        au_readl(PSC_SEL(au1xpsc_ac97_workdata));
+        wd->pm[0] = au_readl(PSC_SEL(wd));
 
-        au_writel(0, AC97_CFG(au1xpsc_ac97_workdata));
+        au_writel(0, AC97_CFG(wd));
         au_sync();
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_ac97_workdata));
+        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
         au_sync();
 
         return 0;
 }
 
-static int au1xpsc_ac97_resume(struct snd_soc_dai *dai)
+static int au1xpsc_ac97_drvresume(struct device *dev)
 {
+        struct au1xpsc_audio_data *wd = dev_get_drvdata(dev);
+
         /* restore PSC clock config */
-        au_writel(au1xpsc_ac97_workdata->pm[0] | PSC_SEL_PS_AC97MODE,
-                        PSC_SEL(au1xpsc_ac97_workdata));
+        au_writel(wd->pm[0] | PSC_SEL_PS_AC97MODE, PSC_SEL(wd));
         au_sync();
 
         /* after this point the ac97 core will cold-reset the codec.
@@ -405,48 +473,44 @@ static int au1xpsc_ac97_resume(struct snd_soc_dai *dai)
         return 0;
 }
 
-static struct snd_soc_dai_ops au1xpsc_ac97_dai_ops = {
-        .trigger        = au1xpsc_ac97_trigger,
-        .hw_params      = au1xpsc_ac97_hw_params,
+static struct dev_pm_ops au1xpscac97_pmops = {
+        .suspend        = au1xpsc_ac97_drvsuspend,
+        .resume         = au1xpsc_ac97_drvresume,
 };
 
-struct snd_soc_dai au1xpsc_ac97_dai = {
-        .name                   = "au1xpsc_ac97",
-        .ac97_control           = 1,
-        .probe                  = au1xpsc_ac97_probe,
-        .remove                 = au1xpsc_ac97_remove,
-        .suspend                = au1xpsc_ac97_suspend,
-        .resume                 = au1xpsc_ac97_resume,
-        .playback = {
-                .rates          = AC97_RATES,
-                .formats        = AC97_FMTS,
-                .channels_min   = 2,
-                .channels_max   = 2,
-        },
-        .capture = {
-                .rates          = AC97_RATES,
-                .formats        = AC97_FMTS,
-                .channels_min   = 2,
-                .channels_max   = 2,
+#define AU1XPSCAC97_PMOPS &au1xpscac97_pmops
+
+#else
+
+#define AU1XPSCAC97_PMOPS NULL
+
+#endif
+
+static struct platform_driver au1xpsc_ac97_driver = {
+        .driver = {
+                .name   = "au1xpsc_ac97",
+                .owner  = THIS_MODULE,
+                .pm     = AU1XPSCAC97_PMOPS,
         },
-        .ops = &au1xpsc_ac97_dai_ops,
+        .probe          = au1xpsc_ac97_drvprobe,
+        .remove         = __devexit_p(au1xpsc_ac97_drvremove),
 };
-EXPORT_SYMBOL_GPL(au1xpsc_ac97_dai);
 
-static int __init au1xpsc_ac97_init(void)
+static int __init au1xpsc_ac97_load(void)
 {
         au1xpsc_ac97_workdata = NULL;
-        return snd_soc_register_dai(&au1xpsc_ac97_dai);
+        return platform_driver_register(&au1xpsc_ac97_driver);
 }
 
-static void __exit au1xpsc_ac97_exit(void)
+static void __exit au1xpsc_ac97_unload(void)
 {
-        snd_soc_unregister_dai(&au1xpsc_ac97_dai);
+        platform_driver_unregister(&au1xpsc_ac97_driver);
 }
 
-module_init(au1xpsc_ac97_init);
-module_exit(au1xpsc_ac97_exit);
+module_init(au1xpsc_ac97_load);
+module_exit(au1xpsc_ac97_unload);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Au12x0/Au1550 PSC AC97 ALSA ASoC audio driver");
-MODULE_AUTHOR("Manuel Lauss <manuel.lauss@gmail.com>");
+MODULE_AUTHOR("Manuel Lauss");
+