diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 13:44:29 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 13:44:29 -0400 |
commit | 4b62220b608ab71876d8920d5590f1db4ee2eb4a (patch) | |
tree | 99cb4b5884aae5916457bc3537069651620cfa22 | |
parent | f366e2085f28358a5294b8cdc847a377c02eb22d (diff) |
[MIPS] Alchemy, PNX: Use symbolic constants for DMA masks.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/au1000/common/platform.c | 29 | ||||
-rw-r--r-- | arch/mips/au1000/pb1200/platform.c | 5 | ||||
-rw-r--r-- | arch/mips/nxp/pnx8550/common/platform.c | 9 |
3 files changed, 23 insertions, 20 deletions
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 74d6d4a593be..dc8a67efac28 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * warranty of any kind, whether express or implied. | 11 | * warranty of any kind, whether express or implied. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/dma-mapping.h> | ||
14 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
15 | #include <linux/serial_8250.h> | 16 | #include <linux/serial_8250.h> |
16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
@@ -77,14 +78,14 @@ static struct resource au1xxx_usb_ohci_resources[] = { | |||
77 | }; | 78 | }; |
78 | 79 | ||
79 | /* The dmamask must be set for OHCI to work */ | 80 | /* The dmamask must be set for OHCI to work */ |
80 | static u64 ohci_dmamask = ~(u32)0; | 81 | static u64 ohci_dmamask = DMA_32BIT_MASK; |
81 | 82 | ||
82 | static struct platform_device au1xxx_usb_ohci_device = { | 83 | static struct platform_device au1xxx_usb_ohci_device = { |
83 | .name = "au1xxx-ohci", | 84 | .name = "au1xxx-ohci", |
84 | .id = 0, | 85 | .id = 0, |
85 | .dev = { | 86 | .dev = { |
86 | .dma_mask = &ohci_dmamask, | 87 | .dma_mask = &ohci_dmamask, |
87 | .coherent_dma_mask = 0xffffffff, | 88 | .coherent_dma_mask = DMA_32BIT_MASK, |
88 | }, | 89 | }, |
89 | .num_resources = ARRAY_SIZE(au1xxx_usb_ohci_resources), | 90 | .num_resources = ARRAY_SIZE(au1xxx_usb_ohci_resources), |
90 | .resource = au1xxx_usb_ohci_resources, | 91 | .resource = au1xxx_usb_ohci_resources, |
@@ -106,14 +107,14 @@ static struct resource au1100_lcd_resources[] = { | |||
106 | } | 107 | } |
107 | }; | 108 | }; |
108 | 109 | ||
109 | static u64 au1100_lcd_dmamask = ~(u32)0; | 110 | static u64 au1100_lcd_dmamask = DMA_32BIT_MASK; |
110 | 111 | ||
111 | static struct platform_device au1100_lcd_device = { | 112 | static struct platform_device au1100_lcd_device = { |
112 | .name = "au1100-lcd", | 113 | .name = "au1100-lcd", |
113 | .id = 0, | 114 | .id = 0, |
114 | .dev = { | 115 | .dev = { |
115 | .dma_mask = &au1100_lcd_dmamask, | 116 | .dma_mask = &au1100_lcd_dmamask, |
116 | .coherent_dma_mask = 0xffffffff, | 117 | .coherent_dma_mask = DMA_32BIT_MASK, |
117 | }, | 118 | }, |
118 | .num_resources = ARRAY_SIZE(au1100_lcd_resources), | 119 | .num_resources = ARRAY_SIZE(au1100_lcd_resources), |
119 | .resource = au1100_lcd_resources, | 120 | .resource = au1100_lcd_resources, |
@@ -135,14 +136,14 @@ static struct resource au1xxx_usb_ehci_resources[] = { | |||
135 | }, | 136 | }, |
136 | }; | 137 | }; |
137 | 138 | ||
138 | static u64 ehci_dmamask = ~(u32)0; | 139 | static u64 ehci_dmamask = DMA_32BIT_MASK; |
139 | 140 | ||
140 | static struct platform_device au1xxx_usb_ehci_device = { | 141 | static struct platform_device au1xxx_usb_ehci_device = { |
141 | .name = "au1xxx-ehci", | 142 | .name = "au1xxx-ehci", |
142 | .id = 0, | 143 | .id = 0, |
143 | .dev = { | 144 | .dev = { |
144 | .dma_mask = &ehci_dmamask, | 145 | .dma_mask = &ehci_dmamask, |
145 | .coherent_dma_mask = 0xffffffff, | 146 | .coherent_dma_mask = DMA_32BIT_MASK, |
146 | }, | 147 | }, |
147 | .num_resources = ARRAY_SIZE(au1xxx_usb_ehci_resources), | 148 | .num_resources = ARRAY_SIZE(au1xxx_usb_ehci_resources), |
148 | .resource = au1xxx_usb_ehci_resources, | 149 | .resource = au1xxx_usb_ehci_resources, |
@@ -180,14 +181,14 @@ static struct resource au1xxx_mmc_resources[] = { | |||
180 | } | 181 | } |
181 | }; | 182 | }; |
182 | 183 | ||
183 | static u64 udc_dmamask = ~(u32)0; | 184 | static u64 udc_dmamask = DMA_32BIT_MASK; |
184 | 185 | ||
185 | static struct platform_device au1xxx_usb_gdt_device = { | 186 | static struct platform_device au1xxx_usb_gdt_device = { |
186 | .name = "au1xxx-udc", | 187 | .name = "au1xxx-udc", |
187 | .id = 0, | 188 | .id = 0, |
188 | .dev = { | 189 | .dev = { |
189 | .dma_mask = &udc_dmamask, | 190 | .dma_mask = &udc_dmamask, |
190 | .coherent_dma_mask = 0xffffffff, | 191 | .coherent_dma_mask = DMA_32BIT_MASK, |
191 | }, | 192 | }, |
192 | .num_resources = ARRAY_SIZE(au1xxx_usb_gdt_resources), | 193 | .num_resources = ARRAY_SIZE(au1xxx_usb_gdt_resources), |
193 | .resource = au1xxx_usb_gdt_resources, | 194 | .resource = au1xxx_usb_gdt_resources, |
@@ -207,14 +208,14 @@ static struct resource au1xxx_usb_otg_resources[] = { | |||
207 | }, | 208 | }, |
208 | }; | 209 | }; |
209 | 210 | ||
210 | static u64 uoc_dmamask = ~(u32)0; | 211 | static u64 uoc_dmamask = DMA_32BIT_MASK; |
211 | 212 | ||
212 | static struct platform_device au1xxx_usb_otg_device = { | 213 | static struct platform_device au1xxx_usb_otg_device = { |
213 | .name = "au1xxx-uoc", | 214 | .name = "au1xxx-uoc", |
214 | .id = 0, | 215 | .id = 0, |
215 | .dev = { | 216 | .dev = { |
216 | .dma_mask = &uoc_dmamask, | 217 | .dma_mask = &uoc_dmamask, |
217 | .coherent_dma_mask = 0xffffffff, | 218 | .coherent_dma_mask = DMA_32BIT_MASK, |
218 | }, | 219 | }, |
219 | .num_resources = ARRAY_SIZE(au1xxx_usb_otg_resources), | 220 | .num_resources = ARRAY_SIZE(au1xxx_usb_otg_resources), |
220 | .resource = au1xxx_usb_otg_resources, | 221 | .resource = au1xxx_usb_otg_resources, |
@@ -233,27 +234,27 @@ static struct resource au1200_lcd_resources[] = { | |||
233 | } | 234 | } |
234 | }; | 235 | }; |
235 | 236 | ||
236 | static u64 au1200_lcd_dmamask = ~(u32)0; | 237 | static u64 au1200_lcd_dmamask = DMA_32BIT_MASK; |
237 | 238 | ||
238 | static struct platform_device au1200_lcd_device = { | 239 | static struct platform_device au1200_lcd_device = { |
239 | .name = "au1200-lcd", | 240 | .name = "au1200-lcd", |
240 | .id = 0, | 241 | .id = 0, |
241 | .dev = { | 242 | .dev = { |
242 | .dma_mask = &au1200_lcd_dmamask, | 243 | .dma_mask = &au1200_lcd_dmamask, |
243 | .coherent_dma_mask = 0xffffffff, | 244 | .coherent_dma_mask = DMA_32BIT_MASK, |
244 | }, | 245 | }, |
245 | .num_resources = ARRAY_SIZE(au1200_lcd_resources), | 246 | .num_resources = ARRAY_SIZE(au1200_lcd_resources), |
246 | .resource = au1200_lcd_resources, | 247 | .resource = au1200_lcd_resources, |
247 | }; | 248 | }; |
248 | 249 | ||
249 | static u64 au1xxx_mmc_dmamask = ~(u32)0; | 250 | static u64 au1xxx_mmc_dmamask = DMA_32BIT_MASK; |
250 | 251 | ||
251 | static struct platform_device au1xxx_mmc_device = { | 252 | static struct platform_device au1xxx_mmc_device = { |
252 | .name = "au1xxx-mmc", | 253 | .name = "au1xxx-mmc", |
253 | .id = 0, | 254 | .id = 0, |
254 | .dev = { | 255 | .dev = { |
255 | .dma_mask = &au1xxx_mmc_dmamask, | 256 | .dma_mask = &au1xxx_mmc_dmamask, |
256 | .coherent_dma_mask = 0xffffffff, | 257 | .coherent_dma_mask = DMA_32BIT_MASK, |
257 | }, | 258 | }, |
258 | .num_resources = ARRAY_SIZE(au1xxx_mmc_resources), | 259 | .num_resources = ARRAY_SIZE(au1xxx_mmc_resources), |
259 | .resource = au1xxx_mmc_resources, | 260 | .resource = au1xxx_mmc_resources, |
diff --git a/arch/mips/au1000/pb1200/platform.c b/arch/mips/au1000/pb1200/platform.c index 5930110b9b6d..f8fb0aeac571 100644 --- a/arch/mips/au1000/pb1200/platform.c +++ b/arch/mips/au1000/pb1200/platform.c | |||
@@ -18,6 +18,7 @@ | |||
18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/dma-mapping.h> | ||
21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
22 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
23 | 24 | ||
@@ -36,14 +37,14 @@ static struct resource ide_resources[] = { | |||
36 | } | 37 | } |
37 | }; | 38 | }; |
38 | 39 | ||
39 | static u64 ide_dmamask = ~(u32)0; | 40 | static u64 ide_dmamask = DMA_32BIT_MASK; |
40 | 41 | ||
41 | static struct platform_device ide_device = { | 42 | static struct platform_device ide_device = { |
42 | .name = "au1200-ide", | 43 | .name = "au1200-ide", |
43 | .id = 0, | 44 | .id = 0, |
44 | .dev = { | 45 | .dev = { |
45 | .dma_mask = &ide_dmamask, | 46 | .dma_mask = &ide_dmamask, |
46 | .coherent_dma_mask = 0xffffffff, | 47 | .coherent_dma_mask = DMA_32BIT_MASK, |
47 | }, | 48 | }, |
48 | .num_resources = ARRAY_SIZE(ide_resources), | 49 | .num_resources = ARRAY_SIZE(ide_resources), |
49 | .resource = ide_resources | 50 | .resource = ide_resources |
diff --git a/arch/mips/nxp/pnx8550/common/platform.c b/arch/mips/nxp/pnx8550/common/platform.c index c7c763dbe588..21d2955359b3 100644 --- a/arch/mips/nxp/pnx8550/common/platform.c +++ b/arch/mips/nxp/pnx8550/common/platform.c | |||
@@ -13,6 +13,7 @@ | |||
13 | * warranty of any kind, whether express or implied. | 13 | * warranty of any kind, whether express or implied. |
14 | */ | 14 | */ |
15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
16 | #include <linux/dma-mapping.h> | ||
16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
18 | #include <linux/resource.h> | 19 | #include <linux/resource.h> |
@@ -91,16 +92,16 @@ struct pnx8xxx_port pnx8xxx_ports[] = { | |||
91 | }; | 92 | }; |
92 | 93 | ||
93 | /* The dmamask must be set for OHCI to work */ | 94 | /* The dmamask must be set for OHCI to work */ |
94 | static u64 ohci_dmamask = ~(u32)0; | 95 | static u64 ohci_dmamask = DMA_32BIT_MASK; |
95 | 96 | ||
96 | static u64 uart_dmamask = ~(u32)0; | 97 | static u64 uart_dmamask = DMA_32BIT_MASK; |
97 | 98 | ||
98 | static struct platform_device pnx8550_usb_ohci_device = { | 99 | static struct platform_device pnx8550_usb_ohci_device = { |
99 | .name = "pnx8550-ohci", | 100 | .name = "pnx8550-ohci", |
100 | .id = -1, | 101 | .id = -1, |
101 | .dev = { | 102 | .dev = { |
102 | .dma_mask = &ohci_dmamask, | 103 | .dma_mask = &ohci_dmamask, |
103 | .coherent_dma_mask = 0xffffffff, | 104 | .coherent_dma_mask = DMA_32BIT_MASK, |
104 | }, | 105 | }, |
105 | .num_resources = ARRAY_SIZE(pnx8550_usb_ohci_resources), | 106 | .num_resources = ARRAY_SIZE(pnx8550_usb_ohci_resources), |
106 | .resource = pnx8550_usb_ohci_resources, | 107 | .resource = pnx8550_usb_ohci_resources, |
@@ -111,7 +112,7 @@ static struct platform_device pnx8550_uart_device = { | |||
111 | .id = -1, | 112 | .id = -1, |
112 | .dev = { | 113 | .dev = { |
113 | .dma_mask = &uart_dmamask, | 114 | .dma_mask = &uart_dmamask, |
114 | .coherent_dma_mask = 0xffffffff, | 115 | .coherent_dma_mask = DMA_32BIT_MASK, |
115 | .platform_data = pnx8xxx_ports, | 116 | .platform_data = pnx8xxx_ports, |
116 | }, | 117 | }, |
117 | .num_resources = ARRAY_SIZE(pnx8550_uart_resources), | 118 | .num_resources = ARRAY_SIZE(pnx8550_uart_resources), |