Merge master.kernel.org:/home/rmk/linux-2.6-serial (d498a2c7) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/serial/68328serial.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -1497,23 +1497,6 @@ rs68328_init(void)
		return 0;
		}



		/*
		* register_serial and unregister_serial allows for serial ports to be
		* configured at run-time, to support PCMCIA modems.
		*/
		/* SPARC: Unused at this time, just here to make things link. */
		int register_serial(struct serial_struct *req)
		{
		return -1;
		}

		void unregister_serial(int line)
		{
		return;
		}

		module_init(rs68328_init);

+9 −16

Original line number	Diff line number	Diff line
		@@ -77,23 +77,9 @@ static unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
		*/
		#define is_real_interrupt(irq) ((irq) != 0)

		/*
		* This converts from our new CONFIG_ symbols to the symbols
		* that asm/serial.h expects. You _NEED_ to comment out the
		* linux/config.h include contained inside asm/serial.h for
		* this to work.
		*/
		#undef CONFIG_SERIAL_MANY_PORTS
		#undef CONFIG_SERIAL_DETECT_IRQ
		#undef CONFIG_SERIAL_MULTIPORT
		#undef CONFIG_HUB6

		#ifdef CONFIG_SERIAL_8250_DETECT_IRQ
		#define CONFIG_SERIAL_DETECT_IRQ 1
		#endif
		#ifdef CONFIG_SERIAL_8250_MULTIPORT
		#define CONFIG_SERIAL_MULTIPORT 1
		#endif
		#ifdef CONFIG_SERIAL_8250_MANY_PORTS
		#define CONFIG_SERIAL_MANY_PORTS 1
		#endif
		@@ -2323,10 +2309,11 @@ static int __devinit serial8250_probe(struct device *dev)
		{
		struct plat_serial8250_port *p = dev->platform_data;
		struct uart_port port;
		int ret, i;

		memset(&port, 0, sizeof(struct uart_port));

		for (; p && p->flags != 0; p++) {
		for (i = 0; p && p->flags != 0; p++, i++) {
		port.iobase = p->iobase;
		port.membase = p->membase;
		port.irq = p->irq;
		@@ -2335,10 +2322,16 @@ static int __devinit serial8250_probe(struct device *dev)
		port.iotype = p->iotype;
		port.flags = p->flags;
		port.mapbase = p->mapbase;
		port.hub6 = p->hub6;
		port.dev = dev;
		if (share_irqs)
		port.flags \|= UPF_SHARE_IRQ;
		serial8250_register_port(&port);
		ret = serial8250_register_port(&port);
		if (ret < 0) {
		dev_err(dev, "unable to register port at index %d "
		"(IO%lx MEM%lx IRQ%d): %d\n", i,
		p->iobase, p->mapbase, p->irq, ret);
		}
		}
		return 0;
		}

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* linux/drivers/serial/8250_accent.c
		*
		* Copyright (C) 2005 Russell King.
		* Data taken from include/asm-i386/serial.h
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/serial_8250.h>

		#define PORT(_base,_irq) \
		{ \
		.iobase = _base, \
		.irq = _irq, \
		.uartclk = 1843200, \
		.iotype = UPIO_PORT, \
		.flags = UPF_BOOT_AUTOCONF, \
		}

		static struct plat_serial8250_port accent_data[] = {
		PORT(0x330, 4),
		PORT(0x338, 4),
		{ },
		};

		static struct platform_device accent_device = {
		.name = "serial8250",
		.id = 2,
		.dev = {
		.platform_data = accent_data,
		},
		};

		static int __init accent_init(void)
		{
		return platform_device_register(&accent_device);
		}

		module_init(accent_init);

		MODULE_AUTHOR("Russell King");
		MODULE_DESCRIPTION("8250 serial probe module for Accent Async cards");
		MODULE_LICENSE("GPL");

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		/*
		* linux/drivers/serial/8250_boca.c
		*
		* Copyright (C) 2005 Russell King.
		* Data taken from include/asm-i386/serial.h
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/serial_8250.h>

		#define PORT(_base,_irq) \
		{ \
		.iobase = _base, \
		.irq = _irq, \
		.uartclk = 1843200, \
		.iotype = UPIO_PORT, \
		.flags = UPF_BOOT_AUTOCONF, \
		}

		static struct plat_serial8250_port boca_data[] = {
		PORT(0x100, 12),
		PORT(0x108, 12),
		PORT(0x110, 12),
		PORT(0x118, 12),
		PORT(0x120, 12),
		PORT(0x128, 12),
		PORT(0x130, 12),
		PORT(0x138, 12),
		PORT(0x140, 12),
		PORT(0x148, 12),
		PORT(0x150, 12),
		PORT(0x158, 12),
		PORT(0x160, 12),
		PORT(0x168, 12),
		PORT(0x170, 12),
		PORT(0x178, 12),
		{ },
		};

		static struct platform_device boca_device = {
		.name = "serial8250",
		.id = 3,
		.dev = {
		.platform_data = boca_data,
		},
		};

		static int __init boca_init(void)
		{
		return platform_device_register(&boca_device);
		}

		module_init(boca_init);

		MODULE_AUTHOR("Russell King");
		MODULE_DESCRIPTION("8250 serial probe module for Boca cards");
		MODULE_LICENSE("GPL");

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* linux/drivers/serial/8250_fourport.c
		*
		* Copyright (C) 2005 Russell King.
		* Data taken from include/asm-i386/serial.h
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/serial_8250.h>

		#define PORT(_base,_irq) \
		{ \
		.iobase = _base, \
		.irq = _irq, \
		.uartclk = 1843200, \
		.iotype = UPIO_PORT, \
		.flags = UPF_BOOT_AUTOCONF \| UPF_FOURPORT, \
		}

		static struct plat_serial8250_port fourport_data[] = {
		PORT(0x1a0, 9),
		PORT(0x1a8, 9),
		PORT(0x1b0, 9),
		PORT(0x1b8, 9),
		PORT(0x2a0, 5),
		PORT(0x2a8, 5),
		PORT(0x2b0, 5),
		PORT(0x2b8, 5),
		{ },
		};

		static struct platform_device fourport_device = {
		.name = "serial8250",
		.id = 1,
		.dev = {
		.platform_data = fourport_data,
		},
		};

		static int __init fourport_init(void)
		{
		return platform_device_register(&fourport_device);
		}

		module_init(fourport_init);

		MODULE_AUTHOR("Russell King");
		MODULE_DESCRIPTION("8250 serial probe module for AST Fourport cards");
		MODULE_LICENSE("GPL");