rpms/kernel/devel linux-2.6-serial-of.patch,1.3,1.4

Wed Nov 16 10:31:17 UTC 2005

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15412

Modified Files:
	linux-2.6-serial-of.patch 
Log Message:
update serial-of patch

linux-2.6-serial-of.patch:
 linux-2.6.13/arch/powerpc/kernel/setup_64.c |  184 -------------------------
 linux-2.6.13/drivers/serial/8250_of.c       |  206 ++++++++++++++++++++++++++++
 linux-2.6.13/drivers/serial/Kconfig         |    5 
 linux-2.6.14/drivers/serial/Makefile        |    1 
 4 files changed, 212 insertions(+), 184 deletions(-)

Index: linux-2.6-serial-of.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-serial-of.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- linux-2.6-serial-of.patch	8 Nov 2005 03:28:58 -0000	1.3
+++ linux-2.6-serial-of.patch	16 Nov 2005 10:31:08 -0000	1.4
@@ -10,7 +10,22 @@
  obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
 --- linux-2.6.13/drivers/serial/8250_of.c.sof	2005-10-20 13:19:07.000000000 +0100
 +++ linux-2.6.13/drivers/serial/8250_of.c	2005-10-20 13:19:26.000000000 +0100
-@@ -0,0 +1,197 @@
+@@ -0,0 +1,206 @@
++/* 
++ * Search OpenFirmware device tree for 8250-compatible serial ports 
++ * 
++ * Moved from arch/powerpc/kernel/setup_64.c:
++ *
++ *	Copyright (C) 2001 PPC64, IBM Corp
++ *
++ *	This program is free software; you can redistribute it and/or
++ *	modify it under the terms of the GNU General Public License
++ *	as published by the Free Software Foundation; either version
++ *	2 of the License, or (at your option) any later version.
++ */
++
++#undef DEBUG
++
 +#include <linux/kernel.h>
 +#include <linux/serial.h>
 +#include <linux/serial_8250.h>
@@ -21,12 +36,6 @@
 +#include <asm/serial.h>
 +#include <asm/prom.h>
 +
-+#if 0
-+#define DBG(fmt...) printk(KERN_DEBUG fmt)
-+#else
-+#define DBG(fmt...) do { } while (0)
-+#endif
-+
 +/*
 + * This function can be used by platforms to "find" legacy serial ports.
 + * It works for "serial" nodes under an "isa" node, and will try to
@@ -52,7 +61,7 @@
 +		u32 size;
 +	};
 +
-+	DBG(" -> generic_find_legacy_serial_port()\n");
++	pr_debug(" -> generic_find_legacy_serial_port()\n");
 +	ports_probed = 1;
 +
 +	*physport = 0;
@@ -77,7 +86,7 @@
 +		/* Ok, first check if it's under an "isa" parent */
 +		isa = of_get_parent(np);
 +		if (!isa || strcmp(isa->name, "isa")) {
-+			DBG("%s: no isa parent found\n", np->full_name);
++			pr_debug("%s: no isa parent found\n", np->full_name);
 +			continue;
 +		}
 +
@@ -117,12 +126,12 @@
 +			if (serial_ports[index].iobase != 0) {
 +				/* if we still have some room, move it, else override */
 +				if (old_serial_count < MAX_LEGACY_SERIAL_PORTS) {
-+					DBG("Moved legacy port %d -> %d\n", index,
++					pr_debug("Moved legacy port %d -> %d\n", index,
 +					    old_serial_count);
 +					serial_ports[old_serial_count++] =
 +						serial_ports[index];
 +				} else {
-+					DBG("Replacing legacy port %d\n", index);
++					pr_debug("Replacing legacy port %d\n", index);
 +				}
 +			}
 +		}
@@ -138,7 +147,7 @@
 +		serial_ports[index].irq = interrupts ? interrupts[0] : 0;
 +		serial_ports[index].flags = ASYNC_BOOT_AUTOCONF;
 +
-+		DBG("Added legacy port, index: %d, port: %x, irq: %d, clk: %d\n",
++		pr_debug("Added legacy port, index: %d, port: %x, irq: %d, clk: %d\n",
 +		    index,
 +		    serial_ports[index].iobase,
 +		    serial_ports[index].irq,
@@ -150,7 +159,7 @@
 +
 +		pci = of_get_parent(isa);
 +		if (!pci) {
-+			DBG("%s: no pci parent found\n", np->full_name);
++			pr_debug("%s: no pci parent found\n", np->full_name);
 +			goto next_port;
 +		}
 +
@@ -187,7 +196,7 @@
 +		of_node_put(isa);
 +	}
 +
-+	DBG(" <- generic_find_legacy_serial_port()\n");
++	pr_debug(" <- generic_find_legacy_serial_port()\n");
 +}
 +
 +static struct platform_device serial_device = {
@@ -217,7 +226,7 @@
 +config SERIAL_8250_OF
 +       bool
 +       default y
-+       depends on PPC_OF && SERIAL_8250
++       depends on PPC_OF && SERIAL_8250 && PPC_MERGE
 +
  config SERIAL_8250_ACPI
  	bool "8250/16550 device discovery via ACPI namespace"
@@ -429,25 +438,3 @@
  int check_legacy_ioport(unsigned long base_port)
  {
  	if (ppc_md.check_legacy_ioport == NULL)
---- linux-2.6.13/include/asm-ppc/pc_serial.h.sof	2005-08-29 00:41:01.000000000 +0100
-+++ linux-2.6.13/include/asm-ppc/pc_serial.h	2005-10-20 13:05:42.000000000 +0100
-@@ -26,18 +26,4 @@
- #define RS_TABLE_SIZE  4
- #endif
- 
--/* Standard COM flags (except for COM4, because of the 8514 problem) */
--#ifdef CONFIG_SERIAL_DETECT_IRQ
--#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
--#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
--#else
--#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
--#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
--#endif
--
--#define SERIAL_PORT_DFNS			\
--	/* UART CLK   PORT IRQ     FLAGS        */			\
--	{ 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },	/* ttyS0 */	\
--	{ 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },	/* ttyS1 */	\
--	{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },	/* ttyS2 */	\
--	{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },	/* ttyS3 */
-+#define SERIAL_PORT_DFNS /* */


