Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
  of/platform: Register of_platform_drivers with an "of:" prefix
  of/address: Clean up function declarations
  of/spi: call of_register_spi_devices() from spi core code
  of: Provide default of_node_to_nid() implementation.
  of/device: Make of_device_make_bus_id() usable by other code.
  of/irq: Fix endian issues in parsing interrupt specifiers
  of: Fix phandle endian issues
  of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
  of: remove of_default_bus_ids
  of: make of_find_device_by_node generic
  microblaze: remove references to of_device and to_of_device
  sparc: remove references to of_device and to_of_device
  powerpc: remove references to of_device and to_of_device
  of/device: Replace of_device with platform_device in includes and core code
  of/device: Protect against binding of_platform_drivers to non-OF devices
  of: remove asm/of_device.h
  of: remove asm/of_platform.h
  of/platform: remove all of_bus_type and of_platform_bus_type references
  of: Merge of_platform_bus_type with platform_bus_type
  drivercore/of: Add OF style matching to platform bus
  ...

Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
some obj-y removals by the devicetree branch, while the microblaze
updates added a new file.

19 files changed, 169 insertions, 101 deletions

diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c
index e1c5cd6650b1..5b243bd3eb3b 100644
--- a/arch/powerpc/platforms/512x/clock.c
+++ b/arch/powerpc/platforms/512x/clock.c
@@ -678,7 +678,7 @@ static void psc_clks_init(void)
 {
         struct device_node *np;
         const u32 *cell_index;
-        struct of_device *ofdev;
+        struct platform_device *ofdev;
 
         for_each_compatible_node(np, NULL, "fsl,mpc5121-psc") {
                 cell_index = of_get_property(np, "cell-index", NULL);
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 6d584f4e3c9a..de55bc0584b5 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
 #include <asm/time.h>
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
index ca5305a5bd61..0dad9a935eb5 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
@@ -147,26 +147,25 @@ mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
         return 0;
 }
 
-static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev,
+static int __devinit mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev,
                                         const struct of_device_id *match)
 {
         struct mpc52xx_gpiochip *chip;
         struct mpc52xx_gpio_wkup __iomem *regs;
-        struct of_gpio_chip *ofchip;
+        struct gpio_chip *gc;
         int ret;
 
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (!chip)
                 return -ENOMEM;
 
-        ofchip = &chip->mmchip.of_gc;
+        gc = &chip->mmchip.gc;
 
-        ofchip->gpio_cells          = 2;
-        ofchip->gc.ngpio            = 8;
-        ofchip->gc.direction_input  = mpc52xx_wkup_gpio_dir_in;
-        ofchip->gc.direction_output = mpc52xx_wkup_gpio_dir_out;
-        ofchip->gc.get              = mpc52xx_wkup_gpio_get;
-        ofchip->gc.set              = mpc52xx_wkup_gpio_set;
+        gc->ngpio            = 8;
+        gc->direction_input  = mpc52xx_wkup_gpio_dir_in;
+        gc->direction_output = mpc52xx_wkup_gpio_dir_out;
+        gc->get              = mpc52xx_wkup_gpio_get;
+        gc->set              = mpc52xx_wkup_gpio_set;
 
         ret = of_mm_gpiochip_add(ofdev->dev.of_node, &chip->mmchip);
         if (ret)
@@ -180,7 +179,7 @@ static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev,
         return 0;
 }
 
-static int mpc52xx_gpiochip_remove(struct of_device *ofdev)
+static int mpc52xx_gpiochip_remove(struct platform_device *ofdev)
 {
         return -EBUSY;
 }
@@ -311,11 +310,11 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
         return 0;
 }
 
-static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev,
+static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev,
                                         const struct of_device_id *match)
 {
         struct mpc52xx_gpiochip *chip;
-        struct of_gpio_chip *ofchip;
+        struct gpio_chip *gc;
         struct mpc52xx_gpio __iomem *regs;
         int ret;
 
@@ -323,14 +322,13 @@ static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev,
         if (!chip)
                 return -ENOMEM;
 
-        ofchip = &chip->mmchip.of_gc;
+        gc = &chip->mmchip.gc;
 
-        ofchip->gpio_cells          = 2;
-        ofchip->gc.ngpio            = 32;
-        ofchip->gc.direction_input  = mpc52xx_simple_gpio_dir_in;
-        ofchip->gc.direction_output = mpc52xx_simple_gpio_dir_out;
-        ofchip->gc.get              = mpc52xx_simple_gpio_get;
-        ofchip->gc.set              = mpc52xx_simple_gpio_set;
+        gc->ngpio            = 32;
+        gc->direction_input  = mpc52xx_simple_gpio_dir_in;
+        gc->direction_output = mpc52xx_simple_gpio_dir_out;
+        gc->get              = mpc52xx_simple_gpio_get;
+        gc->set              = mpc52xx_simple_gpio_set;
 
         ret = of_mm_gpiochip_add(ofdev->dev.of_node, &chip->mmchip);
         if (ret)
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 46c93578cbf0..fea833e18ad5 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -78,7 +78,7 @@ MODULE_LICENSE("GPL");
  * @dev: pointer to device structure
  * @regs: virtual address of GPT registers
  * @lock: spinlock to coordinate between different functions.
- * @of_gc: of_gpio_chip instance structure; used when GPIO is enabled
+ * @gc: gpio_chip instance structure; used when GPIO is enabled
  * @irqhost: Pointer to irq_host instance; used when IRQ mode is supported
  * @wdt_mode: only relevant for gpt0: bit 0 (MPC52xx_GPT_CAN_WDT) indicates
  *   if the gpt may be used as wdt, bit 1 (MPC52xx_GPT_IS_WDT) indicates
@@ -94,7 +94,7 @@ struct mpc52xx_gpt_priv {
         u8 wdt_mode;
 
 #if defined(CONFIG_GPIOLIB)
-        struct of_gpio_chip of_gc;
+        struct gpio_chip gc;
 #endif
 };
 
@@ -280,7 +280,7 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
 #if defined(CONFIG_GPIOLIB)
 static inline struct mpc52xx_gpt_priv *gc_to_mpc52xx_gpt(struct gpio_chip *gc)
 {
-        return container_of(to_of_gpio_chip(gc), struct mpc52xx_gpt_priv,of_gc);
+        return container_of(gc, struct mpc52xx_gpt_priv, gc);
 }
 
 static int mpc52xx_gpt_gpio_get(struct gpio_chip *gc, unsigned int gpio)
@@ -336,28 +336,25 @@ mpc52xx_gpt_gpio_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
         if (!of_find_property(node, "gpio-controller", NULL))
                 return;
 
-        gpt->of_gc.gc.label = kstrdup(node->full_name, GFP_KERNEL);
-        if (!gpt->of_gc.gc.label) {
+        gpt->gc.label = kstrdup(node->full_name, GFP_KERNEL);
+        if (!gpt->gc.label) {
                 dev_err(gpt->dev, "out of memory\n");
                 return;
         }
 
-        gpt->of_gc.gpio_cells = 2;
-        gpt->of_gc.gc.ngpio = 1;
-        gpt->of_gc.gc.direction_input  = mpc52xx_gpt_gpio_dir_in;
-        gpt->of_gc.gc.direction_output = mpc52xx_gpt_gpio_dir_out;
-        gpt->of_gc.gc.get = mpc52xx_gpt_gpio_get;
-        gpt->of_gc.gc.set = mpc52xx_gpt_gpio_set;
-        gpt->of_gc.gc.base = -1;
-        gpt->of_gc.xlate = of_gpio_simple_xlate;
-        node->data = &gpt->of_gc;
-        of_node_get(node);
+        gpt->gc.ngpio = 1;
+        gpt->gc.direction_input  = mpc52xx_gpt_gpio_dir_in;
+        gpt->gc.direction_output = mpc52xx_gpt_gpio_dir_out;
+        gpt->gc.get = mpc52xx_gpt_gpio_get;
+        gpt->gc.set = mpc52xx_gpt_gpio_set;
+        gpt->gc.base = -1;
+        gpt->gc.of_node = node;
 
         /* Setup external pin in GPIO mode */
         clrsetbits_be32(&gpt->regs->mode, MPC52xx_GPT_MODE_MS_MASK,
                         MPC52xx_GPT_MODE_MS_GPIO);
 
-        rc = gpiochip_add(&gpt->of_gc.gc);
+        rc = gpiochip_add(&gpt->gc);
         if (rc)
                 dev_err(gpt->dev, "gpiochip_add() failed; rc=%i\n", rc);
 
@@ -723,7 +720,7 @@ static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt,
 /* ---------------------------------------------------------------------
  * of_platform bus binding code
  */
-static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,
+static int __devinit mpc52xx_gpt_probe(struct platform_device *ofdev,
                                        const struct of_device_id *match)
 {
         struct mpc52xx_gpt_priv *gpt;
@@ -769,7 +766,7 @@ static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,
         return 0;
 }
 
-static int mpc52xx_gpt_remove(struct of_device *ofdev)
+static int mpc52xx_gpt_remove(struct platform_device *ofdev)
 {
         return -EBUSY;
 }
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index e86aec644501..f4ac213c89c0 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -436,8 +436,8 @@ void mpc52xx_lpbfifo_abort(struct mpc52xx_lpbfifo_request *req)
 }
 EXPORT_SYMBOL(mpc52xx_lpbfifo_abort);
 
-static int __devinit
-mpc52xx_lpbfifo_probe(struct of_device *op, const struct of_device_id *match)
+static int __devinit mpc52xx_lpbfifo_probe(struct platform_device *op,
+                                           const struct of_device_id *match)
 {
         struct resource res;
         int rc = -ENOMEM;
@@ -507,7 +507,7 @@ mpc52xx_lpbfifo_probe(struct of_device *op, const struct of_device_id *match)
 }
 
 
-static int __devexit mpc52xx_lpbfifo_remove(struct of_device *op)
+static int __devexit mpc52xx_lpbfifo_remove(struct platform_device *op)
 {
         if (lpbfifo.dev != &op->dev)
                 return 0;
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 9f2e52b36f91..1565e0446dc8 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -111,7 +111,7 @@ static struct mdiobb_ctrl ep8248e_mdio_ctrl = {
         .ops = &ep8248e_mdio_ops,
 };
 
-static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
+static int __devinit ep8248e_mdio_probe(struct platform_device *ofdev,
                                         const struct of_device_id *match)
 {
         struct mii_bus *bus;
@@ -154,7 +154,7 @@ err_free_bus:
         return ret;
 }
 
-static int ep8248e_mdio_remove(struct of_device *ofdev)
+static int ep8248e_mdio_remove(struct platform_device *ofdev)
 {
         BUG();
         return 0;
diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
index d119a7c1c17a..70798ac911ef 100644
--- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
@@ -35,9 +35,8 @@
 
 struct mcu {
         struct mutex lock;
-        struct device_node *np;
         struct i2c_client *client;
-        struct of_gpio_chip of_gc;
+        struct gpio_chip gc;
         u8 reg_ctrl;
 };
 
@@ -56,8 +55,7 @@ static void mcu_power_off(void)
 
 static void mcu_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 {
-        struct of_gpio_chip *of_gc = to_of_gpio_chip(gc);
-        struct mcu *mcu = container_of(of_gc, struct mcu, of_gc);
+        struct mcu *mcu = container_of(gc, struct mcu, gc);
         u8 bit = 1 << (4 + gpio);
 
         mutex_lock(&mcu->lock);
@@ -79,9 +77,7 @@ static int mcu_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 static int mcu_gpiochip_add(struct mcu *mcu)
 {
         struct device_node *np;
-        struct of_gpio_chip *of_gc = &mcu->of_gc;
-        struct gpio_chip *gc = &of_gc->gc;
-        int ret;
+        struct gpio_chip *gc = &mcu->gc;
 
         np = of_find_compatible_node(NULL, NULL, "fsl,mcu-mpc8349emitx");
         if (!np)
@@ -94,32 +90,14 @@ static int mcu_gpiochip_add(struct mcu *mcu)
         gc->base = -1;
         gc->set = mcu_gpio_set;
         gc->direction_output = mcu_gpio_dir_out;
-        of_gc->gpio_cells = 2;
-        of_gc->xlate = of_gpio_simple_xlate;
+        gc->of_node = np;
 
-        np->data = of_gc;
-        mcu->np = np;
-
-        /*
-         * We don't want to lose the node, its ->data and ->full_name...
-         * So, if succeeded, we don't put the node here.
-         */
-        ret = gpiochip_add(gc);
-        if (ret)
-                of_node_put(np);
-        return ret;
+        return gpiochip_add(gc);
 }
 
 static int mcu_gpiochip_remove(struct mcu *mcu)
 {
-        int ret;
-
-        ret = gpiochip_remove(&mcu->of_gc.gc);
-        if (ret)
-                return ret;
-        of_node_put(mcu->np);
-
-        return 0;
+        return gpiochip_remove(&mcu->gc);
 }
 
 static int __devinit mcu_probe(struct i2c_client *client,
@@ -182,10 +160,16 @@ static const struct i2c_device_id mcu_ids[] = {
 };
 MODULE_DEVICE_TABLE(i2c, mcu_ids);
 
+static struct of_device_id mcu_of_match_table[] __devinitdata = {
+        { .compatible = "fsl,mcu-mpc8349emitx", },
+        { },
+};
+
 static struct i2c_driver mcu_driver = {
         .driver = {
                 .name = "mcu-mpc8349emitx",
                 .owner = THIS_MODULE,
+                .of_match_table = mcu_of_match_table,
         },
         .probe = mcu_probe,
         .remove = __devexit_p(mcu_remove),
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index ebe6c3537209..75ae77f1af6a 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -99,7 +99,7 @@ struct pmc_type {
         int has_deep_sleep;
 };
 
-static struct of_device *pmc_dev;
+static struct platform_device *pmc_dev;
 static int has_deep_sleep, deep_sleeping;
 static int pmc_irq;
 static struct mpc83xx_pmc __iomem *pmc_regs;
@@ -318,7 +318,7 @@ static struct platform_suspend_ops mpc83xx_suspend_ops = {
         .end = mpc83xx_suspend_end,
 };
 
-static int pmc_probe(struct of_device *ofdev,
+static int pmc_probe(struct platform_device *ofdev,
                      const struct of_device_id *match)
 {
         struct device_node *np = ofdev->dev.of_node;
@@ -396,7 +396,7 @@ out:
         return ret;
 }
 
-static int pmc_remove(struct of_device *ofdev)
+static int pmc_remove(struct platform_device *ofdev)
 {
         return -EPERM;
 };
diff --git a/arch/powerpc/platforms/86xx/gef_gpio.c b/arch/powerpc/platforms/86xx/gef_gpio.c
index b8cb08dbd89c..4ff7b1e7bbad 100644
--- a/arch/powerpc/platforms/86xx/gef_gpio.c
+++ b/arch/powerpc/platforms/86xx/gef_gpio.c
@@ -118,12 +118,12 @@ static int __init gef_gpio_init(void)
                 }
 
                 /* Setup pointers to chip functions */
-                gef_gpio_chip->of_gc.gpio_cells = 2;
-                gef_gpio_chip->of_gc.gc.ngpio = 19;
-                gef_gpio_chip->of_gc.gc.direction_input = gef_gpio_dir_in;
-                gef_gpio_chip->of_gc.gc.direction_output = gef_gpio_dir_out;
-                gef_gpio_chip->of_gc.gc.get = gef_gpio_get;
-                gef_gpio_chip->of_gc.gc.set = gef_gpio_set;
+                gef_gpio_chip->gc.of_gpio_n_cells = 2;
+                gef_gpio_chip->gc.ngpio = 19;
+                gef_gpio_chip->gc.direction_input = gef_gpio_dir_in;
+                gef_gpio_chip->gc.direction_output = gef_gpio_dir_out;
+                gef_gpio_chip->gc.get = gef_gpio_get;
+                gef_gpio_chip->gc.set = gef_gpio_set;
 
                 /* This function adds a memory mapped GPIO chip */
                 retval = of_mm_gpiochip_add(np, gef_gpio_chip);
@@ -146,12 +146,12 @@ static int __init gef_gpio_init(void)
                 }
 
                 /* Setup pointers to chip functions */
-                gef_gpio_chip->of_gc.gpio_cells = 2;
-                gef_gpio_chip->of_gc.gc.ngpio = 6;
-                gef_gpio_chip->of_gc.gc.direction_input = gef_gpio_dir_in;
-                gef_gpio_chip->of_gc.gc.direction_output = gef_gpio_dir_out;
-                gef_gpio_chip->of_gc.gc.get = gef_gpio_get;
-                gef_gpio_chip->of_gc.gc.set = gef_gpio_set;
+                gef_gpio_chip->gc.of_gpio_n_cells = 2;
+                gef_gpio_chip->gc.ngpio = 6;
+                gef_gpio_chip->gc.direction_input = gef_gpio_dir_in;
+                gef_gpio_chip->gc.direction_output = gef_gpio_dir_out;
+                gef_gpio_chip->gc.get = gef_gpio_get;
+                gef_gpio_chip->gc.set = gef_gpio_set;
 
                 /* This function adds a memory mapped GPIO chip */
                 retval = of_mm_gpiochip_add(np, gef_gpio_chip);
diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
index fb4eb0df054c..03aabc0e16ac 100644
--- a/arch/powerpc/platforms/amigaone/setup.c
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -13,12 +13,13 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/seq_file.h>
 #include <generated/utsrelease.h>
 
 #include <asm/machdep.h>
 #include <asm/cputable.h>
-#include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #include <asm/i8259.h>
 #include <asm/time.h>
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 6257e5378615..97085530aa63 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -328,7 +328,7 @@ static struct irq_host_ops msic_host_ops = {
         .map    = msic_host_map,
 };
 
-static int axon_msi_shutdown(struct of_device *device)
+static int axon_msi_shutdown(struct platform_device *device)
 {
         struct axon_msic *msic = dev_get_drvdata(&device->dev);
         u32 tmp;
@@ -342,7 +342,7 @@ static int axon_msi_shutdown(struct of_device *device)
         return 0;
 }
 
-static int axon_msi_probe(struct of_device *device,
+static int axon_msi_probe(struct platform_device *device,
                           const struct of_device_id *device_id)
 {
         struct device_node *dn = device->dev.of_node;
diff --git a/arch/powerpc/platforms/cell/beat_iommu.c b/arch/powerpc/platforms/cell/beat_iommu.c
index 39d361c5c6d2..beec405eb6f8 100644
--- a/arch/powerpc/platforms/cell/beat_iommu.c
+++ b/arch/powerpc/platforms/cell/beat_iommu.c
@@ -108,7 +108,7 @@ static int __init celleb_init_iommu(void)
         celleb_init_direct_mapping();
         set_pci_dma_ops(&dma_direct_ops);
         ppc_md.pci_dma_dev_setup = celleb_pci_dma_dev_setup;
-        bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
+        bus_register_notifier(&platform_bus_type, &celleb_of_bus_notifier);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 3712900471ba..58b13ce3847e 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -1204,7 +1204,7 @@ static int __init cell_iommu_init(void)
         /* Register callbacks on OF platform device addition/removal
          * to handle linking them to the right DMA operations
          */
-        bus_register_notifier(&of_platform_bus_type, &cell_of_bus_notifier);
+        bus_register_notifier(&platform_bus_type, &cell_of_bus_notifier);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
index c5ce02e84c8e..1b5749042756 100644
--- a/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -61,12 +61,24 @@ static void qpace_progress(char *s, unsigned short hex)
         printk("*** %04x : %s\n", hex, s ? s : "");
 }
 
+static const struct of_device_id qpace_bus_ids[] __initdata = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .type = "spider", },
+        { .type = "axon", },
+        { .type = "plb5", },
+        { .type = "plb4", },
+        { .type = "opb", },
+        { .type = "ebc", },
+        {},
+};
+
 static int __init qpace_publish_devices(void)
 {
         int node;
 
         /* Publish OF platform devices for southbridge IOs */
-        of_platform_bus_probe(NULL, NULL, NULL);
+        of_platform_bus_probe(NULL, qpace_bus_ids, NULL);
 
         /* There is no device for the MIC memory controller, thus we create
          * a platform device for it to attach the EDAC driver to.
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 50385db586bd..691995761b3d 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -141,6 +141,18 @@ static int __devinit cell_setup_phb(struct pci_controller *phb)
         return 0;
 }
 
+static const struct of_device_id cell_bus_ids[] __initdata = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .type = "spider", },
+        { .type = "axon", },
+        { .type = "plb5", },
+        { .type = "plb4", },
+        { .type = "opb", },
+        { .type = "ebc", },
+        {},
+};
+
 static int __init cell_publish_devices(void)
 {
         struct device_node *root = of_find_node_by_path("/");
@@ -148,7 +160,7 @@ static int __init cell_publish_devices(void)
         int node;
 
         /* Publish OF platform devices for southbridge IOs */
-        of_platform_bus_probe(NULL, NULL, NULL);
+        of_platform_bus_probe(NULL, cell_bus_ids, NULL);
 
         /* On spider based blades, we need to manually create the OF
          * platform devices for the PCI host bridges
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index d2c1d497846e..33e5fc7334fc 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/completion.h>
 #include <linux/delay.h>
+#include <linux/proc_fs.h>
 #include <linux/dma-mapping.h>
 #include <linux/bcd.h>
 #include <linux/rtc.h>
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 627ee089e75d..a5d907b5a4c2 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -216,7 +216,7 @@ static int gpio_mdio_reset(struct mii_bus *bus)
 }
 
 
-static int __devinit gpio_mdio_probe(struct of_device *ofdev,
+static int __devinit gpio_mdio_probe(struct platform_device *ofdev,
                                      const struct of_device_id *match)
 {
         struct device *dev = &ofdev->dev;
@@ -275,7 +275,7 @@ out:
 }
 
 
-static int gpio_mdio_remove(struct of_device *dev)
+static int gpio_mdio_remove(struct platform_device *dev)
 {
         struct mii_bus *bus = dev_get_drvdata(&dev->dev);
 
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 79bd3e89dbaf..39df6ab1735a 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -21,6 +21,8 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/spinlock.h>
 #include <linux/adb.h>
 #include <linux/pmu.h>
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 630a533d0e59..890d5f72b198 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -46,6 +46,10 @@ struct pmac_irq_hw {
         unsigned int    level;
 };
 
+/* Workaround flags for 32bit powermac machines */
+unsigned int of_irq_workarounds;
+struct device_node *of_irq_dflt_pic;
+
 /* Default addresses */
 static volatile struct pmac_irq_hw __iomem *pmac_irq_hw[4];
 
@@ -428,6 +432,42 @@ static void __init pmac_pic_probe_oldstyle(void)
         setup_irq(irq_create_mapping(NULL, 20), &xmon_action);
 #endif
 }
+
+int of_irq_map_oldworld(struct device_node *device, int index,
+                        struct of_irq *out_irq)
+{
+        const u32 *ints = NULL;
+        int intlen;
+
+        /*
+         * Old machines just have a list of interrupt numbers
+         * and no interrupt-controller nodes. We also have dodgy
+         * cases where the APPL,interrupts property is completely
+         * missing behind pci-pci bridges and we have to get it
+         * from the parent (the bridge itself, as apple just wired
+         * everything together on these)
+         */
+        while (device) {
+                ints = of_get_property(device, "AAPL,interrupts", &intlen);
+                if (ints != NULL)
+                        break;
+                device = device->parent;
+                if (device && strcmp(device->type, "pci") != 0)
+                        break;
+        }
+        if (ints == NULL)
+                return -EINVAL;
+        intlen /= sizeof(u32);
+
+        if (index >= intlen)
+                return -EINVAL;
+
+        out_irq->controller = NULL;
+        out_irq->specifier[0] = ints[index];
+        out_irq->size = 1;
+
+        return 0;
+}
 #endif /* CONFIG_PPC32 */
 
 static void pmac_u3_cascade(unsigned int irq, struct irq_desc *desc)
@@ -559,19 +599,39 @@ static int __init pmac_pic_probe_mpic(void)
 
 void __init pmac_pic_init(void)
 {
-        unsigned int flags = 0;
-
         /* We configure the OF parsing based on our oldworld vs. newworld
          * platform type and wether we were booted by BootX.
          */
 #ifdef CONFIG_PPC32
         if (!pmac_newworld)
-                flags |= OF_IMAP_OLDWORLD_MAC;
+                of_irq_workarounds |= OF_IMAP_OLDWORLD_MAC;
         if (of_get_property(of_chosen, "linux,bootx", NULL) != NULL)
-                flags |= OF_IMAP_NO_PHANDLE;
-#endif /* CONFIG_PPC_32 */
+                of_irq_workarounds |= OF_IMAP_NO_PHANDLE;
 
-        of_irq_map_init(flags);
+        /* If we don't have phandles on a newworld, then try to locate a
+         * default interrupt controller (happens when booting with BootX).
+         * We do a first match here, hopefully, that only ever happens on
+         * machines with one controller.
+         */
+        if (pmac_newworld && (of_irq_workarounds & OF_IMAP_NO_PHANDLE)) {
+                struct device_node *np;
+
+                for_each_node_with_property(np, "interrupt-controller") {
+                        /* Skip /chosen/interrupt-controller */
+                        if (strcmp(np->name, "chosen") == 0)
+                                continue;
+                        /* It seems like at least one person wants
+                         * to use BootX on a machine with an AppleKiwi
+                         * controller which happens to pretend to be an
+                         * interrupt controller too. */
+                        if (strcmp(np->name, "AppleKiwi") == 0)
+                                continue;
+                        /* I think we found one ! */
+                        of_irq_dflt_pic = np;
+                        break;
+                }
+        }
+#endif /* CONFIG_PPC32 */
 
         /* We first try to detect Apple's new Core99 chipset, since mac-io
          * is quite different on those machines and contains an IBM MPIC2.