diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2011-07-08 01:17:27 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2011-07-08 01:21:36 -0400 |
commit | 314b02f503c2c219fde0fcf6f086fda415f8a847 (patch) | |
tree | 7f41ae421e6cb11d821175465b1346851a600292 /drivers/of/platform.c | |
parent | a77ce8167cc1d0370fcb1d79b367d62e050cb2b0 (diff) |
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/platform.c')
-rw-r--r-- | drivers/of/platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 63d3cb73bdb9..cfc6a7969401 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, | |||
153 | } | 153 | } |
154 | 154 | ||
155 | dev->dev.of_node = of_node_get(np); | 155 | dev->dev.of_node = of_node_get(np); |
156 | #if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE) | 156 | #if defined(CONFIG_MICROBLAZE) |
157 | dev->dev.dma_mask = &dev->archdata.dma_mask; | 157 | dev->dev.dma_mask = &dev->archdata.dma_mask; |
158 | #endif | 158 | #endif |
159 | dev->dev.parent = parent; | 159 | dev->dev.parent = parent; |
@@ -189,7 +189,7 @@ struct platform_device *of_platform_device_create(struct device_node *np, | |||
189 | if (!dev) | 189 | if (!dev) |
190 | return NULL; | 190 | return NULL; |
191 | 191 | ||
192 | #if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE) | 192 | #if defined(CONFIG_MICROBLAZE) |
193 | dev->archdata.dma_mask = 0xffffffffUL; | 193 | dev->archdata.dma_mask = 0xffffffffUL; |
194 | #endif | 194 | #endif |
195 | dev->dev.coherent_dma_mask = DMA_BIT_MASK(32); | 195 | dev->dev.coherent_dma_mask = DMA_BIT_MASK(32); |