[PATCH] powerpc: Remove device_node addrs/n_addr

The pre-parsed addrs/n_addrs fields in struct device_node are finally
gone. Remove the dodgy heuristics that did that parsing at boot and
remove the fields themselves since we now have a good replacement with
the new OF parsing code. This patch also fixes a bunch of drivers to use
the new code instead, so that at least pmac32, pseries, iseries and g5
defconfigs build.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 114 insertions, 70 deletions

diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index cebd881b91ae..74f975676ccb 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -125,6 +125,7 @@ static int awacs_rate_index;
 static int awacs_subframe;
 static struct device_node* awacs_node;
 static struct device_node* i2s_node;
+static struct resource awacs_rsrc[3];
 
 static char awacs_name[64];
 static int awacs_revision;
@@ -667,9 +668,12 @@ static void PMacIrqCleanup(void)
         iounmap(awacs_txdma);
         iounmap(awacs_rxdma);
 
-        release_OF_resource(awacs_node, 0);
-        release_OF_resource(awacs_node, 1);
-        release_OF_resource(awacs_node, 2);
+        release_mem_region(awacs_rsrc[0].start,
+                           awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
+        release_mem_region(awacs_rsrc[1].start,
+                           awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
+        release_mem_region(awacs_rsrc[2].start,
+                           awacs_rsrc[2].end - awacs_rsrc[2].start + 1);
 
         kfree(awacs_tx_cmd_space);
         kfree(awacs_rx_cmd_space);
@@ -2863,46 +2867,58 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
          * other info if necessary (early AWACS we want to read chip ids)
          */
 
-        if (io->n_addrs < 3 || io->n_intrs < 3) {
+        if (of_get_address(io, 2, NULL, NULL) == NULL || io->n_intrs < 3) {
                 /* OK - maybe we need to use the 'awacs' node (on earlier
                  * machines).
-                */
+                 */
                 if (awacs_node) {
                         io = awacs_node ;
-                        if (io->n_addrs < 3 || io->n_intrs < 3) {
-                                printk("dmasound_pmac: can't use %s"
-                                        " (%d addrs, %d intrs)\n",
-                                 io->full_name, io->n_addrs, io->n_intrs);
+                        if (of_get_address(io, 2, NULL, NULL) == NULL ||
+                            io->n_intrs < 3) {
+                                printk("dmasound_pmac: can't use %s\n",
+                                       io->full_name);
                                 return -ENODEV;
                         }
-                } else {
-                        printk("dmasound_pmac: can't use %s (%d addrs, %d intrs)\n",
-                              io->full_name, io->n_addrs, io->n_intrs);
-                }
+                } else
+                        printk("dmasound_pmac: can't use %s\n", io->full_name);
         }
 
-        if (!request_OF_resource(io, 0, NULL)) {
+        if (of_address_to_resource(io, 0, &awacs_rsrc[0]) ||
+            request_mem_region(awacs_rsrc[0].start,
+                               awacs_rsrc[0].end - awacs_rsrc[0].start + 1,
+                               " (IO)") == NULL) {
                 printk(KERN_ERR "dmasound: can't request IO resource !\n");
                 return -ENODEV;
         }
-        if (!request_OF_resource(io, 1, " (tx dma)")) {
-                release_OF_resource(io, 0);
-                printk(KERN_ERR "dmasound: can't request TX DMA resource !\n");
+        if (of_address_to_resource(io, 1, &awacs_rsrc[1]) ||
+            request_mem_region(awacs_rsrc[1].start,
+                               awacs_rsrc[1].end - awacs_rsrc[1].start + 1,
+                               " (tx dma)") == NULL) {
+                release_mem_region(awacs_rsrc[0].start,
+                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
+                printk(KERN_ERR "dmasound: can't request Tx DMA resource !\n");
                 return -ENODEV;
         }
-
-        if (!request_OF_resource(io, 2, " (rx dma)")) {
-                release_OF_resource(io, 0);
-                release_OF_resource(io, 1);
-                printk(KERN_ERR "dmasound: can't request RX DMA resource !\n");
+        if (of_address_to_resource(io, 2, &awacs_rsrc[2]) ||
+            request_mem_region(awacs_rsrc[2].start,
+                               awacs_rsrc[2].end - awacs_rsrc[2].start + 1,
+                               " (rx dma)") == NULL) {
+                release_mem_region(awacs_rsrc[0].start,
+                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
+                release_mem_region(awacs_rsrc[1].start,
+                                   awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
+                printk(KERN_ERR "dmasound: can't request Rx DMA resource !\n");
                 return -ENODEV;
         }
 
         awacs_beep_dev = input_allocate_device();
         if (!awacs_beep_dev) {
-                release_OF_resource(io, 0);
-                release_OF_resource(io, 1);
-                release_OF_resource(io, 2);
+                release_mem_region(awacs_rsrc[0].start,
+                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
+                release_mem_region(awacs_rsrc[1].start,
+                                   awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
+                release_mem_region(awacs_rsrc[2].start,
+                                   awacs_rsrc[2].end - awacs_rsrc[2].start + 1);
                 printk(KERN_ERR "dmasound: can't allocate input device !\n");
                 return -ENOMEM;
         }
@@ -2916,11 +2932,11 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
 
         /* all OF versions I've seen use this value */
         if (i2s_node)
-                i2s = ioremap(io->addrs[0].address, 0x1000);
+                i2s = ioremap(awacs_rsrc[0].start, 0x1000);
         else
-                awacs = ioremap(io->addrs[0].address, 0x1000);
-        awacs_txdma = ioremap(io->addrs[1].address, 0x100);
-        awacs_rxdma = ioremap(io->addrs[2].address, 0x100);
+                awacs = ioremap(awacs_rsrc[0].start, 0x1000);
+        awacs_txdma = ioremap(awacs_rsrc[1].start, 0x100);
+        awacs_rxdma = ioremap(awacs_rsrc[2].start, 0x100);
 
         /* first of all make sure that the chip is powered up....*/
         pmac_call_feature(PMAC_FTR_SOUND_CHIP_ENABLE, io, 0, 1);
@@ -3083,9 +3099,10 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
                 struct device_node* mio;
                 macio_base = NULL;
                 for (mio = io->parent; mio; mio = mio->parent) {
-                        if (strcmp(mio->name, "mac-io") == 0
-                            && mio->n_addrs > 0) {
-                                macio_base = ioremap(mio->addrs[0].address, 0x40);
+                        if (strcmp(mio->name, "mac-io") == 0) {
+                                struct resource r;
+                                if (of_address_to_resource(mio, 0, &r) == 0)
+                                        macio_base = ioremap(r.start, 0x40);
                                 break;
                         }
                 }
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 9b2b00fdc1ae..a642e4cfcf45 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -803,21 +803,17 @@ static int snd_pmac_free(struct snd_pmac *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)) {
-                                if (chip->is_k2)
-                                        release_OF_resource(chip->node->parent,
-                                                            i);
-                                else
-                                        release_OF_resource(chip->node, i);
-                        }
+                        if (chip->requested & (1 << i))
+                                release_mem_region(chip->rsrc[i].start,
+                                                   chip->rsrc[i].end -
+                                                   chip->rsrc[i].start + 1);
                 }
         }
-#endif /* CONFIG_PPC64 */
+
         if (chip->pdev)
                 pci_dev_put(chip->pdev);
         kfree(chip);
@@ -991,6 +987,11 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                         chip->can_byte_swap = 0; /* FIXME: check this */
                         chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
                         break;
+                default:
+                        printk(KERN_ERR "snd: Unknown layout ID 0x%x\n",
+                               layout_id);
+                        return -ENODEV;
+
                 }
         }
         prop = (unsigned int *)get_property(sound, "device-id", NULL);
@@ -1175,46 +1176,69 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
         }
 
         np = chip->node;
+        chip->requested = 0;
         if (chip->is_k2) {
-                if (np->parent->n_addrs < 2 || np->n_intrs < 3) {
+                static char *rnames[] = {
+                        "Sound Control", "Sound DMA" };
+                if (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);
+                for (i = 0; i < 2; i ++) {
+                        if (of_address_to_resource(np->parent, i,
+                                                   &chip->rsrc[i])) {
+                                printk(KERN_ERR "snd: can't translate rsrc "
+                                       " %d (%s)\n", i, rnames[i]);
+                                err = -ENODEV;
+                                goto __error;
+                        }
+                        if (request_mem_region(chip->rsrc[i].start,
+                                               chip->rsrc[i].end -
+                                               chip->rsrc[i].start + 1,
+                                               rnames[i]) == NULL) {
+                                printk(KERN_ERR "snd: can't request rsrc "
+                                       " %d (%s: 0x%08lx:%08lx)\n",
+                                       i, rnames[i], chip->rsrc[i].start,
+                                       chip->rsrc[i].end);
                                 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;
+                        chip->requested |= (1 << i);
                 }
-
+                ctrl_addr = chip->rsrc[0].start;
+                txdma_addr = chip->rsrc[1].start;
+                rxdma_addr = txdma_addr + 0x100;
         } else {
-                if (np->n_addrs < 3 || np->n_intrs < 3) {
+                static char *rnames[] = {
+                        "Sound Control", "Sound Tx DMA", "Sound Rx DMA" };
+                if (np->n_intrs < 3) {
                         err = -ENODEV;
                         goto __error;
                 }
-
-                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);
+                for (i = 0; i < 3; i ++) {
+                        if (of_address_to_resource(np->parent, i,
+                                                   &chip->rsrc[i])) {
+                                printk(KERN_ERR "snd: can't translate rsrc "
+                                       " %d (%s)\n", i, rnames[i]);
+                                err = -ENODEV;
+                                goto __error;
+                        }
+                        if (request_mem_region(chip->rsrc[i].start,
+                                               chip->rsrc[i].end -
+                                               chip->rsrc[i].start + 1,
+                                               rnames[i]) == NULL) {
+                                printk(KERN_ERR "snd: can't request rsrc "
+                                       " %d (%s: 0x%08lx:%08lx)\n",
+                                       i, rnames[i], chip->rsrc[i].start,
+                                       chip->rsrc[i].end);
                                 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->requested |= (1 << i);
                 }
+                ctrl_addr = chip->rsrc[0].start;
+                txdma_addr = chip->rsrc[1].start;
+                rxdma_addr = chip->rsrc[2].start;
         }
 
         chip->awacs = ioremap(ctrl_addr, 0x1000);
@@ -1266,9 +1290,11 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
         } else if (chip->is_pbook_G3) {
                 struct device_node* mio;
                 for (mio = chip->node->parent; mio; mio = mio->parent) {
-                        if (strcmp(mio->name, "mac-io") == 0
-                            && mio->n_addrs > 0) {
-                                chip->macio_base = ioremap(mio->addrs[0].address, 0x40);
+                        if (strcmp(mio->name, "mac-io") == 0) {
+                                struct resource r;
+                                if (of_address_to_resource(mio, 0, &r) == 0)
+                                        chip->macio_base =
+                                                ioremap(r.start, 0x40);
                                 break;
                         }
                 }
diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h
index 086da7a18909..3a9bd4dbb9a6 100644
--- a/sound/ppc/pmac.h
+++ b/sound/ppc/pmac.h
@@ -113,7 +113,8 @@ struct snd_pmac {
         unsigned int initialized : 1;
         unsigned int feature_is_set : 1;
 
-        unsigned int of_requested;
+        unsigned int requested;
+        struct resource rsrc[3];
 
         int num_freqs;
         int *freq_table;