Commit f7512e7c4bb557b784fd5326f78983a7dea9949c
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
dbbe4649d6
Exists in
master
and in
7 other branches
serial: fix rs485 for atmel_serial on avr32
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 Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 3 changed files with 6 additions and 0 deletions Side-by-side Diff
arch/avr32/include/asm/ioctls.h
| ... | ... | @@ -54,6 +54,9 @@ |
| 54 | 54 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ |
| 55 | 55 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ |
| 56 | 56 | |
| 57 | +#define TIOCGRS485 0x542E | |
| 58 | +#define TIOCSRS485 0x542F | |
| 59 | + | |
| 57 | 60 | #define FIONCLEX 0x5450 |
| 58 | 61 | #define FIOCLEX 0x5451 |
| 59 | 62 | #define FIOASYNC 0x5452 |
arch/avr32/mach-at32ap/include/mach/board.h
| ... | ... | @@ -5,6 +5,7 @@ |
| 5 | 5 | #define __ASM_ARCH_BOARD_H |
| 6 | 6 | |
| 7 | 7 | #include <linux/types.h> |
| 8 | +#include <linux/serial.h> | |
| 8 | 9 | |
| 9 | 10 | #define GPIO_PIN_NONE (-1) |
| 10 | 11 | |
| ... | ... | @@ -35,6 +36,7 @@ |
| 35 | 36 | short use_dma_tx; /* use transmit DMA? */ |
| 36 | 37 | short use_dma_rx; /* use receive DMA? */ |
| 37 | 38 | void __iomem *regs; /* virtual base address, if any */ |
| 39 | + struct serial_rs485 rs485; /* rs485 settings */ | |
| 38 | 40 | }; |
| 39 | 41 | void at32_map_usart(unsigned int hw_id, unsigned int line, int flags); |
| 40 | 42 | struct platform_device *at32_add_device_usart(unsigned int id); |