]> git.karo-electronics.de Git - linux-beck.git/commitdiff
avr32: Fix clash in ATMEL_USART_ flags
authorBen Nizette <bn@niasdigital.com>
Wed, 3 Jun 2009 09:38:20 +0000 (11:38 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 3 Jun 2009 09:38:20 +0000 (11:38 +0200)
At the moment ATMEL_USART_{RTS,CTS,CLK} have the values
1, 2 and 3 respectively.  Given these are used in bitmasks,
trying to turn on the CLK line will in fact turn on the
RTS and CTS lines as well.

Change the value of ATMEL_USART_CLK to 4.

Signed-off-by: Ben Nizette <bn@niasdigital.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
arch/avr32/mach-at32ap/include/mach/board.h

index 0b81642818999d2161e7c9a0f72cdd05d21064f7..ddedb471f33eb34fa3e902a1a3b98f08dd58da08 100644 (file)
@@ -29,7 +29,7 @@ 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
+#define        ATMEL_USART_CLK         0x04
 
 struct atmel_uart_data {
        short           use_dma_tx;     /* use transmit DMA? */