[ALSA] Correct detection of iBook G4 1420Mhz soundcard
[linux-2.6.git] / sound / ppc / pmac.c
index f9a9601..9774e56 100644 (file)
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include "pmac.h"
 #include <sound/pcm_params.h>
-#ifdef CONFIG_PPC_HAS_FEATURE_CALLS
 #include <asm/pmac_feature.h>
-#else
-#include <asm/feature.h>
-#endif
+#include <asm/pci-bridge.h>
 
 
-#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK)
+#ifdef CONFIG_PM
 static int snd_pmac_register_sleep_notifier(pmac_t *chip);
 static int snd_pmac_unregister_sleep_notifier(pmac_t *chip);
 static int snd_pmac_suspend(snd_card_t *card, pm_message_t state);
@@ -57,22 +56,29 @@ static int tumbler_freqs[1] = {
 /*
  * allocate DBDMA command arrays
  */
-static int snd_pmac_dbdma_alloc(pmac_dbdma_t *rec, int size)
+static int snd_pmac_dbdma_alloc(pmac_t *chip, pmac_dbdma_t *rec, int size)
 {
-       rec->space = kmalloc(sizeof(struct dbdma_cmd) * (size + 1), GFP_KERNEL);
+       unsigned int rsize = sizeof(struct dbdma_cmd) * (size + 1);
+
+       rec->space = dma_alloc_coherent(&chip->pdev->dev, rsize,
+                                       &rec->dma_base, GFP_KERNEL);
        if (rec->space == NULL)
                return -ENOMEM;
        rec->size = size;
-       memset(rec->space, 0, sizeof(struct dbdma_cmd) * (size + 1));
+       memset(rec->space, 0, rsize);
        rec->cmds = (void __iomem *)DBDMA_ALIGN(rec->space);
-       rec->addr = virt_to_bus(rec->cmds);
+       rec->addr = rec->dma_base + (unsigned long)((char *)rec->cmds - (char *)rec->space);
+
        return 0;
 }
 
-static void snd_pmac_dbdma_free(pmac_dbdma_t *rec)
+static void snd_pmac_dbdma_free(pmac_t *chip, pmac_dbdma_t *rec)
 {
-       if (rec)
-               kfree(rec->space);
+       if (rec) {
+               unsigned int rsize = sizeof(struct dbdma_cmd) * (rec->size + 1);
+
+               dma_free_coherent(&chip->pdev->dev, rsize, rec->space, rec->dma_base);
+       }
 }
 
 
@@ -147,7 +153,7 @@ static pmac_stream_t *snd_pmac_get_stream(pmac_t *chip, int stream)
 /*
  * wait while run status is on
  */
-inline static void
+static inline void
 snd_pmac_wait_ack(pmac_stream_t *rec)
 {
        int timeout = 50000;
@@ -171,7 +177,7 @@ static void snd_pmac_pcm_set_format(pmac_t *chip)
 /*
  * stop the DMA transfer
  */
-inline static void snd_pmac_dma_stop(pmac_stream_t *rec)
+static inline void snd_pmac_dma_stop(pmac_stream_t *rec)
 {
        out_le32(&rec->dma->control, (RUN|WAKE|FLUSH|PAUSE) << 16);
        snd_pmac_wait_ack(rec);
@@ -180,7 +186,7 @@ inline static void snd_pmac_dma_stop(pmac_stream_t *rec)
 /*
  * set the command pointer address
  */
-inline static void snd_pmac_dma_set_command(pmac_stream_t *rec, pmac_dbdma_t *cmd)
+static inline void snd_pmac_dma_set_command(pmac_stream_t *rec, pmac_dbdma_t *cmd)
 {
        out_le32(&rec->dma->cmdptr, cmd->addr);
 }
@@ -188,7 +194,7 @@ inline static void snd_pmac_dma_set_command(pmac_stream_t *rec, pmac_dbdma_t *cm
 /*
  * start the DMA
  */
-inline static void snd_pmac_dma_run(pmac_stream_t *rec, int status)
+static inline void snd_pmac_dma_run(pmac_stream_t *rec, int status)
 {
        out_le32(&rec->dma->control, status | (status << 16));
 }
@@ -237,7 +243,7 @@ static int snd_pmac_pcm_prepare(pmac_t *chip, pmac_stream_t *rec, snd_pcm_substr
        /* continuous DMA memory type doesn't provide the physical address,
         * so we need to resolve the address here...
         */
-       offset = virt_to_bus(runtime->dma_area);
+       offset = runtime->dma_addr;
        for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++) {
                st_le32(&cp->phy_addr, offset);
                st_le16(&cp->req_count, rec->period_size);
@@ -664,8 +670,8 @@ int __init snd_pmac_pcm_new(pmac_t *chip)
        chip->capture.cur_freqs = chip->freqs_ok;
 
        /* preallocate 64k buffer */
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, 
-                                             snd_dma_continuous_data(GFP_KERNEL),
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                             &chip->pdev->dev,
                                              64 * 1024, 64 * 1024);
 
        return 0;
@@ -757,28 +763,11 @@ snd_pmac_ctrl_intr(int irq, void *devid, struct pt_regs *regs)
 /*
  * a wrapper to feature call for compatibility
  */
-#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK)
 static void snd_pmac_sound_feature(pmac_t *chip, int enable)
 {
-#ifdef CONFIG_PPC_HAS_FEATURE_CALLS
-       ppc_md.feature_call(PMAC_FTR_SOUND_CHIP_ENABLE, chip->node, 0, enable);
-#else
-       if (chip->is_pbook_G3) {
-               pmu_suspend();
-               feature_clear(chip->node, FEATURE_Sound_power);
-               feature_clear(chip->node, FEATURE_Sound_CLK_enable);
-               big_mdelay(1000); /* XXX */
-               pmu_resume();
-       }
-       if (chip->is_pbook_3400) {
-               feature_set(chip->node, FEATURE_IOBUS_enable);
-               udelay(10);
-       }
-#endif
+       if (ppc_md.feature_call)
+               ppc_md.feature_call(PMAC_FTR_SOUND_CHIP_ENABLE, chip->node, 0, enable);
 }
-#else /* CONFIG_PM && CONFIG_PMAC_PBOOK */
-#define snd_pmac_sound_feature(chip,enable) /**/
-#endif /* CONFIG_PM && CONFIG_PMAC_PBOOK */
 
 /*
  * release resources
@@ -786,8 +775,6 @@ static void snd_pmac_sound_feature(pmac_t *chip, int enable)
 
 static int snd_pmac_free(pmac_t *chip)
 {
-       int i;
-
        /* stop sounds */
        if (chip->initialized) {
                snd_pmac_dbdma_reset(chip);
@@ -796,7 +783,7 @@ static int snd_pmac_free(pmac_t *chip)
        }
 
        snd_pmac_sound_feature(chip, 0);
-#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK)
+#ifdef CONFIG_PM
        snd_pmac_unregister_sleep_notifier(chip);
 #endif
 
@@ -813,9 +800,9 @@ static int snd_pmac_free(pmac_t *chip)
                free_irq(chip->tx_irq, (void*)chip);
        if (chip->rx_irq >= 0)
                free_irq(chip->rx_irq, (void*)chip);
-       snd_pmac_dbdma_free(&chip->playback.cmd);
-       snd_pmac_dbdma_free(&chip->capture.cmd);
-       snd_pmac_dbdma_free(&chip->extra_dma);
+       snd_pmac_dbdma_free(chip, &chip->playback.cmd);
+       snd_pmac_dbdma_free(chip, &chip->capture.cmd);
+       snd_pmac_dbdma_free(chip, &chip->extra_dma);
        if (chip->macio_base)
                iounmap(chip->macio_base);
        if (chip->latch_base)
@@ -826,12 +813,23 @@ static int snd_pmac_free(pmac_t *chip)
                iounmap(chip->playback.dma);
        if (chip->capture.dma)
                iounmap(chip->capture.dma);
+#ifndef CONFIG_PPC64
        if (chip->node) {
+               int i;
+
                for (i = 0; i < 3; i++) {
-                       if (chip->of_requested & (1 << i))
-                               release_OF_resource(chip->node, i);
+                       if (chip->of_requested & (1 << i)) {
+                               if (chip->is_k2)
+                                       release_OF_resource(chip->node->parent,
+                                                           i);
+                               else
+                                       release_OF_resource(chip->node, i);
+                       }
                }
        }
+#endif /* CONFIG_PPC64 */
+       if (chip->pdev)
+               pci_dev_put(chip->pdev);
        kfree(chip);
        return 0;
 }
@@ -879,8 +877,10 @@ static void __init detect_byte_swap(pmac_t *chip)
  */
 static int __init snd_pmac_detect(pmac_t *chip)
 {
-       struct device_node *sound;
+       struct device_node *sound = NULL;
        unsigned int *prop, l;
+       struct macio_chip* macio;
+
        u32 layout_id = 0;
 
        if (_machine != _MACH_Pmac)
@@ -907,24 +907,35 @@ static int __init snd_pmac_detect(pmac_t *chip)
                chip->is_pbook_G3 = 1;
        chip->node = find_devices("awacs");
        if (chip->node)
-               return 0; /* ok */
+               sound = chip->node;
 
        /*
         * powermac G3 models have a node called "davbus"
         * with a child called "sound".
         */
-       chip->node = find_devices("davbus");
+       if (!chip->node)
+               chip->node = find_devices("davbus");
        /*
         * if we didn't find a davbus device, try 'i2s-a' since
         * this seems to be what iBooks have
         */
-       if (! chip->node)
+       if (! chip->node) {
                chip->node = find_devices("i2s-a");
+               if (chip->node && chip->node->parent &&
+                   chip->node->parent->parent) {
+                       if (device_is_compatible(chip->node->parent->parent,
+                                                "K2-Keylargo"))
+                               chip->is_k2 = 1;
+               }
+       }
        if (! chip->node)
                return -ENODEV;
-       sound = find_devices("sound");
-       while (sound && sound->parent != chip->node)
-               sound = sound->next;
+
+       if (!sound) {
+               sound = find_devices("sound");
+               while (sound && sound->parent != chip->node)
+                       sound = sound->next;
+       }
        if (! sound)
                return -ENODEV;
        prop = (unsigned int *) get_property(sound, "sub-frame", NULL);
@@ -966,7 +977,8 @@ static int __init snd_pmac_detect(pmac_t *chip)
                chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
        }
        if (device_is_compatible(sound, "AOAKeylargo") ||
-           device_is_compatible(sound, "AOAbase")) {
+           device_is_compatible(sound, "AOAbase") ||
+           device_is_compatible(sound, "AOAK2")) {
                /* For now, only support very basic TAS3004 based machines with
                 * single frequency until proper i2s control is implemented
                 */
@@ -975,10 +987,18 @@ static int __init snd_pmac_detect(pmac_t *chip)
                case 0x46:
                case 0x33:
                case 0x29:
+               case 0x24:
+               case 0x5c:
                        chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
                        chip->model = PMAC_SNAPPER;
                        chip->can_byte_swap = 0; /* FIXME: check this */
-                       chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
+                       chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
+                       break;
+               case 0x3a:
+                       chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
+                       chip->model = PMAC_TOONIE;
+                       chip->can_byte_swap = 0; /* FIXME: check this */
+                       chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
                        break;
                }
        }
@@ -987,13 +1007,35 @@ static int __init snd_pmac_detect(pmac_t *chip)
                chip->device_id = *prop;
        chip->has_iic = (find_devices("perch") != NULL);
 
+       /* We need the PCI device for DMA allocations, let's use a crude method
+        * for now ...
+        */
+       macio = macio_find(chip->node, macio_unknown);
+       if (macio == NULL)
+               printk(KERN_WARNING "snd-powermac: can't locate macio !\n");
+       else {
+               struct pci_dev *pdev = NULL;
+
+               for_each_pci_dev(pdev) {
+                       struct device_node *np = pci_device_to_OF_node(pdev);
+                       if (np && np == macio->of_node) {
+                               chip->pdev = pdev;
+                               break;
+                       }
+               }
+       }
+       if (chip->pdev == NULL)
+               printk(KERN_WARNING "snd-powermac: can't locate macio PCI"
+                      " device !\n");
+
        detect_byte_swap(chip);
 
        /* look for a property saying what sample rates
           are available */
        prop = (unsigned int *) get_property(sound, "sample-rates", &l);
        if (! prop)
-               prop = (unsigned int *) get_property(sound, "output-frame-rates", &l);
+               prop = (unsigned int *) get_property(sound,
+                                                    "output-frame-rates", &l);
        if (prop) {
                int i;
                chip->freqs_ok = 0;
@@ -1020,7 +1062,8 @@ static int __init snd_pmac_detect(pmac_t *chip)
 /*
  * exported - boolean info callbacks for ease of programming
  */
-int snd_pmac_boolean_stereo_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+int snd_pmac_boolean_stereo_info(snd_kcontrol_t *kcontrol,
+                                snd_ctl_elem_info_t *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
        uinfo->count = 2;
@@ -1029,7 +1072,8 @@ int snd_pmac_boolean_stereo_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
        return 0;
 }
 
-int snd_pmac_boolean_mono_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+int snd_pmac_boolean_mono_info(snd_kcontrol_t *kcontrol,
+                              snd_ctl_elem_info_t *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
        uinfo->count = 1;
@@ -1091,8 +1135,10 @@ int __init snd_pmac_add_automute(pmac_t *chip)
        int err;
        chip->auto_mute = 1;
        err = snd_ctl_add(chip->card, snd_ctl_new1(&auto_mute_controls[0], chip));
-       if (err < 0)
+       if (err < 0) {
+               printk(KERN_ERR "snd-powermac: Failed to add automute control\n");
                return err;
+       }
        chip->hp_detect_ctl = snd_ctl_new1(&auto_mute_controls[1], chip);
        return snd_ctl_add(chip->card, chip->hp_detect_ctl);
 }
@@ -1106,6 +1152,7 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
        pmac_t *chip;
        struct device_node *np;
        int i, err;
+       unsigned long ctrl_addr, txdma_addr, rxdma_addr;
        static snd_device_ops_t ops = {
                .dev_free =     snd_pmac_dev_free,
        };
@@ -1127,32 +1174,59 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
        if ((err = snd_pmac_detect(chip)) < 0)
                goto __error;
 
-       if (snd_pmac_dbdma_alloc(&chip->playback.cmd, PMAC_MAX_FRAGS + 1) < 0 ||
-           snd_pmac_dbdma_alloc(&chip->capture.cmd, PMAC_MAX_FRAGS + 1) < 0 ||
-           snd_pmac_dbdma_alloc(&chip->extra_dma, 2) < 0) {
+       if (snd_pmac_dbdma_alloc(chip, &chip->playback.cmd, PMAC_MAX_FRAGS + 1) < 0 ||
+           snd_pmac_dbdma_alloc(chip, &chip->capture.cmd, PMAC_MAX_FRAGS + 1) < 0 ||
+           snd_pmac_dbdma_alloc(chip, &chip->extra_dma, 2) < 0) {
                err = -ENOMEM;
                goto __error;
        }
 
        np = chip->node;
-       if (np->n_addrs < 3 || np->n_intrs < 3) {
-               err = -ENODEV;
-               goto __error;
-       }
+       if (chip->is_k2) {
+               if (np->parent->n_addrs < 2 || np->n_intrs < 3) {
+                       err = -ENODEV;
+                       goto __error;
+               }
+               for (i = 0; i < 2; i++) {
+#ifndef CONFIG_PPC64
+                       static char *name[2] = { "- Control", "- DMA" };
+                       if (! request_OF_resource(np->parent, i, name[i])) {
+                               snd_printk(KERN_ERR "pmac: can't request resource %d!\n", i);
+                               err = -ENODEV;
+                               goto __error;
+                       }
+                       chip->of_requested |= (1 << i);
+#endif /* CONFIG_PPC64 */
+                       ctrl_addr = np->parent->addrs[0].address;
+                       txdma_addr = np->parent->addrs[1].address;
+                       rxdma_addr = txdma_addr + 0x100;
+               }
 
-       for (i = 0; i < 3; i++) {
-               static char *name[3] = { NULL, "- Tx DMA", "- Rx DMA" };
-               if (! request_OF_resource(np, i, name[i])) {
-                       snd_printk(KERN_ERR "pmac: can't request resource %d!\n", i);
+       } else {
+               if (np->n_addrs < 3 || np->n_intrs < 3) {
                        err = -ENODEV;
                        goto __error;
                }
-               chip->of_requested |= (1 << i);
+
+               for (i = 0; i < 3; i++) {
+#ifndef CONFIG_PPC64
+                       static char *name[3] = { "- Control", "- Tx DMA", "- Rx DMA" };
+                       if (! request_OF_resource(np, i, name[i])) {
+                               snd_printk(KERN_ERR "pmac: can't request resource %d!\n", i);
+                               err = -ENODEV;
+                               goto __error;
+                       }
+                       chip->of_requested |= (1 << i);
+#endif /* CONFIG_PPC64 */
+                       ctrl_addr = np->addrs[0].address;
+                       txdma_addr = np->addrs[1].address;
+                       rxdma_addr = np->addrs[2].address;
+               }
        }
 
-       chip->awacs = ioremap(np->addrs[0].address, 0x1000);
-       chip->playback.dma = ioremap(np->addrs[1].address, 0x100);
-       chip->capture.dma = ioremap(np->addrs[2].address, 0x100);
+       chip->awacs = ioremap(ctrl_addr, 0x1000);
+       chip->playback.dma = ioremap(txdma_addr, 0x100);
+       chip->capture.dma = ioremap(rxdma_addr, 0x100);
        if (chip->model <= PMAC_BURGUNDY) {
                if (request_irq(np->intrs[0].line, snd_pmac_ctrl_intr, 0,
                                "PMac", (void*)chip)) {
@@ -1180,7 +1254,8 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
        snd_pmac_sound_feature(chip, 1);
 
        /* reset */
-       out_le32(&chip->awacs->control, 0x11);
+       if (chip->model == PMAC_AWACS)
+               out_le32(&chip->awacs->control, 0x11);
 
        /* Powerbooks have odd ways of enabling inputs such as
           an expansion-bay CD or sound from an internal modem
@@ -1219,7 +1294,7 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
        /* Reset dbdma channels */
        snd_pmac_dbdma_reset(chip);
 
-#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK)
+#ifdef CONFIG_PM
        /* add sleep notifier */
        if (! snd_pmac_register_sleep_notifier(chip))
                snd_card_set_pm_callback(chip->card, snd_pmac_suspend, snd_pmac_resume, chip);
@@ -1232,6 +1307,8 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
        return 0;
 
  __error:
+       if (chip->pdev)
+               pci_dev_put(chip->pdev);
        snd_pmac_free(chip);
        return err;
 }
@@ -1241,7 +1318,7 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
  * sleep notify for powerbook
  */
 
-#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK)
+#ifdef CONFIG_PM
 
 /*
  * Save state when going to sleep, restore it afterwards.
@@ -1339,4 +1416,5 @@ static int snd_pmac_unregister_sleep_notifier(pmac_t *chip)
        return 0;
 }
 
-#endif /* CONFIG_PM && CONFIG_PMAC_PBOOK */
+#endif /* CONFIG_PM */
+