[PATCH] AVR32: Allow renumbering of serial devices

Allow the board to remap actual USART peripheral devices to serial
devices by calling at32_map_usart(hw_id, serial_line). This ensures
that even though ATSTK1002 uses USART1 as the first serial port, it
will still have a ttyS0 device.

This also adds a board-specific early setup hook and moves the
at32_setup_serial_console() call there from the platform code.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 10 insertions, 15 deletions

diff --git a/arch/avr32/mach-at32ap/at32ap.c b/arch/avr32/mach-at32ap/at32ap.c
index f7cedf5aabe..90f207e8e96 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 3dd30587508..7ff6ad8bab5 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];
 }
 
 /* --------------------------------------------------------------------