1 files changed, 321 insertions, 45 deletions

diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 64979a9023c2..245641263fce 100644
--- 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,
@@ -106,8 +107,6 @@ static struct platform_device at91sam9261_udc_device = {
 
 void __init at91_add_device_udc(struct at91_udc_data *data)
 {
-        unsigned long x;
-
         if (!data)
                 return;
 
@@ -116,9 +115,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
                 at91_set_deglitch(data->vbus_pin, 1);
         }
 
-        /* Pullup pin is handled internally */
-        x = at91_sys_read(AT91_MATRIX_USBPUCR);
-        at91_sys_write(AT91_MATRIX_USBPUCR, x | AT91_MATRIX_USBPUCR_PUON);
+        /* Pullup pin is handled internally by USB device peripheral */
 
         udc_data = *data;
         platform_device_register(&at91sam9261_udc_device);
@@ -132,7 +129,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 +150,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,
@@ -232,7 +229,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data)
                 return;
 
         csa = at91_sys_read(AT91_MATRIX_EBICSA);
-        at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC);
+        at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
 
         /* set the bus interface characteristics */
         at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0)
@@ -354,7 +351,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 +371,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 +397,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 +463,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 +491,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 +504,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 +537,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);
@@ -539,24 +548,220 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
 
 
 /* --------------------------------------------------------------------
- *  LEDs
+ *  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
+
+
+/* --------------------------------------------------------------------
+ *  SSC -- Synchronous Serial Controller
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_LEDS)
-u8 at91_leds_cpu;
-u8 at91_leds_timer;
+#if defined(CONFIG_ATMEL_SSC) || defined(CONFIG_ATMEL_SSC_MODULE)
+static u64 ssc0_dmamask = DMA_BIT_MASK(32);
+
+static struct resource ssc0_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_SSC0,
+                .end    = AT91SAM9261_BASE_SSC0 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_SSC0,
+                .end    = AT91SAM9261_ID_SSC0,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_ssc0_device = {
+        .name   = "ssc",
+        .id     = 0,
+        .dev    = {
+                .dma_mask               = &ssc0_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = ssc0_resources,
+        .num_resources  = ARRAY_SIZE(ssc0_resources),
+};
+
+static inline void configure_ssc0_pins(unsigned pins)
+{
+        if (pins & ATMEL_SSC_TF)
+                at91_set_A_periph(AT91_PIN_PB21, 1);
+        if (pins & ATMEL_SSC_TK)
+                at91_set_A_periph(AT91_PIN_PB22, 1);
+        if (pins & ATMEL_SSC_TD)
+                at91_set_A_periph(AT91_PIN_PB23, 1);
+        if (pins & ATMEL_SSC_RD)
+                at91_set_A_periph(AT91_PIN_PB24, 1);
+        if (pins & ATMEL_SSC_RK)
+                at91_set_A_periph(AT91_PIN_PB25, 1);
+        if (pins & ATMEL_SSC_RF)
+                at91_set_A_periph(AT91_PIN_PB26, 1);
+}
+
+static u64 ssc1_dmamask = DMA_BIT_MASK(32);
+
+static struct resource ssc1_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_SSC1,
+                .end    = AT91SAM9261_BASE_SSC1 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_SSC1,
+                .end    = AT91SAM9261_ID_SSC1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_ssc1_device = {
+        .name   = "ssc",
+        .id     = 1,
+        .dev    = {
+                .dma_mask               = &ssc1_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = ssc1_resources,
+        .num_resources  = ARRAY_SIZE(ssc1_resources),
+};
+
+static inline void configure_ssc1_pins(unsigned pins)
+{
+        if (pins & ATMEL_SSC_TF)
+                at91_set_B_periph(AT91_PIN_PA17, 1);
+        if (pins & ATMEL_SSC_TK)
+                at91_set_B_periph(AT91_PIN_PA18, 1);
+        if (pins & ATMEL_SSC_TD)
+                at91_set_B_periph(AT91_PIN_PA19, 1);
+        if (pins & ATMEL_SSC_RD)
+                at91_set_B_periph(AT91_PIN_PA20, 1);
+        if (pins & ATMEL_SSC_RK)
+                at91_set_B_periph(AT91_PIN_PA21, 1);
+        if (pins & ATMEL_SSC_RF)
+                at91_set_B_periph(AT91_PIN_PA22, 1);
+}
+
+static u64 ssc2_dmamask = DMA_BIT_MASK(32);
+
+static struct resource ssc2_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_SSC2,
+                .end    = AT91SAM9261_BASE_SSC2 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_SSC2,
+                .end    = AT91SAM9261_ID_SSC2,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_ssc2_device = {
+        .name   = "ssc",
+        .id     = 2,
+        .dev    = {
+                .dma_mask               = &ssc2_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = ssc2_resources,
+        .num_resources  = ARRAY_SIZE(ssc2_resources),
+};
+
+static inline void configure_ssc2_pins(unsigned pins)
+{
+        if (pins & ATMEL_SSC_TF)
+                at91_set_B_periph(AT91_PIN_PC25, 1);
+        if (pins & ATMEL_SSC_TK)
+                at91_set_B_periph(AT91_PIN_PC26, 1);
+        if (pins & ATMEL_SSC_TD)
+                at91_set_B_periph(AT91_PIN_PC27, 1);
+        if (pins & ATMEL_SSC_RD)
+                at91_set_B_periph(AT91_PIN_PC28, 1);
+        if (pins & ATMEL_SSC_RK)
+                at91_set_B_periph(AT91_PIN_PC29, 1);
+        if (pins & ATMEL_SSC_RF)
+                at91_set_B_periph(AT91_PIN_PC30, 1);
+}
 
-void __init at91_init_leds(u8 cpu_led, u8 timer_led)
+/*
+ * SSC controllers are accessed through library code, instead of any
+ * kind of all-singing/all-dancing driver.  For example one could be
+ * used by a particular I2S audio codec's driver, while another one
+ * on the same system might be used by a custom data capture driver.
+ */
+void __init at91_add_device_ssc(unsigned id, unsigned pins)
 {
-        /* Enable GPIO to access the LEDs */
-        at91_set_gpio_output(cpu_led, 1);
-        at91_set_gpio_output(timer_led, 1);
+        struct platform_device *pdev;
+
+        /*
+         * NOTE: caller is responsible for passing information matching
+         * "pins" to whatever will be using each particular controller.
+         */
+        switch (id) {
+        case AT91SAM9261_ID_SSC0:
+                pdev = &at91sam9261_ssc0_device;
+                configure_ssc0_pins(pins);
+                at91_clock_associate("ssc0_clk", &pdev->dev, "pclk");
+                break;
+        case AT91SAM9261_ID_SSC1:
+                pdev = &at91sam9261_ssc1_device;
+                configure_ssc1_pins(pins);
+                at91_clock_associate("ssc1_clk", &pdev->dev, "pclk");
+                break;
+        case AT91SAM9261_ID_SSC2:
+                pdev = &at91sam9261_ssc2_device;
+                configure_ssc2_pins(pins);
+                at91_clock_associate("ssc2_clk", &pdev->dev, "pclk");
+                break;
+        default:
+                return;
+        }
 
-        at91_leds_cpu   = cpu_led;
-        at91_leds_timer = timer_led;
+        platform_device_register(pdev);
 }
+
 #else
-void __init at91_init_leds(u8 cpu_led, u8 timer_led) {}
+void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #endif
 
 
@@ -584,12 +789,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,23 +827,29 @@ 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),
 };
 
-static inline void configure_usart0_pins(void)
+static inline void configure_usart0_pins(unsigned pins)
 {
         at91_set_A_periph(AT91_PIN_PC8, 1);             /* TXD0 */
         at91_set_A_periph(AT91_PIN_PC9, 0);             /* RXD0 */
-        at91_set_A_periph(AT91_PIN_PC10, 0);            /* RTS0 */
-        at91_set_A_periph(AT91_PIN_PC11, 0);            /* CTS0 */
+
+        if (pins & ATMEL_UART_RTS)
+                at91_set_A_periph(AT91_PIN_PC10, 0);    /* RTS0 */
+        if (pins & ATMEL_UART_CTS)
+                at91_set_A_periph(AT91_PIN_PC11, 0);    /* CTS0 */
 }
 
 static struct resource uart1_resources[] = {
@@ -656,21 +870,29 @@ 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),
 };
 
-static inline void configure_usart1_pins(void)
+static inline void configure_usart1_pins(unsigned pins)
 {
         at91_set_A_periph(AT91_PIN_PC12, 1);            /* TXD1 */
         at91_set_A_periph(AT91_PIN_PC13, 0);            /* RXD1 */
+
+        if (pins & ATMEL_UART_RTS)
+                at91_set_B_periph(AT91_PIN_PA12, 0);    /* RTS1 */
+        if (pins & ATMEL_UART_CTS)
+                at91_set_B_periph(AT91_PIN_PA13, 0);    /* CTS1 */
 }
 
 static struct resource uart2_resources[] = {
@@ -691,27 +913,35 @@ 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),
 };
 
-static inline void configure_usart2_pins(void)
+static inline void configure_usart2_pins(unsigned pins)
 {
         at91_set_A_periph(AT91_PIN_PC15, 0);            /* RXD2 */
         at91_set_A_periph(AT91_PIN_PC14, 1);            /* TXD2 */
+
+        if (pins & ATMEL_UART_RTS)
+                at91_set_B_periph(AT91_PIN_PA15, 0);    /* RTS2*/
+        if (pins & ATMEL_UART_CTS)
+                at91_set_B_periph(AT91_PIN_PA16, 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 */
 
-void __init at91_init_serial(struct at91_uart_config *config)
+void __init __deprecated at91_init_serial(struct at91_uart_config *config)
 {
         int i;
 
@@ -719,17 +949,17 @@ void __init at91_init_serial(struct at91_uart_config *config)
         for (i = 0; i < config->nr_tty; i++) {
                 switch (config->tty_map[i]) {
                         case 0:
-                                configure_usart0_pins();
+                                configure_usart0_pins(ATMEL_UART_CTS | ATMEL_UART_RTS);
                                 at91_uarts[i] = &at91sam9261_uart0_device;
                                 at91_clock_associate("usart0_clk", &at91sam9261_uart0_device.dev, "usart");
                                 break;
                         case 1:
-                                configure_usart1_pins();
+                                configure_usart1_pins(0);
                                 at91_uarts[i] = &at91sam9261_uart1_device;
                                 at91_clock_associate("usart1_clk", &at91sam9261_uart1_device.dev, "usart");
                                 break;
                         case 2:
-                                configure_usart2_pins();
+                                configure_usart2_pins(0);
                                 at91_uarts[i] = &at91sam9261_uart2_device;
                                 at91_clock_associate("usart2_clk", &at91sam9261_uart2_device.dev, "usart");
                                 break;
@@ -751,6 +981,48 @@ void __init at91_init_serial(struct at91_uart_config *config)
                 printk(KERN_INFO "AT91: No default serial console defined.\n");
 }
 
+void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
+{
+        struct platform_device *pdev;
+
+        switch (id) {
+                case 0:         /* DBGU */
+                        pdev = &at91sam9261_dbgu_device;
+                        configure_dbgu_pins();
+                        at91_clock_associate("mck", &pdev->dev, "usart");
+                        break;
+                case AT91SAM9261_ID_US0:
+                        pdev = &at91sam9261_uart0_device;
+                        configure_usart0_pins(pins);
+                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
+                        break;
+                case AT91SAM9261_ID_US1:
+                        pdev = &at91sam9261_uart1_device;
+                        configure_usart1_pins(pins);
+                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
+                        break;
+                case AT91SAM9261_ID_US2:
+                        pdev = &at91sam9261_uart2_device;
+                        configure_usart2_pins(pins);
+                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
+                        break;
+                default:
+                        return;
+        }
+        pdev->id = portnr;              /* update to mapped ID */
+
+        if (portnr < ATMEL_MAX_UART)
+                at91_uarts[portnr] = pdev;
+}
+
+void __init at91_set_serial_console(unsigned portnr)
+{
+        if (portnr < ATMEL_MAX_UART)
+                atmel_default_console_device = at91_uarts[portnr];
+        if (!atmel_default_console_device)
+                printk(KERN_INFO "AT91: No default serial console defined.\n");
+}
+
 void __init at91_add_device_serial(void)
 {
         int i;
@@ -761,7 +1033,9 @@ void __init at91_add_device_serial(void)
         }
 }
 #else
-void __init at91_init_serial(struct at91_uart_config *config) {}
+void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
+void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
+void __init at91_set_serial_console(unsigned portnr) {}
 void __init at91_add_device_serial(void) {}
 #endif
 
@@ -774,6 +1048,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;
 }