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.

4 files changed, 36 insertions, 40 deletions

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;