---

yaml --- r: 198031 b: refs/heads/master c: 173b3a7 h: refs/heads/master i: 198029: c7947c3 198027: af8205b 198023: 1716a8e 198015: 9baf286 v: v3
git-mirror · May 22, 2010 · 7db3883 · 7db3883
1 parent e0bedcb
commit 7db3883
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb6dc512b745292eaf123fedf437c211e27fb680
+refs/heads/master: 173b3a7a059a6998a6c0733710818c473cc0de4c
diff --git a/trunk/arch/microblaze/include/asm/device.h b/trunk/arch/microblaze/include/asm/device.h
@@ -18,6 +18,7 @@ struct dev_archdata {
 };
 
 struct pdev_archdata {
+	u64 dma_mask;
 };
 
 #endif /* _ASM_MICROBLAZE_DEVICE_H */

diff --git a/trunk/arch/microblaze/include/asm/of_device.h b/trunk/arch/microblaze/include/asm/of_device.h
@@ -21,8 +21,8 @@
  * probed using OF properties.
  */
 struct of_device {
-	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/trunk/arch/microblaze/kernel/of_device.c b/trunk/arch/microblaze/kernel/of_device.c
@@ -50,7 +50,7 @@ struct of_device *of_device_alloc(struct device_node *np,
 		return NULL;
 
 	dev->dev.of_node = of_node_get(np);
-	dev->dev.dma_mask = &dev->dma_mask;
+	dev->dev.dma_mask = &dev->archdata.dma_mask;
 	dev->dev.parent = parent;
 	dev->dev.release = of_release_dev;
 

diff --git a/trunk/arch/microblaze/kernel/of_platform.c b/trunk/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.
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ struct dev_archdata { @@
     };
     struct pdev_archdata {
+    	u64 dma_mask;
     };
     #endif /* _ASM_MICROBLAZE_DEVICE_H */
@@ Expand Down @@