diff options
author | David Brownell <david-b@pacbell.net> | 2007-01-23 23:14:02 -0500 |
---|---|---|
committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-02-09 09:01:57 -0500 |
commit | a3d912c8fa709c4078ceaabf4d71001190e19325 (patch) | |
tree | 58a492ce454a6412bb63710decc56f741981ede7 /arch/avr32/mach-at32ap/at32ap7000.c | |
parent | 914ab06279f15d3f368f4fae74db58fdcf03a2ed (diff) |
[AVR32] fix serial port setup on ATSTK1000
Fixes to USART setup on the stk-1000 ... don't configure USART 2, since
its TXD/RXD are used for INT-A and INT-B buttons; and configure USART 0
(for IRDA, and with corrected IRQ) iff SW2 has a non-default setting.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Diffstat (limited to 'arch/avr32/mach-at32ap/at32ap7000.c')
-rw-r--r-- | arch/avr32/mach-at32ap/at32ap7000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c index 48f4ef38c70e..175853a3c32b 100644 --- a/arch/avr32/mach-at32ap/at32ap7000.c +++ b/arch/avr32/mach-at32ap/at32ap7000.c | |||
@@ -521,7 +521,7 @@ static struct atmel_uart_data atmel_usart0_data = { | |||
521 | }; | 521 | }; |
522 | static struct resource atmel_usart0_resource[] = { | 522 | static struct resource atmel_usart0_resource[] = { |
523 | PBMEM(0xffe00c00), | 523 | PBMEM(0xffe00c00), |
524 | IRQ(7), | 524 | IRQ(6), |
525 | }; | 525 | }; |
526 | DEFINE_DEV_DATA(atmel_usart, 0); | 526 | DEFINE_DEV_DATA(atmel_usart, 0); |
527 | DEV_CLK(usart, atmel_usart0, pba, 4); | 527 | DEV_CLK(usart, atmel_usart0, pba, 4); |
@@ -583,7 +583,7 @@ static inline void configure_usart3_pins(void) | |||
583 | select_peripheral(PB(17), PERIPH_B, 0); /* TXD */ | 583 | select_peripheral(PB(17), PERIPH_B, 0); /* TXD */ |
584 | } | 584 | } |
585 | 585 | ||
586 | static struct platform_device *at32_usarts[4]; | 586 | static struct platform_device *__initdata at32_usarts[4]; |
587 | 587 | ||
588 | void __init at32_map_usart(unsigned int hw_id, unsigned int line) | 588 | void __init at32_map_usart(unsigned int hw_id, unsigned int line) |
589 | { | 589 | { |