Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[MIPS] Alchemy, PNX: Use symbolic constants for DMA masks.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

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