RCU: Remove prototype for nonexistent function synchronize_idle()
[linux-3.10.git] / sound / arm / pxa2xx-ac97.c
index 29450be..7bc2767 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/wait.h>
 #include <linux/delay.h>
@@ -25,7 +25,7 @@
 #include <sound/initval.h>
 
 #include <asm/irq.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/audio.h>
 #include "pxa2xx-pcm.h"
 
 
-static DECLARE_MUTEX(car_mutex);
+static DEFINE_MUTEX(car_mutex);
 static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);
 static volatile long gsr_bits;
 
-static unsigned short pxa2xx_ac97_read(ac97_t *ac97, unsigned short reg)
+/*
+ * Beware PXA27x bugs:
+ *
+ *   o Slot 12 read from modem space will hang controller.
+ *   o CDONE, SDONE interrupt fails after any slot 12 IO.
+ *
+ * We therefore have an hybrid approach for waiting on SDONE (interrupt or
+ * 1 jiffy timeout if interrupt never comes).
+ */ 
+
+static unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
 {
        unsigned short val = -1;
        volatile u32 *reg_addr;
 
-       down(&car_mutex);
-       if (CAR & CAR_CAIP) {
-               printk(KERN_CRIT"%s: CAR_CAIP already set\n", __FUNCTION__);
-               goto out;
-       }
+       mutex_lock(&car_mutex);
 
        /* set up primary or secondary codec space */
        reg_addr = (ac97->num & 1) ? &SAC_REG_BASE : &PAC_REG_BASE;
        reg_addr += (reg >> 1);
 
        /* start read access across the ac97 link */
+       GSR = GSR_CDONE | GSR_SDONE;
        gsr_bits = 0;
        val = *reg_addr;
        if (reg == AC97_GPIO_STATUS)
                goto out;
-       wait_event_timeout(gsr_wq, gsr_bits & GSR_SDONE, 1);
-       if (!gsr_bits & GSR_SDONE) {
+       if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1) <= 0 &&
+           !((GSR | gsr_bits) & GSR_SDONE)) {
                printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n",
-                               __FUNCTION__, reg, gsr_bits);
+                               __FUNCTION__, reg, GSR | gsr_bits);
                val = -1;
                goto out;
        }
 
        /* valid data now */
+       GSR = GSR_CDONE | GSR_SDONE;
        gsr_bits = 0;
        val = *reg_addr;                        
        /* but we've just started another cycle... */
-       wait_event_timeout(gsr_wq, gsr_bits & GSR_SDONE, 1);
+       wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1);
 
-out:   up(&car_mutex);
+out:   mutex_unlock(&car_mutex);
        return val;
 }
 
-static void pxa2xx_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val)
+static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)
 {
        volatile u32 *reg_addr;
 
-       down(&car_mutex);
-
-       if (CAR & CAR_CAIP) {
-               printk(KERN_CRIT "%s: CAR_CAIP already set\n", __FUNCTION__);
-               goto out;
-       }
+       mutex_lock(&car_mutex);
 
        /* set up primary or secondary codec space */
        reg_addr = (ac97->num & 1) ? &SAC_REG_BASE : &PAC_REG_BASE;
        reg_addr += (reg >> 1);
+
+       GSR = GSR_CDONE | GSR_SDONE;
        gsr_bits = 0;
        *reg_addr = val;
-       wait_event_timeout(gsr_wq, gsr_bits & GSR_CDONE, 1);
-       if (!gsr_bits & GSR_SDONE)
+       if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1) <= 0 &&
+           !((GSR | gsr_bits) & GSR_CDONE))
                printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n",
-                               __FUNCTION__, reg, gsr_bits);
+                               __FUNCTION__, reg, GSR | gsr_bits);
 
-out:   up(&car_mutex);
+       mutex_unlock(&car_mutex);
 }
 
-static void pxa2xx_ac97_reset(ac97_t *ac97)
+static void pxa2xx_ac97_reset(struct snd_ac97 *ac97)
 {
        /* First, try cold reset */
        GCR &=  GCR_COLD_RST;  /* clear everything but nCRST */
@@ -147,7 +152,7 @@ static void pxa2xx_ac97_reset(ac97_t *ac97)
        GCR |= GCR_SDONE_IE|GCR_CDONE_IE;
 }
 
-static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)
 {
        long status;
 
@@ -172,13 +177,13 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id, struct pt_regs *regs)
        return IRQ_NONE;
 }
 
-static ac97_bus_ops_t pxa2xx_ac97_ops = {
+static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
        .read   = pxa2xx_ac97_read,
        .write  = pxa2xx_ac97_write,
        .reset  = pxa2xx_ac97_reset,
 };
 
-static pxa2xx_pcm_dma_params_t pxa2xx_ac97_pcm_out = {
+static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = {
        .name                   = "AC97 PCM out",
        .dev_addr               = __PREG(PCDR),
        .drcmr                  = &DRCMRTXPCDR,
@@ -186,7 +191,7 @@ static pxa2xx_pcm_dma_params_t pxa2xx_ac97_pcm_out = {
                                  DCMD_BURST32 | DCMD_WIDTH4,
 };
 
-static pxa2xx_pcm_dma_params_t pxa2xx_ac97_pcm_in = {
+static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_in = {
        .name                   = "AC97 PCM in",
        .dev_addr               = __PREG(PCDR),
        .drcmr                  = &DRCMRRXPCDR,
@@ -194,12 +199,12 @@ static pxa2xx_pcm_dma_params_t pxa2xx_ac97_pcm_in = {
                                  DCMD_BURST32 | DCMD_WIDTH4,
 };
 
-static snd_pcm_t *pxa2xx_ac97_pcm;
-static ac97_t *pxa2xx_ac97_ac97;
+static struct snd_pcm *pxa2xx_ac97_pcm;
+static struct snd_ac97 *pxa2xx_ac97_ac97;
 
-static int pxa2xx_ac97_pcm_startup(snd_pcm_substream_t *substream)
+static int pxa2xx_ac97_pcm_startup(struct snd_pcm_substream *substream)
 {
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct snd_pcm_runtime *runtime = substream->runtime;
        pxa2xx_audio_ops_t *platform_ops;
        int r;
 
@@ -218,7 +223,7 @@ static int pxa2xx_ac97_pcm_startup(snd_pcm_substream_t *substream)
                return 0;
 }
 
-static void pxa2xx_ac97_pcm_shutdown(snd_pcm_substream_t *substream)
+static void pxa2xx_ac97_pcm_shutdown(struct snd_pcm_substream *substream)
 {
        pxa2xx_audio_ops_t *platform_ops;
 
@@ -227,15 +232,15 @@ static void pxa2xx_ac97_pcm_shutdown(snd_pcm_substream_t *substream)
                platform_ops->shutdown(substream, platform_ops->priv);
 }
 
-static int pxa2xx_ac97_pcm_prepare(snd_pcm_substream_t *substream)
+static int pxa2xx_ac97_pcm_prepare(struct snd_pcm_substream *substream)
 {
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct snd_pcm_runtime *runtime = substream->runtime;
        int reg = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
                  AC97_PCM_FRONT_DAC_RATE : AC97_PCM_LR_ADC_RATE;
        return snd_ac97_set_rate(pxa2xx_ac97_ac97, reg, runtime->rate);
 }
 
-static pxa2xx_pcm_client_t pxa2xx_ac97_pcm_client = {
+static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = {
        .playback_params        = &pxa2xx_ac97_pcm_out,
        .capture_params         = &pxa2xx_ac97_pcm_in,
        .startup                = pxa2xx_ac97_pcm_startup,
@@ -245,53 +250,51 @@ static pxa2xx_pcm_client_t pxa2xx_ac97_pcm_client = {
 
 #ifdef CONFIG_PM
 
-static int pxa2xx_ac97_do_suspend(snd_card_t *card, unsigned int state)
+static int pxa2xx_ac97_do_suspend(struct snd_card *card, pm_message_t state)
 {
-       if (card->power_state != SNDRV_CTL_POWER_D3cold) {
-               pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
-               snd_pcm_suspend_all(pxa2xx_ac97_pcm);
-               snd_ac97_suspend(pxa2xx_ac97_ac97);
-               snd_power_change_state(card, SNDRV_CTL_POWER_D3cold);
-               if (platform_ops && platform_ops->suspend)
-                       platform_ops->suspend(platform_ops->priv);
-               GCR |= GCR_ACLINK_OFF;
-               pxa_set_cken(CKEN2_AC97, 0);
-       }
+       pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
+
+       snd_power_change_state(card, SNDRV_CTL_POWER_D3cold);
+       snd_pcm_suspend_all(pxa2xx_ac97_pcm);
+       snd_ac97_suspend(pxa2xx_ac97_ac97);
+       if (platform_ops && platform_ops->suspend)
+               platform_ops->suspend(platform_ops->priv);
+       GCR |= GCR_ACLINK_OFF;
+       pxa_set_cken(CKEN_AC97, 0);
 
        return 0;
 }
 
-static int pxa2xx_ac97_do_resume(snd_card_t *card)
+static int pxa2xx_ac97_do_resume(struct snd_card *card)
 {
-       if (card->power_state != SNDRV_CTL_POWER_D0) {
-               pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
-               pxa_set_cken(CKEN2_AC97, 1);
-               if (platform_ops && platform_ops->resume)
-                       platform_ops->resume(platform_ops->priv);
-               snd_ac97_resume(pxa2xx_ac97_ac97);
-               snd_power_change_state(card, SNDRV_CTL_POWER_D0);
-       }
+       pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
+
+       pxa_set_cken(CKEN_AC97, 1);
+       if (platform_ops && platform_ops->resume)
+               platform_ops->resume(platform_ops->priv);
+       snd_ac97_resume(pxa2xx_ac97_ac97);
+       snd_power_change_state(card, SNDRV_CTL_POWER_D0);
 
        return 0;
 }
 
-static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state, u32 level)
+static int pxa2xx_ac97_suspend(struct platform_device *dev, pm_message_t state)
 {
-       snd_card_t *card = dev_get_drvdata(_dev);
+       struct snd_card *card = platform_get_drvdata(dev);
        int ret = 0;
 
-       if (card && level == SUSPEND_DISABLE)
+       if (card)
                ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);
 
        return ret;
 }
 
-static int pxa2xx_ac97_resume(struct device *_dev, u32 level)
+static int pxa2xx_ac97_resume(struct platform_device *dev)
 {
-       snd_card_t *card = dev_get_drvdata(_dev);
+       struct snd_card *card = platform_get_drvdata(dev);
        int ret = 0;
 
-       if (card && level == RESUME_ENABLE)
+       if (card)
                ret = pxa2xx_ac97_do_resume(card);
 
        return ret;
@@ -302,11 +305,11 @@ static int pxa2xx_ac97_resume(struct device *_dev, u32 level)
 #define pxa2xx_ac97_resume     NULL
 #endif
 
-static int pxa2xx_ac97_probe(struct device *dev)
+static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
 {
-       snd_card_t *card;
-       ac97_bus_t *ac97_bus;
-       ac97_template_t ac97_template;
+       struct snd_card *card;
+       struct snd_ac97_bus *ac97_bus;
+       struct snd_ac97_template ac97_template;
        int ret;
 
        ret = -ENOMEM;
@@ -315,8 +318,8 @@ static int pxa2xx_ac97_probe(struct device *dev)
        if (!card)
                goto err;
 
-       card->dev = dev;
-       strncpy(card->driver, dev->driver->name, sizeof(card->driver));
+       card->dev = &dev->dev;
+       strncpy(card->driver, dev->dev.driver->name, sizeof(card->driver));
 
        ret = pxa2xx_pcm_new(card, &pxa2xx_ac97_pcm_client, &pxa2xx_ac97_pcm);
        if (ret)
@@ -334,7 +337,7 @@ static int pxa2xx_ac97_probe(struct device *dev)
        /* Use GPIO 113 as AC97 Reset on Bulverde */
        pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
 #endif
-       pxa_set_cken(CKEN2_AC97, 1);
+       pxa_set_cken(CKEN_AC97, 1);
 
        ret = snd_ac97_bus(card, 0, &pxa2xx_ac97_ops, NULL, &ac97_bus);
        if (ret)
@@ -347,59 +350,58 @@ static int pxa2xx_ac97_probe(struct device *dev)
        snprintf(card->shortname, sizeof(card->shortname),
                 "%s", snd_ac97_get_short_name(pxa2xx_ac97_ac97));
        snprintf(card->longname, sizeof(card->longname),
-                "%s (%s)", dev->driver->name, card->mixername);
+                "%s (%s)", dev->dev.driver->name, card->mixername);
 
-       snd_card_set_pm_callback(card, pxa2xx_ac97_do_suspend,
-                                pxa2xx_ac97_do_resume, NULL);
        ret = snd_card_register(card);
        if (ret == 0) {
-               dev_set_drvdata(dev, card);
+               platform_set_drvdata(dev, card);
                return 0;
        }
 
  err:
        if (card)
                snd_card_free(card);
-       if (CKEN & CKEN2_AC97) {
+       if (CKEN & (1 << CKEN_AC97)) {
                GCR |= GCR_ACLINK_OFF;
                free_irq(IRQ_AC97, NULL);
-               pxa_set_cken(CKEN2_AC97, 0);
+               pxa_set_cken(CKEN_AC97, 0);
        }
        return ret;
 }
 
-static int pxa2xx_ac97_remove(struct device *dev)
+static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
 {
-       snd_card_t *card = dev_get_drvdata(dev);
+       struct snd_card *card = platform_get_drvdata(dev);
 
        if (card) {
                snd_card_free(card);
-               dev_set_drvdata(dev, NULL);
+               platform_set_drvdata(dev, NULL);
                GCR |= GCR_ACLINK_OFF;
                free_irq(IRQ_AC97, NULL);
-               pxa_set_cken(CKEN2_AC97, 0);
+               pxa_set_cken(CKEN_AC97, 0);
        }
 
        return 0;
 }
 
-static struct device_driver pxa2xx_ac97_driver = {
-       .name           = "pxa2xx-ac97",
-       .bus            = &platform_bus_type,
+static struct platform_driver pxa2xx_ac97_driver = {
        .probe          = pxa2xx_ac97_probe,
-       .remove         = pxa2xx_ac97_remove,
+       .remove         = __devexit_p(pxa2xx_ac97_remove),
        .suspend        = pxa2xx_ac97_suspend,
        .resume         = pxa2xx_ac97_resume,
+       .driver         = {
+               .name   = "pxa2xx-ac97",
+       },
 };
 
 static int __init pxa2xx_ac97_init(void)
 {
-       return driver_register(&pxa2xx_ac97_driver);
+       return platform_driver_register(&pxa2xx_ac97_driver);
 }
 
 static void __exit pxa2xx_ac97_exit(void)
 {
-       driver_unregister(&pxa2xx_ac97_driver);
+       platform_driver_unregister(&pxa2xx_ac97_driver);
 }
 
 module_init(pxa2xx_ac97_init);