Commit 4afb93b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  serial: fix rs485 for atmel_serial on avr32
parents 225aa011 f7512e7c

arch/avr32/include/asm/ioctls.h

+3 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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>