diff options
-rw-r--r-- | arch/sparc/kernel/of_device_32.c | 4 | ||||
-rw-r--r-- | arch/sparc/kernel/of_device_64.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c index 3641a294ed54..e4abe9b8f97a 100644 --- a/arch/sparc/kernel/of_device_32.c +++ b/arch/sparc/kernel/of_device_32.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/irq.h> | 9 | #include <linux/irq.h> |
10 | #include <linux/of_device.h> | 10 | #include <linux/of_device.h> |
11 | #include <linux/of_platform.h> | 11 | #include <linux/of_platform.h> |
12 | #include <linux/dma-mapping.h> | ||
12 | #include <asm/leon.h> | 13 | #include <asm/leon.h> |
13 | #include <asm/leon_amba.h> | 14 | #include <asm/leon_amba.h> |
14 | 15 | ||
@@ -381,6 +382,9 @@ static struct platform_device * __init scan_one_device(struct device_node *dp, | |||
381 | else | 382 | else |
382 | dev_set_name(&op->dev, "%08x", dp->phandle); | 383 | dev_set_name(&op->dev, "%08x", dp->phandle); |
383 | 384 | ||
385 | op->dev.coherent_dma_mask = DMA_BIT_MASK(32); | ||
386 | op->dev.dma_mask = &op->dev.coherent_dma_mask; | ||
387 | |||
384 | if (of_device_register(op)) { | 388 | if (of_device_register(op)) { |
385 | printk("%s: Could not register of device.\n", | 389 | printk("%s: Could not register of device.\n", |
386 | dp->full_name); | 390 | dp->full_name); |
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c index 44e4d4435bed..6df6086968c6 100644 --- a/arch/sparc/kernel/of_device_64.c +++ b/arch/sparc/kernel/of_device_64.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include <linux/string.h> | 2 | #include <linux/string.h> |
3 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
4 | #include <linux/of.h> | 4 | #include <linux/of.h> |
5 | #include <linux/dma-mapping.h> | ||
5 | #include <linux/init.h> | 6 | #include <linux/init.h> |
6 | #include <linux/export.h> | 7 | #include <linux/export.h> |
7 | #include <linux/mod_devicetable.h> | 8 | #include <linux/mod_devicetable.h> |
@@ -675,6 +676,8 @@ static struct platform_device * __init scan_one_device(struct device_node *dp, | |||
675 | dev_set_name(&op->dev, "root"); | 676 | dev_set_name(&op->dev, "root"); |
676 | else | 677 | else |
677 | dev_set_name(&op->dev, "%08x", dp->phandle); | 678 | dev_set_name(&op->dev, "%08x", dp->phandle); |
679 | op->dev.coherent_dma_mask = DMA_BIT_MASK(32); | ||
680 | op->dev.dma_mask = &op->dev.coherent_dma_mask; | ||
678 | 681 | ||
679 | if (of_device_register(op)) { | 682 | if (of_device_register(op)) { |
680 | printk("%s: Could not register of device.\n", | 683 | printk("%s: Could not register of device.\n", |