5 files changed, 13 insertions, 27 deletions

diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h
index 402b46e630f6..123b2fe72d01 100644
--- a/arch/microblaze/include/asm/device.h
+++ b/arch/microblaze/include/asm/device.h
@@ -12,29 +12,15 @@
 struct device_node;
 
 struct dev_archdata {
-        /* Optional pointer to an OF device node */
-        struct device_node      *of_node;
-
         /* DMA operations on that device */
         struct dma_map_ops      *dma_ops;
         void                    *dma_data;
 };
 
 struct pdev_archdata {
+        u64 dma_mask;
 };
 
-static inline void dev_archdata_set_node(struct dev_archdata *ad,
-                                         struct device_node *np)
-{
-        ad->of_node = np;
-}
-
-static inline struct device_node *
-dev_archdata_get_node(const struct dev_archdata *ad)
-{
-        return ad->of_node;
-}
-
 #endif /* _ASM_MICROBLAZE_DEVICE_H */
 
 
diff --git a/arch/microblaze/include/asm/of_device.h b/arch/microblaze/include/asm/of_device.h
index ba917cfaefe6..73cb98040982 100644
--- a/arch/microblaze/include/asm/of_device.h
+++ b/arch/microblaze/include/asm/of_device.h
@@ -21,9 +21,8 @@
  * probed using OF properties.
  */
 struct of_device {
-        struct device_node      *node; /* to be obsoleted */
-        u64                     dma_mask; /* DMA mask */
         struct device           dev; /* Generic device interface */
+        struct pdev_archdata    archdata;
 };
 
 extern ssize_t of_device_get_modalias(struct of_device *ofdev,
diff --git a/arch/microblaze/include/asm/scatterlist.h b/arch/microblaze/include/asm/scatterlist.h
index 35d786fe93ae..dc4a8900cc80 100644
--- a/arch/microblaze/include/asm/scatterlist.h
+++ b/arch/microblaze/include/asm/scatterlist.h
@@ -1 +1,3 @@
 #include <asm-generic/scatterlist.h>
+
+#define ISA_DMA_THRESHOLD       (~0UL)
diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c
index 9a0f7632c47c..b372787886ed 100644
--- a/arch/microblaze/kernel/of_device.c
+++ b/arch/microblaze/kernel/of_device.c
@@ -12,7 +12,7 @@
 void of_device_make_bus_id(struct of_device *dev)
 {
         static atomic_t bus_no_reg_magic;
-        struct device_node *node = dev->node;
+        struct device_node *node = dev->dev.of_node;
         const u32 *reg;
         u64 addr;
         int magic;
@@ -49,11 +49,10 @@ struct of_device *of_device_alloc(struct device_node *np,
         if (!dev)
                 return NULL;
 
-        dev->node = of_node_get(np);
-        dev->dev.dma_mask = &dev->dma_mask;
+        dev->dev.of_node = of_node_get(np);
+        dev->dev.dma_mask = &dev->archdata.dma_mask;
         dev->dev.parent = parent;
         dev->dev.release = of_release_dev;
-        dev->dev.archdata.of_node = np;
 
         if (bus_id)
                 dev_set_name(&dev->dev, bus_id);
@@ -75,17 +74,17 @@ int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 
         ofdev = to_of_device(dev);
 
-        if (add_uevent_var(env, "OF_NAME=%s", ofdev->node->name))
+        if (add_uevent_var(env, "OF_NAME=%s", ofdev->dev.of_node->name))
                 return -ENOMEM;
 
-        if (add_uevent_var(env, "OF_TYPE=%s", ofdev->node->type))
+        if (add_uevent_var(env, "OF_TYPE=%s", ofdev->dev.of_node->type))
                 return -ENOMEM;
 
         /* Since the compatible field can contain pretty much anything
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-        compat = of_get_property(ofdev->node, "compatible", &cplen);
+        compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);
         while (compat && *compat && cplen > 0) {
                 if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat))
                         return -ENOMEM;
diff --git a/arch/microblaze/kernel/of_platform.c b/arch/microblaze/kernel/of_platform.c
index 0dc755286d38..ccf6f4257f4b 100644
--- a/arch/microblaze/kernel/of_platform.c
+++ b/arch/microblaze/kernel/of_platform.c
@@ -47,7 +47,7 @@ struct of_device *of_platform_device_create(struct device_node *np,
         if (!dev)
                 return NULL;
 
-        dev->dma_mask = 0xffffffffUL;
+        dev->archdata.dma_mask = 0xffffffffUL;
         dev->dev.bus = &of_platform_bus_type;
 
         /* We do not fill the DMA ops for platform devices by default.
@@ -166,7 +166,7 @@ EXPORT_SYMBOL(of_platform_bus_probe);
 
 static int of_dev_node_match(struct device *dev, void *data)
 {
-        return to_of_device(dev)->node == data;
+        return to_of_device(dev)->dev.of_node == data;
 }
 
 struct of_device *of_find_device_by_node(struct device_node *np)
@@ -184,7 +184,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
 static int of_dev_phandle_match(struct device *dev, void *data)
 {
         phandle *ph = data;
-        return to_of_device(dev)->node->phandle == *ph;
+        return to_of_device(dev)->dev.of_node->phandle == *ph;
 }
 
 struct of_device *of_find_device_by_phandle(phandle ph)