Update of /cvsroot/linux-vax/kernel-2.4/arch/ppc/8260_io
In directory usw-pr-cvs1:/tmp/cvs-serv25860/ppc/8260_io
Modified Files:
Makefile commproc.c enet.c fcc_enet.c uart.c
Log Message:
synch 2.4.15 commit 43
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/8260_io/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 19:32:44 -0000 1.1.1.1
+++ Makefile 10 Apr 2002 15:03:55 -0000 1.2
@@ -1,3 +1,5 @@
+# BK Id: SCCS/s.Makefile 1.3 05/17/01 18:14:19 cort
+#
#
# Makefile for the linux MPC8xx ppc-specific parts of comm processor
#
Index: commproc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/8260_io/commproc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- commproc.c 14 Jan 2001 19:32:45 -0000 1.1.1.1
+++ commproc.c 10 Apr 2002 15:03:55 -0000 1.2
@@ -1,3 +1,6 @@
+/*
+ * BK Id: SCCS/s.commproc.c 1.10 10/16/01 16:21:52 trini
+ */
/*
* General Purpose functions for the global management of the
@@ -134,7 +137,7 @@
* Baud rate clocks are zero-based in the driver code (as that maps
* to port numbers). Documentation uses 1-based numbering.
*/
-#define BRG_INT_CLK (((bd_t *)__res)->bi_brgfreq * 1000000)
+#define BRG_INT_CLK (((bd_t *)__res)->bi_brgfreq)
#define BRG_UART_CLK (BRG_INT_CLK/16)
/* This function is used by UARTS, or anything else that uses a 16x
@@ -166,8 +169,6 @@
{
volatile uint *bp;
- /* This is good enough to get SMCs running.....
- */
if (brg < 4) {
bp = (uint *)&immr->im_brgc1;
}
Index: enet.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/8260_io/enet.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- enet.c 25 Feb 2001 23:15:18 -0000 1.1.1.2
+++ enet.c 10 Apr 2002 15:03:55 -0000 1.2
@@ -1,4 +1,7 @@
/*
+ * BK Id: SCCS/s.enet.c 1.9 09/14/01 18:01:16 trini
+ */
+/*
* Ethernet driver for Motorola MPC8260.
* Copyright (c) 1999 Dan Malek (dm...@jl...)
* Copyright (c) 2000 MontaVista Software Inc. (so...@mv...)
@@ -10,7 +13,7 @@
* This version of the driver is somewhat selectable for the different
* processor/board combinations. It works for the boards I know about
* now, and should be easily modified to include others. Some of the
- * configuration information is contained in "commproc.h" and the
+ * configuration information is contained in <asm/commproc.h> and the
* remainder is here.
*
* Buffer descriptors are kept in the CPM dual port RAM, and the frame
Index: fcc_enet.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/8260_io/fcc_enet.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- fcc_enet.c 25 Feb 2001 23:15:18 -0000 1.1.1.2
+++ fcc_enet.c 10 Apr 2002 15:03:55 -0000 1.2
@@ -1,4 +1,7 @@
/*
+ * BK Id: SCCS/s.fcc_enet.c 1.7 05/17/01 18:14:20 cort
+ */
+/*
* Fast Ethernet Controller (FCC) driver for Motorola MPC8260.
* Copyright (c) 2000 MontaVista Software, Inc. Dan Malek (dm...@jl...)
*
Index: uart.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/8260_io/uart.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- uart.c 25 Feb 2001 23:15:18 -0000 1.1.1.2
+++ uart.c 10 Apr 2002 15:03:55 -0000 1.2
@@ -1,4 +1,7 @@
/*
+ * BK Id: SCCS/s.uart.c 1.6 05/17/01 18:14:20 cort
+ */
+/*
* UART driver for MPC8260 CPM SCC or SMC
* Copyright (c) 1999 Dan Malek (dm...@jl...)
* Copyright (c) 2000 MontaVista Software, Inc. (so...@mv...)
|
