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

Commit d4965b3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial 

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Provide Cirrus EP93xx AMBA PL010 serial support.
  [SERIAL] amba-pl010: allow platforms to specify modem control method
  [SERIAL] Remove obsoleted au1x00_uart driver
  [SERIAL] Small time UART configuration fix for AU1100 processor
parents 9561b03d aee85fe8

arch/arm/mach-ep93xx/core.c

+68 −0
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ 
#include <linux/time.h>

#include <linux/timex.h>

#include <linux/delay.h>

#include <linux/termios.h>

#include <linux/amba/bus.h>

#include <linux/amba/serial.h>



#include <asm/types.h>

#include <asm/setup.h>
@@ -360,6 +362,68 @@ void __init ep93xx_init_irq(void) 
/*************************************************************************

 * EP93xx peripheral handling

 *************************************************************************/

#define EP93XX_UART_MCR_OFFSET		(0x0100)



static void ep93xx_uart_set_mctrl(struct amba_device *dev,

				  void __iomem *base, unsigned int mctrl)

{

	unsigned int mcr;



	mcr = 0;

	if (!(mctrl & TIOCM_RTS))

		mcr |= 2;

	if (!(mctrl & TIOCM_DTR))

		mcr |= 1;



	__raw_writel(mcr, base + EP93XX_UART_MCR_OFFSET);

}



static struct amba_pl010_data ep93xx_uart_data = {

	.set_mctrl	= ep93xx_uart_set_mctrl,

};



static struct amba_device uart1_device = {

	.dev		= {

		.bus_id		= "apb:uart1",

		.platform_data	= &ep93xx_uart_data,

	},

	.res		= {

		.start	= EP93XX_UART1_PHYS_BASE,

		.end	= EP93XX_UART1_PHYS_BASE + 0x0fff,

		.flags	= IORESOURCE_MEM,

	},

	.irq		= { IRQ_EP93XX_UART1, NO_IRQ },

	.periphid	= 0x00041010,

};



static struct amba_device uart2_device = {

	.dev		= {

		.bus_id		= "apb:uart2",

		.platform_data	= &ep93xx_uart_data,

	},

	.res		= {

		.start	= EP93XX_UART2_PHYS_BASE,

		.end	= EP93XX_UART2_PHYS_BASE + 0x0fff,

		.flags	= IORESOURCE_MEM,

	},

	.irq		= { IRQ_EP93XX_UART2, NO_IRQ },

	.periphid	= 0x00041010,

};



static struct amba_device uart3_device = {

	.dev		= {

		.bus_id		= "apb:uart3",

		.platform_data	= &ep93xx_uart_data,

	},

	.res		= {

		.start	= EP93XX_UART3_PHYS_BASE,

		.end	= EP93XX_UART3_PHYS_BASE + 0x0fff,

		.flags	= IORESOURCE_MEM,

	},

	.irq		= { IRQ_EP93XX_UART3, NO_IRQ },

	.periphid	= 0x00041010,

};



void __init ep93xx_init_devices(void)

{

	unsigned int v;
@@ -371,4 +435,8 @@ void __init ep93xx_init_devices(void) 
	v &= ~EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE;

	__raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);

	__raw_writel(v, EP93XX_SYSCON_DEVICE_CONFIG);



	amba_device_register(&uart1_device, &iomem_resource);

	amba_device_register(&uart2_device, &iomem_resource);

	amba_device_register(&uart3_device, &iomem_resource);

}

arch/arm/mach-integrator/core.c

+46 −0
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/smp.h>

#include <linux/termios.h>

#include <linux/amba/bus.h>

#include <linux/amba/serial.h>



#include <asm/hardware.h>

#include <asm/irq.h>
@@ -28,6 +30,8 @@ 


#include "common.h"



static struct amba_pl010_data integrator_uart_data;



static struct amba_device rtc_device = {

	.dev		= {

		.bus_id	= "mb:15",
@@ -44,6 +48,7 @@ static struct amba_device rtc_device = { 
static struct amba_device uart0_device = {

	.dev		= {

		.bus_id	= "mb:16",

		.platform_data = &integrator_uart_data,

	},

	.res		= {

		.start	= INTEGRATOR_UART0_BASE,
@@ -57,6 +62,7 @@ static struct amba_device uart0_device = { 
static struct amba_device uart1_device = {

	.dev		= {

		.bus_id	= "mb:17",

		.platform_data = &integrator_uart_data,

	},

	.res		= {

		.start	= INTEGRATOR_UART1_BASE,
@@ -115,6 +121,46 @@ static int __init integrator_init(void) 


arch_initcall(integrator_init);



/*

 * On the Integrator platform, the port RTS and DTR are provided by

 * bits in the following SC_CTRLS register bits:

 *        RTS  DTR

 *  UART0  7    6

 *  UART1  5    4

 */

#define SC_CTRLC	(IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLC_OFFSET)

#define SC_CTRLS	(IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLS_OFFSET)



static void integrator_uart_set_mctrl(struct amba_device *dev, void __iomem *base, unsigned int mctrl)

{

	unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;



	if (dev == &uart0_device) {

		rts_mask = 1 << 4;

		dtr_mask = 1 << 5;

	} else {

		rts_mask = 1 << 6;

		dtr_mask = 1 << 7;

	}



	if (mctrl & TIOCM_RTS)

		ctrlc |= rts_mask;

	else

		ctrls |= rts_mask;



	if (mctrl & TIOCM_DTR)

		ctrlc |= dtr_mask;

	else

		ctrls |= dtr_mask;



	__raw_writel(ctrls, SC_CTRLS);

	__raw_writel(ctrlc, SC_CTRLC);

}



static struct amba_pl010_data integrator_uart_data = {

	.set_mctrl = integrator_uart_set_mctrl,

};



#define CM_CTRL	IO_ADDRESS(INTEGRATOR_HDR_BASE) + INTEGRATOR_HDR_CTRL_OFFSET



static DEFINE_SPINLOCK(cm_lock);

arch/mips/au1000/common/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void __init plat_setup(void) 


	argptr = prom_getcmdline();



#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)

#ifdef CONFIG_SERIAL_8250_CONSOLE

	if ((argptr = strstr(argptr, "console=")) == NULL) {

		argptr = prom_getcmdline();

		strcat(argptr, " console=ttyS0,115200");

drivers/serial/8250_au1x00.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static struct plat_serial8250_port au1x00_data[] = { 
#elif defined(CONFIG_SOC_AU1100)

	PORT(UART0_ADDR, AU1100_UART0_INT),

	PORT(UART1_ADDR, AU1100_UART1_INT),

	PORT(UART2_ADDR, AU1100_UART2_INT),

	/* The internal UART2 does not exist on the AU1100 processor. */

	PORT(UART3_ADDR, AU1100_UART3_INT),

#elif defined(CONFIG_SOC_AU1550)

	PORT(UART0_ADDR, AU1550_UART0_INT),

drivers/serial/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -620,22 +620,6 @@ config SERIAL_SH_SCI_CONSOLE 
	depends on SERIAL_SH_SCI=y

	select SERIAL_CORE_CONSOLE



config SERIAL_AU1X00

	bool "Enable Au1x00 UART Support"

	depends on MIPS && SOC_AU1X00

	select SERIAL_CORE

	help

	  If you have an Alchemy AU1X00 processor (MIPS based) and you want

	  to use serial ports, say Y.  Otherwise, say N.



config SERIAL_AU1X00_CONSOLE

	bool "Enable Au1x00 serial console"

	depends on SERIAL_AU1X00

	select SERIAL_CORE_CONSOLE

	help

	  If you have an Alchemy AU1X00 processor (MIPS based) and you want

	  to use a console on a serial port, say Y.  Otherwise, say N.



config SERIAL_CORE

	tristate