From e0bedcb837f94346755ca60ce577d9dca40e9142 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 13 Apr 2010 16:12:59 -0700
Subject: [PATCH] --- yaml --- r: 198030 b: refs/heads/master c:
 cb6dc512b745292eaf123fedf437c211e27fb680 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/include/asm/device.h    | 1 +
 trunk/arch/powerpc/include/asm/of_device.h | 2 +-
 trunk/arch/powerpc/kernel/of_device.c      | 2 +-
 trunk/arch/powerpc/kernel/of_platform.c    | 2 +-
 trunk/drivers/macintosh/macio_asic.c       | 4 ++--
 trunk/sound/aoa/soundbus/i2sbus/core.c     | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d0ae7c236ee1..f15579f0f451 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58f9b0b02414062eaff46716bc04b47d7e79add5
+refs/heads/master: cb6dc512b745292eaf123fedf437c211e27fb680
diff --git a/trunk/arch/powerpc/include/asm/device.h b/trunk/arch/powerpc/include/asm/device.h
index f23f8d8bd68d..a3954e4fcbe2 100644
--- a/trunk/arch/powerpc/include/asm/device.h
+++ b/trunk/arch/powerpc/include/asm/device.h
@@ -28,6 +28,7 @@ struct dev_archdata {
 };
 
 struct pdev_archdata {
+	u64 dma_mask;
 };
 
 #endif /* _ASM_POWERPC_DEVICE_H */
diff --git a/trunk/arch/powerpc/include/asm/of_device.h b/trunk/arch/powerpc/include/asm/of_device.h
index 8b26f96b9f9e..444e97e2982e 100644
--- a/trunk/arch/powerpc/include/asm/of_device.h
+++ b/trunk/arch/powerpc/include/asm/of_device.h
@@ -12,8 +12,8 @@
  */
 struct of_device
 {
-	u64			dma_mask;	/* DMA mask */
 	struct device		dev;		/* Generic device interface */
+	struct pdev_archdata	archdata;
 };
 
 extern struct of_device *of_device_alloc(struct device_node *np,
diff --git a/trunk/arch/powerpc/kernel/of_device.c b/trunk/arch/powerpc/kernel/of_device.c
index 20b3474b6f6b..df78e0236a02 100644
--- a/trunk/arch/powerpc/kernel/of_device.c
+++ b/trunk/arch/powerpc/kernel/of_device.c
@@ -70,7 +70,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/powerpc/kernel/of_platform.c b/trunk/arch/powerpc/kernel/of_platform.c
index 1c747c474415..218853466510 100644
--- a/trunk/arch/powerpc/kernel/of_platform.c
+++ b/trunk/arch/powerpc/kernel/of_platform.c
@@ -74,7 +74,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.coherent_dma_mask = DMA_BIT_MASK(32);
 
 	dev->dev.bus = &of_platform_bus_type;
diff --git a/trunk/drivers/macintosh/macio_asic.c b/trunk/drivers/macintosh/macio_asic.c
index 67fe13ffe90b..48a5f0406865 100644
--- a/trunk/drivers/macintosh/macio_asic.c
+++ b/trunk/drivers/macintosh/macio_asic.c
@@ -374,8 +374,8 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 	dev->bus = &chip->lbus;
 	dev->media_bay = in_bay;
 	dev->ofdev.dev.of_node = np;
-	dev->ofdev.dma_mask = 0xffffffffUL;
-	dev->ofdev.dev.dma_mask = &dev->ofdev.dma_mask;
+	dev->ofdev.archdata.dma_mask = 0xffffffffUL;
+	dev->ofdev.dev.dma_mask = &dev->ofdev.archdata.dma_mask;
 	dev->ofdev.dev.parent = parent;
 	dev->ofdev.dev.bus = &macio_bus_type;
 	dev->ofdev.dev.release = macio_release_dev;
diff --git a/trunk/sound/aoa/soundbus/i2sbus/core.c b/trunk/sound/aoa/soundbus/i2sbus/core.c
index 7672b4d145ae..678933721735 100644
--- a/trunk/sound/aoa/soundbus/i2sbus/core.c
+++ b/trunk/sound/aoa/soundbus/i2sbus/core.c
@@ -221,9 +221,9 @@ static int i2sbus_add_dev(struct macio_dev *macio,
 
 	mutex_init(&dev->lock);
 	spin_lock_init(&dev->low_lock);
-	dev->sound.ofdev.dma_mask = macio->ofdev.dma_mask;
+	dev->sound.ofdev.archdata.dma_mask = macio->ofdev.archdata.dma_mask;
 	dev->sound.ofdev.dev.of_node = np;
-	dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.dma_mask;
+	dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.archdata.dma_mask;
 	dev->sound.ofdev.dev.parent = &macio->ofdev.dev;
 	dev->sound.ofdev.dev.release = i2sbus_release_dev;
 	dev->sound.attach_codec = i2sbus_attach_codec;