serial fix for .35-git
PATCH 1/1 serial fix for .35-git
Here is a single bugfix for the atmel_serial serial driver that is for your .35-git tree.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/
This patch has been in the linux-next tree and -mm tree for a while.
The patch will be sent to the linux-kernel mailing list, if anyone wants to see it.
thanks,
greg k-h
------------
arch/avr32/include/asm/ioctls.h | 3 +++ arch/avr32/mach-at32ap/include/mach/board.h | 2 ++ drivers/serial/atmel_serial.c | 1 + 3 files changed, 6 insertions(+), 0 deletions(-)
---------------
Peter Huewe (1):
serial: fix rs485 for atmel_serial on avr32
PATCH 1/1 serial: fix rs485 for atmel_serial on avr32
From: Peter Huewe <[email protected]>
This patch fixes a build failure [1-4] in the atmel_serial code introduced by patch the patch ARM: 6092/1: atmel_serial: support for RS485 communications (e8faff7330a3501eafc9bfe5f4f15af444be29f5)
The build failure was caused by missing struct field and missing defines for the avr32 board - the patch fixes this.
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2575242/ - first failure in linux-next, may 11th
[2] http://kisskb.ellerman.id.au/kisskb/buildresult/2816418/ - still exists as of today
[3] http://kisskb.ellerman.id.au/kisskb/buildresult/2617511/ - first failure in Linus' tree - May 20th - did really no one notice this?!
[4] http://kisskb.ellerman.id.au/kisskb/buildresult/2813956/ - still exists in Linus' tree as of today
--- arch/avr32/include/asm/ioctls.h | 3 +++ arch/avr32/mach-at32ap/include/mach/board.h | 2 ++ drivers/serial/atmel_serial.c | 1 + 3 files changed, 6 insertions(+), 0 deletions(-)
arch/avr32/include/asm/ioctls.h +3 -0
@@ -54,6 +54,9 @@#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ +#define TIOCGRS485 0x542E +#define TIOCSRS485 0x542F +#define FIONCLEX 0x5450#define FIOCLEX 0x5451#define FIOASYNC 0x5452
arch/avr32/mach-at32ap/include/mach/board.h +2 -0
@@ -5,6 +5,7 @@#define __ASM_ARCH_BOARD_H#include <linux/types.h> +#include <linux/serial.h> #define GPIO_PIN_NONE (-1)
@@ -35,6 +36,7 @@ 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 */ +struct serial_rs485 rs485;/* rs485 settings */ };void at32_map_usart (unsigned int hw_id,unsigned int line,int flags);struct platform_device *at32_add_device_usart (unsigned int id);
drivers/serial/atmel_serial.c +1 -0
@@ -41,6 +41,7 @@#include <linux/uaccess.h> #include <asm/io.h> +#include <asm/ioctls.h> #include <asm/mach/serial_at91.h> #include <mach/board.h>
Signature · 1 line
1.7.2