Makes au1000-eth work again, tested on DB1500.
Unified · Split
| @@ -131,9 +131,7 @@ static void __init alchemy_setup_uarts(int ctype) · 130 unmodified lines | ||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | |
| 134 | −/* The dmamask must be set for OHCI/EHCI to work */ | |
| 135 | −static u64 alchemy_ohci_dmamask = DMA_BIT_MASK(32); | |
| 136 | −static u64 __maybe_unused alchemy_ehci_dmamask = DMA_BIT_MASK(32); | |
| 134 | +static u64 alchemy_all_dmamask = DMA_BIT_MASK(32); | |
| 137 | 135 | |
| 138 | 136 | /* Power on callback for the ehci platform driver */ |
| 139 | 137 | static int alchemy_ehci_power_on(struct platform_device *pdev) |
| @@ -231,7 +229,7 @@ static void __init alchemy_setup_usb(int ctype) · 91 unmodified lines | ||
| 231 | 229 | res[1].flags = IORESOURCE_IRQ; |
| 232 | 230 | pdev->name = "ohci-platform"; |
| 233 | 231 | pdev->id = 0; |
| 234 | − pdev->dev.dma_mask = &alchemy_ohci_dmamask; | |
| 232 | + pdev->dev.dma_mask = &alchemy_all_dmamask; | |
| 235 | 233 | pdev->dev.platform_data = &alchemy_ohci_pdata; |
| 236 | 234 | |
| 237 | 235 | if (platform_device_register(pdev)) |
| @@ -251,7 +249,7 @@ static void __init alchemy_setup_usb(int ctype) · 13 unmodified lines | ||
| 251 | 249 | res[1].flags = IORESOURCE_IRQ; |
| 252 | 250 | pdev->name = "ehci-platform"; |
| 253 | 251 | pdev->id = 0; |
| 254 | − pdev->dev.dma_mask = &alchemy_ehci_dmamask; | |
| 252 | + pdev->dev.dma_mask = &alchemy_all_dmamask; | |
| 255 | 253 | pdev->dev.platform_data = &alchemy_ehci_pdata; |
| 256 | 254 | |
| 257 | 255 | if (platform_device_register(pdev)) |
| @@ -271,7 +269,7 @@ static void __init alchemy_setup_usb(int ctype) · 13 unmodified lines | ||
| 271 | 269 | res[1].flags = IORESOURCE_IRQ; |
| 272 | 270 | pdev->name = "ohci-platform"; |
| 273 | 271 | pdev->id = 1; |
| 274 | − pdev->dev.dma_mask = &alchemy_ohci_dmamask; | |
| 272 | + pdev->dev.dma_mask = &alchemy_all_dmamask; | |
| 275 | 273 | pdev->dev.platform_data = &alchemy_ohci_pdata; |
| 276 | 274 | |
| 277 | 275 | if (platform_device_register(pdev)) |
| @@ -338,7 +336,11 @@ static struct platform_device au1xxx_eth0_device = { · 60 unmodified lines | ||
| 338 | 336 | .name = "au1000-eth", |
| 339 | 337 | .id = 0, |
| 340 | 338 | .num_resources = MAC_RES_COUNT, |
| 341 | − .dev.platform_data = &au1xxx_eth0_platform_data, | |
| 339 | + .dev = { | |
| 340 | + .dma_mask = &alchemy_all_dmamask, | |
| 341 | + .coherent_dma_mask = DMA_BIT_MASK(32), | |
| 342 | + .platform_data = &au1xxx_eth0_platform_data, | |
| 343 | + }, | |
| 342 | 344 | }; |
| 343 | 345 | |
| 344 | 346 | static struct resource au1xxx_eth1_resources[][MAC_RES_COUNT] __initdata = { |
| @@ -370,7 +372,11 @@ static struct platform_device au1xxx_eth1_device = { · 25 unmodified lines | ||
| 370 | 372 | .name = "au1000-eth", |
| 371 | 373 | .id = 1, |
| 372 | 374 | .num_resources = MAC_RES_COUNT, |
| 373 | − .dev.platform_data = &au1xxx_eth1_platform_data, | |
| 375 | + .dev = { | |
| 376 | + .dma_mask = &alchemy_all_dmamask, | |
| 377 | + .coherent_dma_mask = DMA_BIT_MASK(32), | |
| 378 | + .platform_data = &au1xxx_eth1_platform_data, | |
| 379 | + }, | |
| 374 | 380 | }; |
| 375 | 381 | |
| 376 | 382 | void __init au1xxx_override_eth_cfg(unsigned int port, |