git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
mips
/
nxp
/
pnx8550
/
common
/
platform.c
diff --git
a/arch/mips/nxp/pnx8550/common/platform.c
b/arch/mips/nxp/pnx8550/common/platform.c
index
c7c763d
..
21d2955
100644
(file)
--- a/
arch/mips/nxp/pnx8550/common/platform.c
+++ b/
arch/mips/nxp/pnx8550/common/platform.c
@@
-13,6
+13,7
@@
* warranty of any kind, whether express or implied.
*/
#include <linux/device.h>
* warranty of any kind, whether express or implied.
*/
#include <linux/device.h>
+#include <linux/dma-mapping.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/resource.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/resource.h>
@@
-91,16
+92,16
@@
struct pnx8xxx_port pnx8xxx_ports[] = {
};
/* The dmamask must be set for OHCI to work */
};
/* The dmamask must be set for OHCI to work */
-static u64 ohci_dmamask =
~(u32)0
;
+static u64 ohci_dmamask =
DMA_32BIT_MASK
;
-static u64 uart_dmamask =
~(u32)0
;
+static u64 uart_dmamask =
DMA_32BIT_MASK
;
static struct platform_device pnx8550_usb_ohci_device = {
.name = "pnx8550-ohci",
.id = -1,
.dev = {
.dma_mask = &ohci_dmamask,
static struct platform_device pnx8550_usb_ohci_device = {
.name = "pnx8550-ohci",
.id = -1,
.dev = {
.dma_mask = &ohci_dmamask,
- .coherent_dma_mask =
0xffffffff
,
+ .coherent_dma_mask =
DMA_32BIT_MASK
,
},
.num_resources = ARRAY_SIZE(pnx8550_usb_ohci_resources),
.resource = pnx8550_usb_ohci_resources,
},
.num_resources = ARRAY_SIZE(pnx8550_usb_ohci_resources),
.resource = pnx8550_usb_ohci_resources,
@@
-111,7
+112,7
@@
static struct platform_device pnx8550_uart_device = {
.id = -1,
.dev = {
.dma_mask = &uart_dmamask,
.id = -1,
.dev = {
.dma_mask = &uart_dmamask,
- .coherent_dma_mask =
0xffffffff
,
+ .coherent_dma_mask =
DMA_32BIT_MASK
,
.platform_data = pnx8xxx_ports,
},
.num_resources = ARRAY_SIZE(pnx8550_uart_resources),
.platform_data = pnx8xxx_ports,
},
.num_resources = ARRAY_SIZE(pnx8550_uart_resources),