]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/arm/mach-at91/at91sam9261_devices.c
projects / linux-2.6-omap-h63xx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[ARM] 4753/1: [AT91] Use DMA_BIT_MASK
[linux-2.6-omap-h63xx.git] / arch / arm / mach-at91 / at91sam9261_devices.c
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 64979a9023c2cb4e0a674cbb8cc9303ae0066074..f7f02d15045d5c24ac99c0dba707a093c7a64821 100644 (file)
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -13,6 +13,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/i2c-gpio.h>
 
@@ -33,7 +34,7 @@
  * -------------------------------------------------------------------- */
 
 #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 resource usbh_resources[] = {
@@ -54,7 +55,7 @@ static struct platform_device at91sam9261_usbh_device = {
        .id             = -1,
        .dev            = {
                                .dma_mask               = &ohci_dmamask,
-                               .coherent_dma_mask      = 0xffffffff,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
                                .platform_data          = &usbh_data,
        },
        .resource       = usbh_resources,
@@ -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)
-static u64 mmc_dmamask = 0xffffffffUL;
+static u64 mmc_dmamask = DMA_BIT_MASK(32);
 static struct at91_mmc_data mmc_data;
 
 static struct resource mmc_resources[] = {
@@ -153,7 +154,7 @@ static struct platform_device at91sam9261_mmc_device = {
        .id             = -1,
        .dev            = {
                                .dma_mask               = &mmc_dmamask,
-                               .coherent_dma_mask      = 0xffffffff,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
                                .platform_data          = &mmc_data,
        },
        .resource       = mmc_resources,
@@ -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)
-static u64 spi_dmamask = 0xffffffffUL;
+static u64 spi_dmamask = DMA_BIT_MASK(32);
 
 static struct resource spi0_resources[] = {
        [0] = {
@@ -374,7 +375,7 @@ static struct platform_device at91sam9261_spi0_device = {
        .id             = 0,
        .dev            = {
                                .dma_mask               = &spi_dmamask,
-                               .coherent_dma_mask      = 0xffffffff,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
        },
        .resource       = spi0_resources,
        .num_resources  = ARRAY_SIZE(spi0_resources),
@@ -400,7 +401,7 @@ static struct platform_device at91sam9261_spi1_device = {
        .id             = 1,
        .dev            = {
                                .dma_mask               = &spi_dmamask,
-                               .coherent_dma_mask      = 0xffffffff,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
        },
        .resource       = 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)
  * -------------------------------------------------------------------- */
 
 #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 resource lcdc_resources[] = {
@@ -494,7 +495,7 @@ static struct platform_device at91_lcdc_device = {
        .id             = 0,
        .dev            = {
                                .dma_mask               = &lcdc_dmamask,
-                               .coherent_dma_mask      = 0xffffffff,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
                                .platform_data          = &lcdc_data,
        },
        .resource       = lcdc_resources,
@@ -507,6 +508,17 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
                return;
        }
 
+#if defined(CONFIG_FB_ATMEL_STN)
+       at91_set_A_periph(AT91_PIN_PB0, 0);     /* LCDVSYNC */
+       at91_set_A_periph(AT91_PIN_PB1, 0);     /* LCDHSYNC */
+       at91_set_A_periph(AT91_PIN_PB2, 0);     /* LCDDOTCK */
+       at91_set_A_periph(AT91_PIN_PB3, 0);     /* LCDDEN */
+       at91_set_A_periph(AT91_PIN_PB4, 0);     /* LCDCC */
+       at91_set_A_periph(AT91_PIN_PB5, 0);     /* LCDD0 */
+       at91_set_A_periph(AT91_PIN_PB6, 0);     /* LCDD1 */
+       at91_set_A_periph(AT91_PIN_PB7, 0);     /* LCDD2 */
+       at91_set_A_periph(AT91_PIN_PB8, 0);     /* LCDD3 */
+#else
        at91_set_A_periph(AT91_PIN_PB1, 0);     /* LCDHSYNC */
        at91_set_A_periph(AT91_PIN_PB2, 0);     /* LCDDOTCK */
        at91_set_A_periph(AT91_PIN_PB3, 0);     /* LCDDEN */
@@ -529,6 +541,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
        at91_set_B_periph(AT91_PIN_PB26, 0);    /* LCDD21 */
        at91_set_B_periph(AT91_PIN_PB27, 0);    /* LCDD22 */
        at91_set_B_periph(AT91_PIN_PB28, 0);    /* LCDD23 */
+#endif
 
        lcdc_data = *data;
        platform_device_register(&at91_lcdc_device);
@@ -538,6 +551,51 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
 #endif
 
 
+/* --------------------------------------------------------------------
+ *  RTT
+ * -------------------------------------------------------------------- */
+
+static struct resource rtt_resources[] = {
+       {
+               .start  = AT91_BASE_SYS + AT91_RTT,
+               .end    = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,
+               .flags  = IORESOURCE_MEM,
+       }
+};
+
+static struct platform_device at91sam9261_rtt_device = {
+       .name           = "at91_rtt",
+       .id             = -1,
+       .resource       = rtt_resources,
+       .num_resources  = ARRAY_SIZE(rtt_resources),
+};
+
+static void __init at91_add_device_rtt(void)
+{
+       platform_device_register(&at91sam9261_rtt_device);
+}
+
+
+/* --------------------------------------------------------------------
+ *  Watchdog
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_AT91SAM9_WATCHDOG) || defined(CONFIG_AT91SAM9_WATCHDOG_MODULE)
+static struct platform_device at91sam9261_wdt_device = {
+       .name           = "at91_wdt",
+       .id             = -1,
+       .num_resources  = 0,
+};
+
+static void __init at91_add_device_watchdog(void)
+{
+       platform_device_register(&at91sam9261_wdt_device);
+}
+#else
+static void __init at91_add_device_watchdog(void) {}
+#endif
+
+
 /* --------------------------------------------------------------------
  *  LEDs
  * -------------------------------------------------------------------- */
@@ -584,12 +642,15 @@ static struct atmel_uart_data dbgu_data = {
        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 
+static u64 dbgu_dmamask = DMA_BIT_MASK(32);
+
 static struct platform_device at91sam9261_dbgu_device = {
        .name           = "atmel_usart",
        .id             = 0,
        .dev            = {
-                               .platform_data  = &dbgu_data,
-                               .coherent_dma_mask = 0xffffffff,
+                               .dma_mask               = &dbgu_dmamask,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
+                               .platform_data          = &dbgu_data,
        },
        .resource       = dbgu_resources,
        .num_resources  = ARRAY_SIZE(dbgu_resources),
@@ -619,12 +680,15 @@ static struct atmel_uart_data uart0_data = {
        .use_dma_rx     = 1,
 };
 
+static u64 uart0_dmamask = DMA_BIT_MASK(32);
+
 static struct platform_device at91sam9261_uart0_device = {
        .name           = "atmel_usart",
        .id             = 1,
        .dev            = {
-                               .platform_data  = &uart0_data,
-                               .coherent_dma_mask = 0xffffffff,
+                               .dma_mask               = &uart0_dmamask,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
+                               .platform_data          = &uart0_data,
        },
        .resource       = uart0_resources,
        .num_resources  = ARRAY_SIZE(uart0_resources),
@@ -656,12 +720,15 @@ static struct atmel_uart_data uart1_data = {
        .use_dma_rx     = 1,
 };
 
+static u64 uart1_dmamask = DMA_BIT_MASK(32);
+
 static struct platform_device at91sam9261_uart1_device = {
        .name           = "atmel_usart",
        .id             = 2,
        .dev            = {
-                               .platform_data  = &uart1_data,
-                               .coherent_dma_mask = 0xffffffff,
+                               .dma_mask               = &uart1_dmamask,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
+                               .platform_data          = &uart1_data,
        },
        .resource       = uart1_resources,
        .num_resources  = ARRAY_SIZE(uart1_resources),
@@ -691,12 +758,15 @@ static struct atmel_uart_data uart2_data = {
        .use_dma_rx     = 1,
 };
 
+static u64 uart2_dmamask = DMA_BIT_MASK(32);
+
 static struct platform_device at91sam9261_uart2_device = {
        .name           = "atmel_usart",
        .id             = 3,
        .dev            = {
-                               .platform_data  = &uart2_data,
-                               .coherent_dma_mask = 0xffffffff,
+                               .dma_mask               = &uart2_dmamask,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
+                               .platform_data          = &uart2_data,
        },
        .resource       = uart2_resources,
        .num_resources  = ARRAY_SIZE(uart2_resources),
@@ -708,7 +778,7 @@ static inline void configure_usart2_pins(void)
        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 */
 
 void __init at91_init_serial(struct at91_uart_config *config)
@@ -774,6 +844,8 @@ void __init at91_add_device_serial(void) {}
  */
 static int __init at91_add_standard_devices(void)
 {
+       at91_add_device_rtt();
+       at91_add_device_watchdog();
        return 0;
 }
 
Unnamed repository; edit this file 'description' to name the repository.