1 files changed, 15 insertions, 15 deletions

diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c
index c5c721d27f42..419fd19b620b 100644
--- a/arch/arm/mach-at91/board-csb637.c
+++ b/arch/arm/mach-at91/board-csb637.c
@@ -40,27 +40,16 @@
 #include "generic.h"
 
 
-/*
- * Serial port configuration.
- *    0 .. 3 = USART0 .. USART3
- *    4      = DBGU
- */
-static struct at91_uart_config __initdata csb637_uart_config = {
-        .console_tty    = 0,                            /* ttyS0 */
-        .nr_tty         = 2,
-        .tty_map        = { 4, 1, -1, -1, -1 }          /* ttyS0, ..., ttyS4 */
-};
-
 static void __init csb637_map_io(void)
 {
         /* Initialize processor: 3.6864 MHz crystal */
         at91rm9200_initialize(3686400, AT91RM9200_BGA);
 
-        /* Setup the LEDs */
-        at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
+        /* DBGU on ttyS0 */
+        at91_register_uart(0, 0, 0);
 
-        /* Setup the serial ports and console */
-        at91_init_serial(&csb637_uart_config);
+        /* make console=ttyS0 the default */
+        at91_set_serial_console(0);
 }
 
 static void __init csb637_init_irq(void)
@@ -118,8 +107,19 @@ static struct platform_device csb_flash = {
         .num_resources  = ARRAY_SIZE(csb_flash_resources),
 };
 
+static struct gpio_led csb_leds[] = {
+        {       /* "d1", red */
+                .name                   = "d1",
+                .gpio                   = AT91_PIN_PB2,
+                .active_low             = 1,
+                .default_trigger        = "heartbeat",
+        },
+};
+
 static void __init csb637_board_init(void)
 {
+        /* LED(s) */
+        at91_gpio_leds(csb_leds, ARRAY_SIZE(csb_leds));
         /* Serial */
         at91_add_device_serial();
         /* Ethernet */