diff options
author | Peter Ma <pma@mediamatech.com> | 2009-03-31 13:31:02 -0400 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-04-01 10:13:45 -0400 |
commit | bf4861cf3e7df123c0c62f00ae2c301c292f669c (patch) | |
tree | 916a73a6597b06e719f6f96a499fb0bcaa44a5b6 /arch/avr32/boards/merisc | |
parent | a6b6b5ff8f31960f760dd849beb70e1ae8ddc0e2 (diff) |
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>
Diffstat (limited to 'arch/avr32/boards/merisc')
-rw-r--r-- | arch/avr32/boards/merisc/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c index 58acdb4fc9b3..20b300cf105a 100644 --- 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) | |||
231 | 231 | ||
232 | void __init setup_board(void) | 232 | void __init setup_board(void) |
233 | { | 233 | { |
234 | at32_map_usart(0, 0); | 234 | at32_map_usart(0, 0, 0); |
235 | at32_map_usart(1, 1); | 235 | at32_map_usart(1, 1, 0); |
236 | at32_map_usart(3, 3); | 236 | at32_map_usart(3, 3, 0); |
237 | at32_setup_serial_console(1); | 237 | at32_setup_serial_console(1); |
238 | } | 238 | } |
239 | 239 | ||
@@ -248,7 +248,7 @@ static int __init merisc_init(void) | |||
248 | at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26)); | 248 | at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26)); |
249 | 249 | ||
250 | if (merisc_board_id >= 1) | 250 | if (merisc_board_id >= 1) |
251 | at32_map_usart(2, 2); | 251 | at32_map_usart(2, 2, 0); |
252 | 252 | ||
253 | at32_add_device_usart(0); | 253 | at32_add_device_usart(0); |
254 | at32_add_device_usart(1); | 254 | at32_add_device_usart(1); |