summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-07-08 00:17:27 -0500
committerKumar Gala <galak@kernel.crashing.org>2011-07-08 00:21:36 -0500
commit314b02f503c2c219fde0fcf6f086fda415f8a847 (patch)
tree7f41ae421e6cb11d821175465b1346851a600292 /drivers/of
parenta77ce8167cc1d0370fcb1d79b367d62e050cb2b0 (diff)
downloadlinux-3.10-314b02f503c2c219fde0fcf6f086fda415f8a847.tar.gz
linux-3.10-314b02f503c2c219fde0fcf6f086fda415f8a847.tar.bz2
linux-3.10-314b02f503c2c219fde0fcf6f086fda415f8a847.zip
powerpc: implement arch_setup_pdev_archdata
We have a long standing issues with platform devices not have a valid dma_mask pointer. This hasn't been an issue to date as no platform device has tried to set its dma_mask value to a non-default value. Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/platform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 63d3cb73bdb..cfc6a796940 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -153,7 +153,7 @@ struct platform_device *of_device_alloc(struct device_node *np,
}
dev->dev.of_node = of_node_get(np);
-#if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
+#if defined(CONFIG_MICROBLAZE)
dev->dev.dma_mask = &dev->archdata.dma_mask;
#endif
dev->dev.parent = parent;
@@ -189,7 +189,7 @@ struct platform_device *of_platform_device_create(struct device_node *np,
if (!dev)
return NULL;
-#if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
+#if defined(CONFIG_MICROBLAZE)
dev->archdata.dma_mask = 0xffffffffUL;
#endif
dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);