Skip to content

Commit

Permalink
serial: fix rs485 for atmel_serial on avr32
Browse files Browse the repository at this point in the history
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 (e8faff7)

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>
  • Loading branch information
PeterHuewe authored and gregkh committed Jul 26, 2010
1 parent dbbe464 commit f7512e7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/avr32/include/asm/ioctls.h
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions arch/avr32/mach-at32ap/include/mach/board.h
Expand Up @@ -5,6 +5,7 @@
#define __ASM_ARCH_BOARD_H

#include <linux/types.h>
#include <linux/serial.h>

#define GPIO_PIN_NONE (-1)

Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions drivers/serial/atmel_serial.c
Expand Up @@ -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>
Expand Down

0 comments on commit f7512e7

Please sign in to comment.