Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

avr32: Fix clash in ATMEL_USART_ flags

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>

authored by

Ben Nizette and committed by
Haavard Skinnemoen
c076b993 9fa7eb28

+1 -1
+1 -1
arch/avr32/mach-at32ap/include/mach/board.h
··· 29 29 /* Flags for selecting USART extra pins */ 30 30 #define ATMEL_USART_RTS 0x01 31 31 #define ATMEL_USART_CTS 0x02 32 - #define ATMEL_USART_CLK 0x03 32 + #define ATMEL_USART_CLK 0x04 33 33 34 34 struct atmel_uart_data { 35 35 short use_dma_tx; /* use transmit DMA? */