Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f302dc3 authored by Sascha Hauer's avatar Sascha Hauer Committed by Russell King
Browse files

[ARM] 2866/1: add i.MX set_mctrl / get_mctrl functions 



Patch from Sascha Hauer

This patch adds support for setting and getting RTS / CTS via
set_mtctrl / get_mctrl functions.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b129a8cc

drivers/char/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -896,8 +896,8 @@ source "drivers/char/pcmcia/Kconfig" 


config MWAVE

	tristate "ACP Modem (Mwave) support"

	depends on X86

	select SERIAL_8250

	depends on X86 && BROKEN

	select SERIAL_8250 # PLEASE DO NOT DO THIS - move this driver to drivers/serial

	---help---

	  The ACP modem (Mwave) for Linux is a WinModem. It is composed of a

	  kernel driver and a user level application. Together these components

drivers/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ menu "Misc devices" 


config IBM_ASM

	tristate "Device driver for IBM RSA service processor"

	depends on X86 && PCI && EXPERIMENTAL

	depends on X86 && PCI && EXPERIMENTAL && BROKEN

	---help---

	  This option enables device driver support for in-band access to the

	  IBM RSA (Condor) service processor in eServer xSeries systems.

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ config NET_SB1250_MAC 


config SGI_IOC3_ETH

	bool "SGI IOC3 Ethernet"

	depends on NET_ETHERNET && PCI && SGI_IP27

	depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN

	select CRC32

	select MII

	help

drivers/serial/8250.c

+0 −79
Original line number Diff line number Diff line
@@ -2590,82 +2590,3 @@ module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444); 
MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");

#endif

MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);
 


/**

 *	register_serial - configure a 16x50 serial port at runtime

 *	@req: request structure

 *

 *	Configure the serial port specified by the request. If the

 *	port exists and is in use an error is returned. If the port

 *	is not currently in the table it is added.

 *

 *	The port is then probed and if necessary the IRQ is autodetected

 *	If this fails an error is returned.

 *

 *	On success the port is ready to use and the line number is returned.

 *

 *	Note: this function is deprecated - use serial8250_register_port

 *	instead.

 */

int register_serial(struct serial_struct *req)

{

	struct uart_port port;



	port.iobase   = req->port;

	port.membase  = req->iomem_base;

	port.irq      = req->irq;

	port.uartclk  = req->baud_base * 16;

	port.fifosize = req->xmit_fifo_size;

	port.regshift = req->iomem_reg_shift;

	port.iotype   = req->io_type;

	port.flags    = req->flags | UPF_BOOT_AUTOCONF;

	port.mapbase  = req->iomap_base;

	port.dev      = NULL;



	if (share_irqs)

		port.flags |= UPF_SHARE_IRQ;



	if (HIGH_BITS_OFFSET)

		port.iobase |= (long) req->port_high << HIGH_BITS_OFFSET;



	/*

	 * If a clock rate wasn't specified by the low level driver, then

	 * default to the standard clock rate.  This should be 115200 (*16)

	 * and should not depend on the architecture's BASE_BAUD definition.

	 * However, since this API will be deprecated, it's probably a

	 * better idea to convert the drivers to use the new API

	 * (serial8250_register_port and serial8250_unregister_port).

	 */

	if (port.uartclk == 0) {

		printk(KERN_WARNING

		       "Serial: registering port at [%08x,%08lx,%p] irq %d with zero baud_base\n",

		       port.iobase, port.mapbase, port.membase, port.irq);

		printk(KERN_WARNING "Serial: see %s:%d for more information\n",

		       __FILE__, __LINE__);

		dump_stack();



		/*

		 * Fix it up for now, but this is only a temporary measure.

		 */

		port.uartclk = BASE_BAUD * 16;

	}



	return serial8250_register_port(&port);

}

EXPORT_SYMBOL(register_serial);



/**

 *	unregister_serial - remove a 16x50 serial port at runtime

 *	@line: serial line number

 *

 *	Remove one serial port.  This may not be called from interrupt

 *	context.  We hand the port back to our local PM control.

 *

 *	Note: this function is deprecated - use serial8250_unregister_port

 *	instead.

 */

void unregister_serial(int line)

{

	serial8250_unregister_port(line);

}

EXPORT_SYMBOL(unregister_serial);

drivers/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ config SERIAL_M32R_PLDSIO 


config SERIAL_TXX9

	bool "TMPTX39XX/49XX SIO support"

	depends HAS_TXX9_SERIAL

	depends HAS_TXX9_SERIAL && BROKEN

	select SERIAL_CORE

	default y