Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
12 个月 前同步成功

通知 150
Star 36
Fork 7
cloud-kernel
cloud-kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 c6686ff9 编写于 作者: A Andrew Victor 提交者： Russell King
浏览文件
操作

[ARM] 4753/1: [AT91] Use DMA_BIT_MASK 

Replace hard-coded DMA mask (0xffffffff) with DMA_BIT_MASK(32) as
defined in dma-mapping.h.
Set "dma_mask" field for the UART platform_devices.
Signed-off-by: NAndrew Victor <linux@maxim.org.za>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 884f5a6a
显示空白变更内容
内联 并排
Showing with 181 addition and 101 deletion
arch/arm/mach-at91/at91rm9200_devices.c
浏览文件 @ c6686ff9
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
static u64 ohci_dmamask = 0xffffffffUL; static u64 ohci_dmamask = DMA_BIT_MASK(32);
static struct at91_usbh_data usbh_data; static struct at91_usbh_data usbh_data;
static struct resource usbh_resources[] = { static struct resource usbh_resources[] = {
...@@ -50,7 +51,7 @@ static struct platform_device at91rm9200_usbh_device = { ...@@ -50,7 +51,7 @@ static struct platform_device at91rm9200_usbh_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &ohci_dmamask, .dma_mask = &ohci_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &usbh_data, .platform_data = &usbh_data,
}, },
.resource = usbh_resources, .resource = usbh_resources,
...@@ -125,7 +126,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {} ...@@ -125,7 +126,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_ARM_AT91_ETHER) || defined(CONFIG_ARM_AT91_ETHER_MODULE) #if defined(CONFIG_ARM_AT91_ETHER) || defined(CONFIG_ARM_AT91_ETHER_MODULE)
static u64 eth_dmamask = 0xffffffffUL; static u64 eth_dmamask = DMA_BIT_MASK(32);
static struct at91_eth_data eth_data; static struct at91_eth_data eth_data;
static struct resource eth_resources[] = { static struct resource eth_resources[] = {
...@@ -146,7 +147,7 @@ static struct platform_device at91rm9200_eth_device = { ...@@ -146,7 +147,7 @@ static struct platform_device at91rm9200_eth_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &eth_dmamask, .dma_mask = &eth_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &eth_data, .platform_data = &eth_data,
}, },
.resource = eth_resources, .resource = eth_resources,
...@@ -285,7 +286,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data) {} ...@@ -285,7 +286,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data) {}
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE) #if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
static u64 mmc_dmamask = 0xffffffffUL; static u64 mmc_dmamask = DMA_BIT_MASK(32);
static struct at91_mmc_data mmc_data; static struct at91_mmc_data mmc_data;
static struct resource mmc_resources[] = { static struct resource mmc_resources[] = {
...@@ -306,7 +307,7 @@ static struct platform_device at91rm9200_mmc_device = { ...@@ -306,7 +307,7 @@ static struct platform_device at91rm9200_mmc_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &mmc_dmamask, .dma_mask = &mmc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &mmc_data, .platform_data = &mmc_data,
}, },
.resource = mmc_resources, .resource = mmc_resources,
...@@ -513,7 +514,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) ...@@ -513,7 +514,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
static u64 spi_dmamask = 0xffffffffUL; static u64 spi_dmamask = DMA_BIT_MASK(32);
static struct resource spi_resources[] = { static struct resource spi_resources[] = {
[0] = { [0] = {
...@@ -533,7 +534,7 @@ static struct platform_device at91rm9200_spi_device = { ...@@ -533,7 +534,7 @@ static struct platform_device at91rm9200_spi_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
.resource = spi_resources, .resource = spi_resources,
.num_resources = ARRAY_SIZE(spi_resources), .num_resources = ARRAY_SIZE(spi_resources),
...@@ -658,12 +659,15 @@ static struct atmel_uart_data dbgu_data = { ...@@ -658,12 +659,15 @@ static struct atmel_uart_data dbgu_data = {
.regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
}; };
static u64 dbgu_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91rm9200_dbgu_device = { static struct platform_device at91rm9200_dbgu_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &dbgu_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &dbgu_data, .platform_data = &dbgu_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = dbgu_resources, .resource = dbgu_resources,
.num_resources = ARRAY_SIZE(dbgu_resources), .num_resources = ARRAY_SIZE(dbgu_resources),
...@@ -693,12 +697,15 @@ static struct atmel_uart_data uart0_data = { ...@@ -693,12 +697,15 @@ static struct atmel_uart_data uart0_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart0_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91rm9200_uart0_device = { static struct platform_device at91rm9200_uart0_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &uart0_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart0_data, .platform_data = &uart0_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart0_resources, .resource = uart0_resources,
.num_resources = ARRAY_SIZE(uart0_resources), .num_resources = ARRAY_SIZE(uart0_resources),
...@@ -735,12 +742,15 @@ static struct atmel_uart_data uart1_data = { ...@@ -735,12 +742,15 @@ static struct atmel_uart_data uart1_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart1_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91rm9200_uart1_device = { static struct platform_device at91rm9200_uart1_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 2, .id = 2,
.dev = { .dev = {
.dma_mask = &uart1_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart1_data, .platform_data = &uart1_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart1_resources, .resource = uart1_resources,
.num_resources = ARRAY_SIZE(uart1_resources), .num_resources = ARRAY_SIZE(uart1_resources),
...@@ -776,12 +786,15 @@ static struct atmel_uart_data uart2_data = { ...@@ -776,12 +786,15 @@ static struct atmel_uart_data uart2_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart2_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91rm9200_uart2_device = { static struct platform_device at91rm9200_uart2_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 3, .id = 3,
.dev = { .dev = {
.dma_mask = &uart2_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart2_data, .platform_data = &uart2_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart2_resources, .resource = uart2_resources,
.num_resources = ARRAY_SIZE(uart2_resources), .num_resources = ARRAY_SIZE(uart2_resources),
...@@ -811,12 +824,15 @@ static struct atmel_uart_data uart3_data = { ...@@ -811,12 +824,15 @@ static struct atmel_uart_data uart3_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart3_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91rm9200_uart3_device = { static struct platform_device at91rm9200_uart3_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 4, .id = 4,
.dev = { .dev = {
.dma_mask = &uart3_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart3_data, .platform_data = &uart3_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart3_resources, .resource = uart3_resources,
.num_resources = ARRAY_SIZE(uart3_resources), .num_resources = ARRAY_SIZE(uart3_resources),
...@@ -828,7 +844,7 @@ static inline void configure_usart3_pins(void) ...@@ -828,7 +844,7 @@ static inline void configure_usart3_pins(void)
at91_set_B_periph(AT91_PIN_PA6, 0); /* RXD3 */ at91_set_B_periph(AT91_PIN_PA6, 0); /* RXD3 */
} }
struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */ static struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */
struct platform_device *atmel_default_console_device; /* the serial console device */ struct platform_device *atmel_default_console_device; /* the serial console device */
void __init at91_init_serial(struct at91_uart_config *config) void __init at91_init_serial(struct at91_uart_config *config)
......
arch/arm/mach-at91/at91sam9260_devices.c
浏览文件 @ c6686ff9
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
static u64 ohci_dmamask = 0xffffffffUL; static u64 ohci_dmamask = DMA_BIT_MASK(32);
static struct at91_usbh_data usbh_data; static struct at91_usbh_data usbh_data;
static struct resource usbh_resources[] = { static struct resource usbh_resources[] = {
...@@ -50,7 +51,7 @@ static struct platform_device at91_usbh_device = { ...@@ -50,7 +51,7 @@ static struct platform_device at91_usbh_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &ohci_dmamask, .dma_mask = &ohci_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &usbh_data, .platform_data = &usbh_data,
}, },
.resource = usbh_resources, .resource = usbh_resources,
...@@ -125,7 +126,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {} ...@@ -125,7 +126,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE) #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
static u64 eth_dmamask = 0xffffffffUL; static u64 eth_dmamask = DMA_BIT_MASK(32);
static struct at91_eth_data eth_data; static struct at91_eth_data eth_data;
static struct resource eth_resources[] = { static struct resource eth_resources[] = {
...@@ -146,7 +147,7 @@ static struct platform_device at91sam9260_eth_device = { ...@@ -146,7 +147,7 @@ static struct platform_device at91sam9260_eth_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &eth_dmamask, .dma_mask = &eth_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &eth_data, .platform_data = &eth_data,
}, },
.resource = eth_resources, .resource = eth_resources,
...@@ -199,7 +200,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data) {} ...@@ -199,7 +200,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data) {}
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE) #if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
static u64 mmc_dmamask = 0xffffffffUL; static u64 mmc_dmamask = DMA_BIT_MASK(32);
static struct at91_mmc_data mmc_data; static struct at91_mmc_data mmc_data;
static struct resource mmc_resources[] = { static struct resource mmc_resources[] = {
...@@ -220,7 +221,7 @@ static struct platform_device at91sam9260_mmc_device = { ...@@ -220,7 +221,7 @@ static struct platform_device at91sam9260_mmc_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &mmc_dmamask, .dma_mask = &mmc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &mmc_data, .platform_data = &mmc_data,
}, },
.resource = mmc_resources, .resource = mmc_resources,
...@@ -431,7 +432,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) ...@@ -431,7 +432,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
static u64 spi_dmamask = 0xffffffffUL; static u64 spi_dmamask = DMA_BIT_MASK(32);
static struct resource spi0_resources[] = { static struct resource spi0_resources[] = {
[0] = { [0] = {
...@@ -451,7 +452,7 @@ static struct platform_device at91sam9260_spi0_device = { ...@@ -451,7 +452,7 @@ static struct platform_device at91sam9260_spi0_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
.resource = spi0_resources, .resource = spi0_resources,
.num_resources = ARRAY_SIZE(spi0_resources), .num_resources = ARRAY_SIZE(spi0_resources),
...@@ -477,7 +478,7 @@ static struct platform_device at91sam9260_spi1_device = { ...@@ -477,7 +478,7 @@ static struct platform_device at91sam9260_spi1_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
.resource = spi1_resources, .resource = spi1_resources,
.num_resources = ARRAY_SIZE(spi1_resources), .num_resources = ARRAY_SIZE(spi1_resources),
...@@ -628,12 +629,15 @@ static struct atmel_uart_data dbgu_data = { ...@@ -628,12 +629,15 @@ static struct atmel_uart_data dbgu_data = {
.regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
}; };
static u64 dbgu_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9260_dbgu_device = { static struct platform_device at91sam9260_dbgu_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &dbgu_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &dbgu_data, .platform_data = &dbgu_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = dbgu_resources, .resource = dbgu_resources,
.num_resources = ARRAY_SIZE(dbgu_resources), .num_resources = ARRAY_SIZE(dbgu_resources),
...@@ -663,12 +667,15 @@ static struct atmel_uart_data uart0_data = { ...@@ -663,12 +667,15 @@ static struct atmel_uart_data uart0_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart0_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9260_uart0_device = { static struct platform_device at91sam9260_uart0_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &uart0_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart0_data, .platform_data = &uart0_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart0_resources, .resource = uart0_resources,
.num_resources = ARRAY_SIZE(uart0_resources), .num_resources = ARRAY_SIZE(uart0_resources),
...@@ -704,12 +711,15 @@ static struct atmel_uart_data uart1_data = { ...@@ -704,12 +711,15 @@ static struct atmel_uart_data uart1_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart1_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9260_uart1_device = { static struct platform_device at91sam9260_uart1_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 2, .id = 2,
.dev = { .dev = {
.dma_mask = &uart1_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart1_data, .platform_data = &uart1_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart1_resources, .resource = uart1_resources,
.num_resources = ARRAY_SIZE(uart1_resources), .num_resources = ARRAY_SIZE(uart1_resources),
...@@ -741,12 +751,15 @@ static struct atmel_uart_data uart2_data = { ...@@ -741,12 +751,15 @@ static struct atmel_uart_data uart2_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart2_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9260_uart2_device = { static struct platform_device at91sam9260_uart2_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 3, .id = 3,
.dev = { .dev = {
.dma_mask = &uart2_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart2_data, .platform_data = &uart2_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart2_resources, .resource = uart2_resources,
.num_resources = ARRAY_SIZE(uart2_resources), .num_resources = ARRAY_SIZE(uart2_resources),
...@@ -776,12 +789,15 @@ static struct atmel_uart_data uart3_data = { ...@@ -776,12 +789,15 @@ static struct atmel_uart_data uart3_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart3_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9260_uart3_device = { static struct platform_device at91sam9260_uart3_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 4, .id = 4,
.dev = { .dev = {
.dma_mask = &uart3_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart3_data, .platform_data = &uart3_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart3_resources, .resource = uart3_resources,
.num_resources = ARRAY_SIZE(uart3_resources), .num_resources = ARRAY_SIZE(uart3_resources),
...@@ -811,12 +827,15 @@ static struct atmel_uart_data uart4_data = { ...@@ -811,12 +827,15 @@ static struct atmel_uart_data uart4_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart4_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9260_uart4_device = { static struct platform_device at91sam9260_uart4_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 5, .id = 5,
.dev = { .dev = {
.dma_mask = &uart4_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart4_data, .platform_data = &uart4_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart4_resources, .resource = uart4_resources,
.num_resources = ARRAY_SIZE(uart4_resources), .num_resources = ARRAY_SIZE(uart4_resources),
...@@ -846,12 +865,15 @@ static struct atmel_uart_data uart5_data = { ...@@ -846,12 +865,15 @@ static struct atmel_uart_data uart5_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart5_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9260_uart5_device = { static struct platform_device at91sam9260_uart5_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 6, .id = 6,
.dev = { .dev = {
.dma_mask = &uart5_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart5_data, .platform_data = &uart5_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart5_resources, .resource = uart5_resources,
.num_resources = ARRAY_SIZE(uart5_resources), .num_resources = ARRAY_SIZE(uart5_resources),
...@@ -863,7 +885,7 @@ static inline void configure_usart5_pins(void) ...@@ -863,7 +885,7 @@ static inline void configure_usart5_pins(void)
at91_set_A_periph(AT91_PIN_PB13, 0); /* RXD5 */ at91_set_A_periph(AT91_PIN_PB13, 0); /* RXD5 */
} }
struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */ static struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */
struct platform_device *atmel_default_console_device; /* the serial console device */ struct platform_device *atmel_default_console_device; /* the serial console device */
void __init at91_init_serial(struct at91_uart_config *config) void __init at91_init_serial(struct at91_uart_config *config)
......
arch/arm/mach-at91/at91sam9261_devices.c
浏览文件 @ c6686ff9
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
static u64 ohci_dmamask = 0xffffffffUL; static u64 ohci_dmamask = DMA_BIT_MASK(32);
static struct at91_usbh_data usbh_data; static struct at91_usbh_data usbh_data;
static struct resource usbh_resources[] = { static struct resource usbh_resources[] = {
...@@ -54,7 +55,7 @@ static struct platform_device at91sam9261_usbh_device = { ...@@ -54,7 +55,7 @@ static struct platform_device at91sam9261_usbh_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &ohci_dmamask, .dma_mask = &ohci_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &usbh_data, .platform_data = &usbh_data,
}, },
.resource = usbh_resources, .resource = usbh_resources,
...@@ -132,7 +133,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {} ...@@ -132,7 +133,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE) #if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
static u64 mmc_dmamask = 0xffffffffUL; static u64 mmc_dmamask = DMA_BIT_MASK(32);
static struct at91_mmc_data mmc_data; static struct at91_mmc_data mmc_data;
static struct resource mmc_resources[] = { static struct resource mmc_resources[] = {
...@@ -153,7 +154,7 @@ static struct platform_device at91sam9261_mmc_device = { ...@@ -153,7 +154,7 @@ static struct platform_device at91sam9261_mmc_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &mmc_dmamask, .dma_mask = &mmc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &mmc_data, .platform_data = &mmc_data,
}, },
.resource = mmc_resources, .resource = mmc_resources,
...@@ -354,7 +355,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) ...@@ -354,7 +355,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
static u64 spi_dmamask = 0xffffffffUL; static u64 spi_dmamask = DMA_BIT_MASK(32);
static struct resource spi0_resources[] = { static struct resource spi0_resources[] = {
[0] = { [0] = {
...@@ -374,7 +375,7 @@ static struct platform_device at91sam9261_spi0_device = { ...@@ -374,7 +375,7 @@ static struct platform_device at91sam9261_spi0_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
.resource = spi0_resources, .resource = spi0_resources,
.num_resources = ARRAY_SIZE(spi0_resources), .num_resources = ARRAY_SIZE(spi0_resources),
...@@ -400,7 +401,7 @@ static struct platform_device at91sam9261_spi1_device = { ...@@ -400,7 +401,7 @@ static struct platform_device at91sam9261_spi1_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
.resource = spi1_resources, .resource = spi1_resources,
.num_resources = ARRAY_SIZE(spi1_resources), .num_resources = ARRAY_SIZE(spi1_resources),
...@@ -466,7 +467,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) ...@@ -466,7 +467,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
static u64 lcdc_dmamask = 0xffffffffUL; static u64 lcdc_dmamask = DMA_BIT_MASK(32);
static struct atmel_lcdfb_info lcdc_data; static struct atmel_lcdfb_info lcdc_data;
static struct resource lcdc_resources[] = { static struct resource lcdc_resources[] = {
...@@ -494,7 +495,7 @@ static struct platform_device at91_lcdc_device = { ...@@ -494,7 +495,7 @@ static struct platform_device at91_lcdc_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &lcdc_dmamask, .dma_mask = &lcdc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &lcdc_data, .platform_data = &lcdc_data,
}, },
.resource = lcdc_resources, .resource = lcdc_resources,
...@@ -641,12 +642,15 @@ static struct atmel_uart_data dbgu_data = { ...@@ -641,12 +642,15 @@ static struct atmel_uart_data dbgu_data = {
.regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
}; };
static u64 dbgu_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9261_dbgu_device = { static struct platform_device at91sam9261_dbgu_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &dbgu_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &dbgu_data, .platform_data = &dbgu_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = dbgu_resources, .resource = dbgu_resources,
.num_resources = ARRAY_SIZE(dbgu_resources), .num_resources = ARRAY_SIZE(dbgu_resources),
...@@ -676,12 +680,15 @@ static struct atmel_uart_data uart0_data = { ...@@ -676,12 +680,15 @@ static struct atmel_uart_data uart0_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart0_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9261_uart0_device = { static struct platform_device at91sam9261_uart0_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &uart0_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart0_data, .platform_data = &uart0_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart0_resources, .resource = uart0_resources,
.num_resources = ARRAY_SIZE(uart0_resources), .num_resources = ARRAY_SIZE(uart0_resources),
...@@ -713,12 +720,15 @@ static struct atmel_uart_data uart1_data = { ...@@ -713,12 +720,15 @@ static struct atmel_uart_data uart1_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart1_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9261_uart1_device = { static struct platform_device at91sam9261_uart1_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 2, .id = 2,
.dev = { .dev = {
.dma_mask = &uart1_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart1_data, .platform_data = &uart1_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart1_resources, .resource = uart1_resources,
.num_resources = ARRAY_SIZE(uart1_resources), .num_resources = ARRAY_SIZE(uart1_resources),
...@@ -748,12 +758,15 @@ static struct atmel_uart_data uart2_data = { ...@@ -748,12 +758,15 @@ static struct atmel_uart_data uart2_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart2_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9261_uart2_device = { static struct platform_device at91sam9261_uart2_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 3, .id = 3,
.dev = { .dev = {
.dma_mask = &uart2_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart2_data, .platform_data = &uart2_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart2_resources, .resource = uart2_resources,
.num_resources = ARRAY_SIZE(uart2_resources), .num_resources = ARRAY_SIZE(uart2_resources),
...@@ -765,7 +778,7 @@ static inline void configure_usart2_pins(void) ...@@ -765,7 +778,7 @@ static inline void configure_usart2_pins(void)
at91_set_A_periph(AT91_PIN_PC14, 1); /* TXD2 */ at91_set_A_periph(AT91_PIN_PC14, 1); /* TXD2 */
} }
struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */ static struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */
struct platform_device *atmel_default_console_device; /* the serial console device */ struct platform_device *atmel_default_console_device; /* the serial console device */
void __init at91_init_serial(struct at91_uart_config *config) void __init at91_init_serial(struct at91_uart_config *config)
......
arch/arm/mach-at91/at91sam9263_devices.c
浏览文件 @ c6686ff9
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
static u64 ohci_dmamask = 0xffffffffUL; static u64 ohci_dmamask = DMA_BIT_MASK(32);
static struct at91_usbh_data usbh_data; static struct at91_usbh_data usbh_data;
static struct resource usbh_resources[] = { static struct resource usbh_resources[] = {
...@@ -53,7 +54,7 @@ static struct platform_device at91_usbh_device = { ...@@ -53,7 +54,7 @@ static struct platform_device at91_usbh_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &ohci_dmamask, .dma_mask = &ohci_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &usbh_data, .platform_data = &usbh_data,
}, },
.resource = usbh_resources, .resource = usbh_resources,
...@@ -136,7 +137,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {} ...@@ -136,7 +137,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE) #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
static u64 eth_dmamask = 0xffffffffUL; static u64 eth_dmamask = DMA_BIT_MASK(32);
static struct at91_eth_data eth_data; static struct at91_eth_data eth_data;
static struct resource eth_resources[] = { static struct resource eth_resources[] = {
...@@ -157,7 +158,7 @@ static struct platform_device at91sam9263_eth_device = { ...@@ -157,7 +158,7 @@ static struct platform_device at91sam9263_eth_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &eth_dmamask, .dma_mask = &eth_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &eth_data, .platform_data = &eth_data,
}, },
.resource = eth_resources, .resource = eth_resources,
...@@ -210,7 +211,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data) {} ...@@ -210,7 +211,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data) {}
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE) #if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
static u64 mmc_dmamask = 0xffffffffUL; static u64 mmc_dmamask = DMA_BIT_MASK(32);
static struct at91_mmc_data mmc0_data, mmc1_data; static struct at91_mmc_data mmc0_data, mmc1_data;
static struct resource mmc0_resources[] = { static struct resource mmc0_resources[] = {
...@@ -231,7 +232,7 @@ static struct platform_device at91sam9263_mmc0_device = { ...@@ -231,7 +232,7 @@ static struct platform_device at91sam9263_mmc0_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &mmc_dmamask, .dma_mask = &mmc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &mmc0_data, .platform_data = &mmc0_data,
}, },
.resource = mmc0_resources, .resource = mmc0_resources,
...@@ -256,7 +257,7 @@ static struct platform_device at91sam9263_mmc1_device = { ...@@ -256,7 +257,7 @@ static struct platform_device at91sam9263_mmc1_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &mmc_dmamask, .dma_mask = &mmc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &mmc1_data, .platform_data = &mmc1_data,
}, },
.resource = mmc1_resources, .resource = mmc1_resources,
...@@ -500,7 +501,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) ...@@ -500,7 +501,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
static u64 spi_dmamask = 0xffffffffUL; static u64 spi_dmamask = DMA_BIT_MASK(32);
static struct resource spi0_resources[] = { static struct resource spi0_resources[] = {
[0] = { [0] = {
...@@ -520,7 +521,7 @@ static struct platform_device at91sam9263_spi0_device = { ...@@ -520,7 +521,7 @@ static struct platform_device at91sam9263_spi0_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
.resource = spi0_resources, .resource = spi0_resources,
.num_resources = ARRAY_SIZE(spi0_resources), .num_resources = ARRAY_SIZE(spi0_resources),
...@@ -546,7 +547,7 @@ static struct platform_device at91sam9263_spi1_device = { ...@@ -546,7 +547,7 @@ static struct platform_device at91sam9263_spi1_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
.resource = spi1_resources, .resource = spi1_resources,
.num_resources = ARRAY_SIZE(spi1_resources), .num_resources = ARRAY_SIZE(spi1_resources),
...@@ -612,7 +613,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) ...@@ -612,7 +613,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_SND_AT91_AC97) || defined(CONFIG_SND_AT91_AC97_MODULE) #if defined(CONFIG_SND_AT91_AC97) || defined(CONFIG_SND_AT91_AC97_MODULE)
static u64 ac97_dmamask = 0xffffffffUL; static u64 ac97_dmamask = DMA_BIT_MASK(32);
static struct atmel_ac97_data ac97_data; static struct atmel_ac97_data ac97_data;
static struct resource ac97_resources[] = { static struct resource ac97_resources[] = {
...@@ -633,7 +634,7 @@ static struct platform_device at91sam9263_ac97_device = { ...@@ -633,7 +634,7 @@ static struct platform_device at91sam9263_ac97_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &ac97_dmamask, .dma_mask = &ac97_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &ac97_data, .platform_data = &ac97_data,
}, },
.resource = ac97_resources, .resource = ac97_resources,
...@@ -667,7 +668,7 @@ void __init at91_add_device_ac97(struct atmel_ac97_data *data) {} ...@@ -667,7 +668,7 @@ void __init at91_add_device_ac97(struct atmel_ac97_data *data) {}
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
static u64 lcdc_dmamask = 0xffffffffUL; static u64 lcdc_dmamask = DMA_BIT_MASK(32);
static struct atmel_lcdfb_info lcdc_data; static struct atmel_lcdfb_info lcdc_data;
static struct resource lcdc_resources[] = { static struct resource lcdc_resources[] = {
...@@ -688,7 +689,7 @@ static struct platform_device at91_lcdc_device = { ...@@ -688,7 +689,7 @@ static struct platform_device at91_lcdc_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &lcdc_dmamask, .dma_mask = &lcdc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &lcdc_data, .platform_data = &lcdc_data,
}, },
.resource = lcdc_resources, .resource = lcdc_resources,
...@@ -889,12 +890,15 @@ static struct atmel_uart_data dbgu_data = { ...@@ -889,12 +890,15 @@ static struct atmel_uart_data dbgu_data = {
.regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
}; };
static u64 dbgu_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9263_dbgu_device = { static struct platform_device at91sam9263_dbgu_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &dbgu_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &dbgu_data, .platform_data = &dbgu_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = dbgu_resources, .resource = dbgu_resources,
.num_resources = ARRAY_SIZE(dbgu_resources), .num_resources = ARRAY_SIZE(dbgu_resources),
...@@ -924,12 +928,15 @@ static struct atmel_uart_data uart0_data = { ...@@ -924,12 +928,15 @@ static struct atmel_uart_data uart0_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart0_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9263_uart0_device = { static struct platform_device at91sam9263_uart0_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &uart0_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart0_data, .platform_data = &uart0_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart0_resources, .resource = uart0_resources,
.num_resources = ARRAY_SIZE(uart0_resources), .num_resources = ARRAY_SIZE(uart0_resources),
...@@ -961,12 +968,15 @@ static struct atmel_uart_data uart1_data = { ...@@ -961,12 +968,15 @@ static struct atmel_uart_data uart1_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart1_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9263_uart1_device = { static struct platform_device at91sam9263_uart1_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 2, .id = 2,
.dev = { .dev = {
.dma_mask = &uart1_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart1_data, .platform_data = &uart1_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart1_resources, .resource = uart1_resources,
.num_resources = ARRAY_SIZE(uart1_resources), .num_resources = ARRAY_SIZE(uart1_resources),
...@@ -998,12 +1008,15 @@ static struct atmel_uart_data uart2_data = { ...@@ -998,12 +1008,15 @@ static struct atmel_uart_data uart2_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart2_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9263_uart2_device = { static struct platform_device at91sam9263_uart2_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 3, .id = 3,
.dev = { .dev = {
.dma_mask = &uart2_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart2_data, .platform_data = &uart2_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart2_resources, .resource = uart2_resources,
.num_resources = ARRAY_SIZE(uart2_resources), .num_resources = ARRAY_SIZE(uart2_resources),
...@@ -1017,7 +1030,7 @@ static inline void configure_usart2_pins(void) ...@@ -1017,7 +1030,7 @@ static inline void configure_usart2_pins(void)
at91_set_B_periph(AT91_PIN_PD6, 0); /* CTS2 */ at91_set_B_periph(AT91_PIN_PD6, 0); /* CTS2 */
} }
struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */ static struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */
struct platform_device *atmel_default_console_device; /* the serial console device */ struct platform_device *atmel_default_console_device; /* the serial console device */
void __init at91_init_serial(struct at91_uart_config *config) void __init at91_init_serial(struct at91_uart_config *config)
......
arch/arm/mach-at91/at91sam9rl_devices.c
浏览文件 @ c6686ff9
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE) #if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
static u64 mmc_dmamask = 0xffffffffUL; static u64 mmc_dmamask = DMA_BIT_MASK(32);
static struct at91_mmc_data mmc_data; static struct at91_mmc_data mmc_data;
static struct resource mmc_resources[] = { static struct resource mmc_resources[] = {
...@@ -50,7 +51,7 @@ static struct platform_device at91sam9rl_mmc_device = { ...@@ -50,7 +51,7 @@ static struct platform_device at91sam9rl_mmc_device = {
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &mmc_dmamask, .dma_mask = &mmc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &mmc_data, .platform_data = &mmc_data,
}, },
.resource = mmc_resources, .resource = mmc_resources,
...@@ -247,7 +248,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) ...@@ -247,7 +248,7 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
static u64 spi_dmamask = 0xffffffffUL; static u64 spi_dmamask = DMA_BIT_MASK(32);
static struct resource spi_resources[] = { static struct resource spi_resources[] = {
[0] = { [0] = {
...@@ -267,7 +268,7 @@ static struct platform_device at91sam9rl_spi_device = { ...@@ -267,7 +268,7 @@ static struct platform_device at91sam9rl_spi_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
.resource = spi_resources, .resource = spi_resources,
.num_resources = ARRAY_SIZE(spi_resources), .num_resources = ARRAY_SIZE(spi_resources),
...@@ -312,7 +313,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) ...@@ -312,7 +313,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
static u64 lcdc_dmamask = 0xffffffffUL; static u64 lcdc_dmamask = DMA_BIT_MASK(32);
static struct atmel_lcdfb_info lcdc_data; static struct atmel_lcdfb_info lcdc_data;
static struct resource lcdc_resources[] = { static struct resource lcdc_resources[] = {
...@@ -340,7 +341,7 @@ static struct platform_device at91_lcdc_device = { ...@@ -340,7 +341,7 @@ static struct platform_device at91_lcdc_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &lcdc_dmamask, .dma_mask = &lcdc_dmamask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &lcdc_data, .platform_data = &lcdc_data,
}, },
.resource = lcdc_resources, .resource = lcdc_resources,
...@@ -494,12 +495,15 @@ static struct atmel_uart_data dbgu_data = { ...@@ -494,12 +495,15 @@ static struct atmel_uart_data dbgu_data = {
.regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
}; };
static u64 dbgu_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9rl_dbgu_device = { static struct platform_device at91sam9rl_dbgu_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &dbgu_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &dbgu_data, .platform_data = &dbgu_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = dbgu_resources, .resource = dbgu_resources,
.num_resources = ARRAY_SIZE(dbgu_resources), .num_resources = ARRAY_SIZE(dbgu_resources),
...@@ -529,12 +533,15 @@ static struct atmel_uart_data uart0_data = { ...@@ -529,12 +533,15 @@ static struct atmel_uart_data uart0_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart0_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9rl_uart0_device = { static struct platform_device at91sam9rl_uart0_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &uart0_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart0_data, .platform_data = &uart0_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart0_resources, .resource = uart0_resources,
.num_resources = ARRAY_SIZE(uart0_resources), .num_resources = ARRAY_SIZE(uart0_resources),
...@@ -566,12 +573,15 @@ static struct atmel_uart_data uart1_data = { ...@@ -566,12 +573,15 @@ static struct atmel_uart_data uart1_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart1_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9rl_uart1_device = { static struct platform_device at91sam9rl_uart1_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 2, .id = 2,
.dev = { .dev = {
.dma_mask = &uart1_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart1_data, .platform_data = &uart1_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart1_resources, .resource = uart1_resources,
.num_resources = ARRAY_SIZE(uart1_resources), .num_resources = ARRAY_SIZE(uart1_resources),
...@@ -601,12 +611,15 @@ static struct atmel_uart_data uart2_data = { ...@@ -601,12 +611,15 @@ static struct atmel_uart_data uart2_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart2_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9rl_uart2_device = { static struct platform_device at91sam9rl_uart2_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 3, .id = 3,
.dev = { .dev = {
.dma_mask = &uart2_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart2_data, .platform_data = &uart2_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart2_resources, .resource = uart2_resources,
.num_resources = ARRAY_SIZE(uart2_resources), .num_resources = ARRAY_SIZE(uart2_resources),
...@@ -636,12 +649,15 @@ static struct atmel_uart_data uart3_data = { ...@@ -636,12 +649,15 @@ static struct atmel_uart_data uart3_data = {
.use_dma_rx = 1, .use_dma_rx = 1,
}; };
static u64 uart3_dmamask = DMA_BIT_MASK(32);
static struct platform_device at91sam9rl_uart3_device = { static struct platform_device at91sam9rl_uart3_device = {
.name = "atmel_usart", .name = "atmel_usart",
.id = 4, .id = 4,
.dev = { .dev = {
.dma_mask = &uart3_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &uart3_data, .platform_data = &uart3_data,
.coherent_dma_mask = 0xffffffff,
}, },
.resource = uart3_resources, .resource = uart3_resources,
.num_resources = ARRAY_SIZE(uart3_resources), .num_resources = ARRAY_SIZE(uart3_resources),
...@@ -653,7 +669,7 @@ static inline void configure_usart3_pins(void) ...@@ -653,7 +669,7 @@ static inline void configure_usart3_pins(void)
at91_set_A_periph(AT91_PIN_PB1, 0); /* RXD3 */ at91_set_A_periph(AT91_PIN_PB1, 0); /* RXD3 */
} }
struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */ static struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */
struct platform_device *atmel_default_console_device; /* the serial console device */ struct platform_device *atmel_default_console_device; /* the serial console device */
void __init at91_init_serial(struct at91_uart_config *config) void __init at91_init_serial(struct at91_uart_config *config)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或