4 files changed, 24 insertions, 18 deletions

diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 49164e9aadd6..cced73c58115 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 
 #include <asm/arch/board.h>
+#include <asm/arch/init.h>
 
 struct eth_platform_data __initdata eth0_data = {
         .valid          = 1,
@@ -20,13 +21,22 @@ struct eth_platform_data __initdata eth0_data = {
 
 extern struct lcdc_platform_data atstk1000_fb0_data;
 
+void __init setup_board(void)
+{
+        at32_map_usart(1, 0);   /* /dev/ttyS0 */
+        at32_map_usart(2, 1);   /* /dev/ttyS1 */
+        at32_map_usart(3, 2);   /* /dev/ttyS2 */
+
+        at32_setup_serial_console(0);
+}
+
 static int __init atstk1002_init(void)
 {
         at32_add_system_devices();
 
-        at32_add_device_usart(1);       /* /dev/ttyS0 */
-        at32_add_device_usart(2);       /* /dev/ttyS1 */
-        at32_add_device_usart(3);       /* /dev/ttyS2 */
+        at32_add_device_usart(0);
+        at32_add_device_usart(1);
+        at32_add_device_usart(2);
 
         at32_add_device_eth(0, &eth0_data);
         at32_add_device_spi(0);
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index 5d68f3c6990b..ea2d1ffee478 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -292,6 +292,7 @@ void __init setup_arch (char **cmdline_p)
 
         setup_processor();
         setup_platform();
+        setup_board();
 
         cpu_clk = clk_get(NULL, "cpu");
         if (IS_ERR(cpu_clk)) {
diff --git a/arch/avr32/mach-at32ap/at32ap.c b/arch/avr32/mach-at32ap/at32ap.c
index f7cedf5aabea..90f207e8e96d 100644
--- a/arch/avr32/mach-at32ap/at32ap.c
+++ b/arch/avr32/mach-at32ap/at32ap.c
@@ -48,9 +48,6 @@ void __init setup_platform(void)
         at32_sm_init();
         at32_clock_init();
         at32_portmux_init();
-
-        /* FIXME: This doesn't belong here */
-        at32_setup_serial_console(1);
 }
 
 static int __init pdc_probe(struct platform_device *pdev)
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c
index 3dd305875087..7ff6ad8bab5f 100644
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
@@ -591,11 +591,13 @@ static inline void configure_usart3_pins(void)
         portmux_set_func(PIOB, 17, FUNC_B);     /* TXD  */
 }
 
-static struct platform_device *setup_usart(unsigned int id)
+static struct platform_device *at32_usarts[4];
+
+void __init at32_map_usart(unsigned int hw_id, unsigned int line)
 {
         struct platform_device *pdev;
 
-        switch (id) {
+        switch (hw_id) {
         case 0:
                 pdev = &atmel_usart0_device;
                 configure_usart0_pins();
@@ -613,7 +615,7 @@ static struct platform_device *setup_usart(unsigned int id)
                 configure_usart3_pins();
                 break;
         default:
-                return NULL;
+                return;
         }
 
         if (PXSEG(pdev->resource[0].start) == P4SEG) {
@@ -622,25 +624,21 @@ static struct platform_device *setup_usart(unsigned int id)
                 data->regs = (void __iomem *)pdev->resource[0].start;
         }
 
-        return pdev;
+        pdev->id = line;
+        at32_usarts[line] = pdev;
 }
 
 struct platform_device *__init at32_add_device_usart(unsigned int id)
 {
-        struct platform_device *pdev;
-
-        pdev = setup_usart(id);
-        if (pdev)
-                platform_device_register(pdev);
-
-        return pdev;
+        platform_device_register(at32_usarts[id]);
+        return at32_usarts[id];
 }
 
 struct platform_device *atmel_default_console_device;
 
 void __init at32_setup_serial_console(unsigned int usart_id)
 {
-        atmel_default_console_device = setup_usart(usart_id);
+        atmel_default_console_device = at32_usarts[usart_id];
 }
 
 /* --------------------------------------------------------------------