avr32: add RTS/CTS/CLK pin selection for the USARTs

Adds extra parameter to AT32 at32_map_usart(), so as to reserve
RTS/CTS/CLK pins.

All boards under arch/avr32/boards have been updated (trivial change), but
not all have been tested.

Signed-off-by: Peter Ma <pma@mediamatech.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index feac0035800cf97a00d77bfaf9e8ad9d200be3e7..5b022aad4bd95b5c086801a04cf6114cc81cde10 100644 (file)
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -118,7 +118,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
 
 void __init setup_board(void)
 {
-       at32_map_usart(1, 0);   /* USART 1: /dev/ttyS0, DB9 */
+       at32_map_usart(1, 0, 0);        /* USART 1: /dev/ttyS0, DB9 */
        at32_setup_serial_console(0);
 }
 

diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 1f33a106905cf9bf1d03400ddb6d116b2a51349d..2adc261c9e3d0e22076051d43c968abc3f2dcee5 100644 (file)
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -252,12 +252,12 @@ static void __init atstk1002_setup_extdac(void)
 void __init setup_board(void)
 {
 #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_map_usart(0, 1);   /* USART 0/B: /dev/ttyS1, IRDA */
+       at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
 #else
-       at32_map_usart(1, 0);   /* USART 1/A: /dev/ttyS0, DB9 */
+       at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
 #endif
        /* USART 2/unused: expansion connector */
-       at32_map_usart(3, 2);   /* USART 3/C: /dev/ttyS2, DB9 */
+       at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
 
        at32_setup_serial_console(0);
 }

diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index b3a23c88bcfe500ac7511017f62e46ad024736b9..ff7e2329882758bdd5b73ea125a5373e25d0a451 100644 (file)
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -115,12 +115,12 @@ static void __init atstk1003_setup_extdac(void)
 void __init setup_board(void)
 {
 #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_map_usart(0, 1);   /* USART 0/B: /dev/ttyS1, IRDA */
+       at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
 #else
-       at32_map_usart(1, 0);   /* USART 1/A: /dev/ttyS0, DB9 */
+       at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
 #endif
        /* USART 2/unused: expansion connector */
-       at32_map_usart(3, 2);   /* USART 3/C: /dev/ttyS2, DB9 */
+       at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
 
        at32_setup_serial_console(0);
 }

diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index 29b35aca96cdeedb0ca5bb467c58d7576020e96c..69a9f0f08c6e1ef214d33627baf80def2d560a13 100644 (file)
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -120,12 +120,12 @@ static void __init atstk1004_setup_extdac(void)
 void __init setup_board(void)
 {
 #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_map_usart(0, 1);   /* USART 0/B: /dev/ttyS1, IRDA */
+       at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
 #else
-       at32_map_usart(1, 0);   /* USART 1/A: /dev/ttyS0, DB9 */
+       at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
 #endif
        /* USART 2/unused: expansion connector */
-       at32_map_usart(3, 2);   /* USART 3/C: /dev/ttyS2, DB9 */
+       at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
 
        at32_setup_serial_console(0);
 }

diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index cf6e4e5624d056f37e49bf09f2172f317f48723d..46c9b0a224cfb01812684d74f2f6b06fb8cfcb1c 100644 (file)
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -250,7 +250,7 @@ static void __init favr32_setup_atmel_pwm_bl(void)
 
 void __init setup_board(void)
 {
-       at32_map_usart(3, 0);   /* USART 3 => /dev/ttyS0 */
+       at32_map_usart(3, 0, 0);        /* USART 3 => /dev/ttyS0 */
        at32_setup_serial_console(0);
 }
 

diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c
index a5c2da25c4fe801b7d47368e58c4f2c13615b200..dd009875a4059d94acf08f6f28e41b3cb67030b6 100644 (file)
--- a/arch/avr32/boards/hammerhead/setup.c
+++ b/arch/avr32/boards/hammerhead/setup.c
@@ -165,7 +165,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
 
 void __init setup_board(void)
 {
-       at32_map_usart(1, 0);   /* USART 1: /dev/ttyS0, DB9 */
+       at32_map_usart(1, 0, 0);        /* USART 1: /dev/ttyS0, DB9 */
        at32_setup_serial_console(0);
 }
 

diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index 58acdb4fc9b308384db306a9358e12ec79b3a15d..20b300cf105ade80ed74f2a0f94fc4aa100a9098 100644 (file)
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -231,9 +231,9 @@ static void detect_merisc_board_id(void)
 
 void __init setup_board(void)
 {
-       at32_map_usart(0, 0);
-       at32_map_usart(1, 1);
-       at32_map_usart(3, 3);
+       at32_map_usart(0, 0, 0);
+       at32_map_usart(1, 1, 0);
+       at32_map_usart(3, 3, 0);
        at32_setup_serial_console(1);
 }
 
@@ -248,7 +248,7 @@ static int __init merisc_init(void)
        at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26));
 
        if (merisc_board_id >= 1)
-               at32_map_usart(2, 2);
+               at32_map_usart(2, 2, 0);
 
        at32_add_device_usart(0);
        at32_add_device_usart(1);

diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index 2b58d61f0afc3ad8cab3f2925f80bbc253d9a43b..c1b2175b4fea6300c8d7c654e85ca2fa9a99cca2 100644 (file)
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -175,10 +175,10 @@ static void __init set_hw_addr(struct platform_device *pdev)
 
 void __init setup_board(void)
 {
-       at32_map_usart(0, 0);   /* USART 0: /dev/ttyS0 (TTL --> Altera) */
-       at32_map_usart(1, 1);   /* USART 1: /dev/ttyS1 (RS232) */
-       at32_map_usart(2, 2);   /* USART 2: /dev/ttyS2 (RS485) */
-       at32_map_usart(3, 3);   /* USART 3: /dev/ttyS3 (RS422 Multidrop) */
+       at32_map_usart(0, 0, 0);        /* USART 0: /dev/ttyS0 (TTL --> Altera) */
+       at32_map_usart(1, 1, 0);        /* USART 1: /dev/ttyS1 (RS232) */
+       at32_map_usart(2, 2, 0);        /* USART 2: /dev/ttyS2 (RS485) */
+       at32_map_usart(3, 3, 0);        /* USART 3: /dev/ttyS3 (RS422 Multidrop) */
 }
 
 static struct i2c_gpio_platform_data i2c_gpio_data = {

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 62501d64322c4720a13b7841afed8a5e24f89dc0..7cc6537983275d1bea9c6a183619e37a9c8392cc 100644 (file)
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -966,56 +966,68 @@ static struct resource atmel_usart3_resource[] = {
 DEFINE_DEV_DATA(atmel_usart, 3);
 DEV_CLK(usart, atmel_usart3, pba, 6);
 
-static inline void configure_usart0_pins(void)
+static inline void configure_usart0_pins(int flags)
 {
        u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */
+       if (flags & ATMEL_USART_RTS)    pin_mask |= (1 << 6);
+       if (flags & ATMEL_USART_CTS)    pin_mask |= (1 << 7);
+       if (flags & ATMEL_USART_CLK)    pin_mask |= (1 << 10);
 
        select_peripheral(PIOA, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
 }
 
-static inline void configure_usart1_pins(void)
+static inline void configure_usart1_pins(int flags)
 {
        u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */
+       if (flags & ATMEL_USART_RTS)    pin_mask |= (1 << 19);
+       if (flags & ATMEL_USART_CTS)    pin_mask |= (1 << 20);
+       if (flags & ATMEL_USART_CLK)    pin_mask |= (1 << 16);
 
        select_peripheral(PIOA, pin_mask, PERIPH_A, AT32_GPIOF_PULLUP);
 }
 
-static inline void configure_usart2_pins(void)
+static inline void configure_usart2_pins(int flags)
 {
        u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */
+       if (flags & ATMEL_USART_RTS)    pin_mask |= (1 << 30);
+       if (flags & ATMEL_USART_CTS)    pin_mask |= (1 << 29);
+       if (flags & ATMEL_USART_CLK)    pin_mask |= (1 << 28);
 
        select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
 }
 
-static inline void configure_usart3_pins(void)
+static inline void configure_usart3_pins(int flags)
 {
        u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */
+       if (flags & ATMEL_USART_RTS)    pin_mask |= (1 << 16);
+       if (flags & ATMEL_USART_CTS)    pin_mask |= (1 << 15);
+       if (flags & ATMEL_USART_CLK)    pin_mask |= (1 << 19);
 
        select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
 }
 
 static struct platform_device *__initdata at32_usarts[4];
 
-void __init at32_map_usart(unsigned int hw_id, unsigned int line)
+void __init at32_map_usart(unsigned int hw_id, unsigned int line, int flags)
 {
        struct platform_device *pdev;
 
        switch (hw_id) {
        case 0:
                pdev = &atmel_usart0_device;
-               configure_usart0_pins();
+               configure_usart0_pins(flags);
                break;
        case 1:
                pdev = &atmel_usart1_device;
-               configure_usart1_pins();
+               configure_usart1_pins(flags);
                break;
        case 2:
                pdev = &atmel_usart2_device;
-               configure_usart2_pins();
+               configure_usart2_pins(flags);
                break;
        case 3:
                pdev = &atmel_usart3_device;
-               configure_usart3_pins();
+               configure_usart3_pins(flags);
                break;
        default:
                return;

diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index b363b067b0a4412c88c48f84e073aa76c1c2d60b..0b81642818999d2161e7c9a0f72cdd05d21064f7 100644 (file)
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -26,12 +26,17 @@ static inline void __deprecated at32_add_system_devices(void)
 #define ATMEL_MAX_UART 4
 extern struct platform_device *atmel_default_console_device;
 
+/* Flags for selecting USART extra pins */
+#define        ATMEL_USART_RTS         0x01
+#define        ATMEL_USART_CTS         0x02
+#define        ATMEL_USART_CLK         0x03
+
 struct atmel_uart_data {
        short           use_dma_tx;     /* use transmit DMA? */
        short           use_dma_rx;     /* use receive DMA? */
        void __iomem    *regs;          /* virtual base address, if any */
 };
-void at32_map_usart(unsigned int hw_id, unsigned int line);
+void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);
 struct platform_device *at32_add_device_usart(unsigned int id);
 
 struct eth_platform_data {