Skip to content

L
linux-davinci
Commit 4b62220b authored by Ralf Baechle's avatar Ralf Baechle
Browse files
Options

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

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent f366e208
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 20 deletions
arch/mips/au1000/common/platform.c
View file @ 4b62220b
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -77,14 +78,14 @@ static struct resource au1xxx_usb_ohci_resources[] = { ...@@ -77,14 +78,14 @@ static struct resource au1xxx_usb_ohci_resources[] = {
}; };
/* 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 struct platform_device au1xxx_usb_ohci_device = { static struct platform_device au1xxx_usb_ohci_device = {
.name = "au1xxx-ohci", .name = "au1xxx-ohci",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &ohci_dmamask, .dma_mask = &ohci_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(au1xxx_usb_ohci_resources), .num_resources = ARRAY_SIZE(au1xxx_usb_ohci_resources),
.resource = au1xxx_usb_ohci_resources, .resource = au1xxx_usb_ohci_resources,
...@@ -106,14 +107,14 @@ static struct resource au1100_lcd_resources[] = { ...@@ -106,14 +107,14 @@ static struct resource au1100_lcd_resources[] = {
} }
}; };
static u64 au1100_lcd_dmamask = ~(u32)0; static u64 au1100_lcd_dmamask = DMA_32BIT_MASK;
static struct platform_device au1100_lcd_device = { static struct platform_device au1100_lcd_device = {
.name = "au1100-lcd", .name = "au1100-lcd",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &au1100_lcd_dmamask, .dma_mask = &au1100_lcd_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(au1100_lcd_resources), .num_resources = ARRAY_SIZE(au1100_lcd_resources),
.resource = au1100_lcd_resources, .resource = au1100_lcd_resources,
...@@ -135,14 +136,14 @@ static struct resource au1xxx_usb_ehci_resources[] = { ...@@ -135,14 +136,14 @@ static struct resource au1xxx_usb_ehci_resources[] = {
}, },
}; };
static u64 ehci_dmamask = ~(u32)0; static u64 ehci_dmamask = DMA_32BIT_MASK;
static struct platform_device au1xxx_usb_ehci_device = { static struct platform_device au1xxx_usb_ehci_device = {
.name = "au1xxx-ehci", .name = "au1xxx-ehci",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &ehci_dmamask, .dma_mask = &ehci_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(au1xxx_usb_ehci_resources), .num_resources = ARRAY_SIZE(au1xxx_usb_ehci_resources),
.resource = au1xxx_usb_ehci_resources, .resource = au1xxx_usb_ehci_resources,
...@@ -180,14 +181,14 @@ static struct resource au1xxx_mmc_resources[] = { ...@@ -180,14 +181,14 @@ static struct resource au1xxx_mmc_resources[] = {
} }
}; };
static u64 udc_dmamask = ~(u32)0; static u64 udc_dmamask = DMA_32BIT_MASK;
static struct platform_device au1xxx_usb_gdt_device = { static struct platform_device au1xxx_usb_gdt_device = {
.name = "au1xxx-udc", .name = "au1xxx-udc",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &udc_dmamask, .dma_mask = &udc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(au1xxx_usb_gdt_resources), .num_resources = ARRAY_SIZE(au1xxx_usb_gdt_resources),
.resource = au1xxx_usb_gdt_resources, .resource = au1xxx_usb_gdt_resources,
...@@ -207,14 +208,14 @@ static struct resource au1xxx_usb_otg_resources[] = { ...@@ -207,14 +208,14 @@ static struct resource au1xxx_usb_otg_resources[] = {
}, },
}; };
static u64 uoc_dmamask = ~(u32)0; static u64 uoc_dmamask = DMA_32BIT_MASK;
static struct platform_device au1xxx_usb_otg_device = { static struct platform_device au1xxx_usb_otg_device = {
.name = "au1xxx-uoc", .name = "au1xxx-uoc",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &uoc_dmamask, .dma_mask = &uoc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(au1xxx_usb_otg_resources), .num_resources = ARRAY_SIZE(au1xxx_usb_otg_resources),
.resource = au1xxx_usb_otg_resources, .resource = au1xxx_usb_otg_resources,
...@@ -233,27 +234,27 @@ static struct resource au1200_lcd_resources[] = { ...@@ -233,27 +234,27 @@ static struct resource au1200_lcd_resources[] = {
} }
}; };
static u64 au1200_lcd_dmamask = ~(u32)0; static u64 au1200_lcd_dmamask = DMA_32BIT_MASK;
static struct platform_device au1200_lcd_device = { static struct platform_device au1200_lcd_device = {
.name = "au1200-lcd", .name = "au1200-lcd",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &au1200_lcd_dmamask, .dma_mask = &au1200_lcd_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(au1200_lcd_resources), .num_resources = ARRAY_SIZE(au1200_lcd_resources),
.resource = au1200_lcd_resources, .resource = au1200_lcd_resources,
}; };
static u64 au1xxx_mmc_dmamask = ~(u32)0; static u64 au1xxx_mmc_dmamask = DMA_32BIT_MASK;
static struct platform_device au1xxx_mmc_device = { static struct platform_device au1xxx_mmc_device = {
.name = "au1xxx-mmc", .name = "au1xxx-mmc",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &au1xxx_mmc_dmamask, .dma_mask = &au1xxx_mmc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(au1xxx_mmc_resources), .num_resources = ARRAY_SIZE(au1xxx_mmc_resources),
.resource = au1xxx_mmc_resources, .resource = au1xxx_mmc_resources,
......
arch/mips/au1000/pb1200/platform.c
View file @ 4b62220b
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <linux/dma-mapping.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -36,14 +37,14 @@ static struct resource ide_resources[] = { ...@@ -36,14 +37,14 @@ static struct resource ide_resources[] = {
} }
}; };
static u64 ide_dmamask = ~(u32)0; static u64 ide_dmamask = DMA_32BIT_MASK;
static struct platform_device ide_device = { static struct platform_device ide_device = {
.name = "au1200-ide", .name = "au1200-ide",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &ide_dmamask, .dma_mask = &ide_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(ide_resources), .num_resources = ARRAY_SIZE(ide_resources),
.resource = ide_resources .resource = ide_resources
......
arch/mips/nxp/pnx8550/common/platform.c
View file @ 4b62220b
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/resource.h> #include <linux/resource.h>
...@@ -91,16 +92,16 @@ struct pnx8xxx_port pnx8xxx_ports[] = { ...@@ -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 = { static struct platform_device pnx8550_usb_ohci_device = {
.name = "pnx8550-ohci", .name = "pnx8550-ohci",
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &ohci_dmamask, .dma_mask = &ohci_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
}, },
.num_resources = ARRAY_SIZE(pnx8550_usb_ohci_resources), .num_resources = ARRAY_SIZE(pnx8550_usb_ohci_resources),
.resource = pnx8550_usb_ohci_resources, .resource = pnx8550_usb_ohci_resources,
...@@ -111,7 +112,7 @@ static struct platform_device pnx8550_uart_device = { ...@@ -111,7 +112,7 @@ static struct platform_device pnx8550_uart_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &uart_dmamask, .dma_mask = &uart_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
.platform_data = pnx8xxx_ports, .platform_data = pnx8xxx_ports,
}, },
.num_resources = ARRAY_SIZE(pnx8550_uart_resources), .num_resources = ARRAY_SIZE(pnx8550_uart_resources),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment