Rename commproc to cpm1 and cpm2_common.c to cpm2.c

PATCH Superseded Jochen Friedrich 1 participant 1 message Jan 18, 2008

Subsystems (3)

Network drivers PowerPC Linux for PowerPC embedded PPC8XX and PPC83XX

lore

Share & tools

lore

Jochen Friedrich

author

2008-01-18 14:33 UTC #0 lore raw

PATCH 7/7 Rename commproc to cpm1 and cpm2_common.c to cpm2.c

Rename commproc.[ch] to cpm1.[ch] to be more consistent with cpm2. Also rename cpm2_common.c to cpm2.c as suggested by Scott Wood. Adjust the includes accordingly.

Signed-off-by Jochen Friedrich <[email protected]>

---

arch/powerpc/platforms/8xx/ep88xc.c          |    2 +-
arch/powerpc/platforms/8xx/mpc86xads_setup.c |    2 +-
arch/powerpc/platforms/8xx/mpc885ads_setup.c |    2 +-
arch/powerpc/sysdev/Makefile                 |    4 +-
arch/powerpc/sysdev/commproc.c               |  612 ---------------------
arch/powerpc/sysdev/cpm1.c                   |  612 +++++++++++++++++++++
arch/powerpc/sysdev/cpm2.c                   |  469 ++++++++++++++++
arch/powerpc/sysdev/cpm2_common.c            |  470 ----------------
arch/powerpc/sysdev/micropatch.c             |    2 +-
arch/ppc/8260_io/enet.c                      |    2 +-
arch/ppc/8xx_io/commproc.c                   |    2 +-
arch/ppc/8xx_io/enet.c                       |    6 +-
arch/ppc/8xx_io/fec.c                        |    2 +-
arch/ppc/8xx_io/micropatch.c                 |    2 +-
arch/ppc/boot/simple/iic.c                   |    2 +-
arch/ppc/boot/simple/m8xx_tty.c              |    2 +-
arch/ppc/kernel/ppc_ksyms.c                  |    2 +-
arch/ppc/platforms/mpc866ads_setup.c         |    2 +-
arch/ppc/platforms/mpc885ads_setup.c         |    2 +-
arch/ppc/syslib/mpc8xx_devices.c             |    2 +-
arch/ppc/xmon/start_8xx.c                    |    2 +-
drivers/net/fec.c                            |    2 +-
drivers/net/fec.h                            |    2 +-
drivers/net/fec_8xx/fec_8xx-netta.c          |    2 +-
drivers/net/fec_8xx/fec_main.c               |    2 +-
drivers/net/fec_8xx/fec_mii.c                |    2 +-
drivers/net/fs_enet/fs_enet.h                |    2 +-
drivers/net/fs_enet/mac-fec.c                |    2 +-
drivers/net/fs_enet/mac-scc.c                |    2 +-
drivers/serial/68360serial.c                 |    2 +-
drivers/serial/cpm_uart/cpm_uart_cpm1.h      |    2 +-
include/asm-powerpc/commproc.h               |  750 --------------------------
include/asm-powerpc/cpm1.h                   |  750 ++++++++++++++++++++++++++
include/asm-ppc/commproc.h                   |  688 -----------------------
include/asm-ppc/cpm1.h                       |  688 +++++++++++++++++++++++
35 files changed, 2549 insertions(+), 2550 deletions(-)

delete mode 100644 arch/powerpc/sysdev/commproc.c create mode 100644 arch/powerpc/sysdev/cpm1.c create mode 100644 arch/powerpc/sysdev/cpm2.c delete mode 100644 arch/powerpc/sysdev/cpm2_common.c delete mode 100644 include/asm-powerpc/commproc.h create mode 100644 include/asm-powerpc/cpm1.h delete mode 100644 include/asm-ppc/commproc.h create mode 100644 include/asm-ppc/cpm1.h

arch/powerpc/platforms/8xx/ep88xc.c +0 -0

index 9365f07..d300576 100644
@@ -15,7 +15,7 @@

#include <asm/machdep.h>
#include <asm/io.h>
#include <asm/udbg.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#include <asm/mpc8xx.h>

struct cpm_pin {

arch/powerpc/platforms/8xx/mpc86xads_setup.c +0 -0

index 7389590..a68509d 100644
@@ -23,7 +23,7 @@

#include <asm/time.h>
#include <asm/mpc8xx.h>
#include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#include <asm/fs_pd.h>
#include <asm/udbg.h>

arch/powerpc/platforms/8xx/mpc885ads_setup.c +0 -0

index 426b897..f39447b 100644
@@ -36,7 +36,7 @@

#include <asm/time.h>
#include <asm/mpc8xx.h>
#include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#include <asm/fs_pd.h>
#include <asm/udbg.h>

arch/powerpc/sysdev/Makefile +0 -0

index 9a20ef4..61f2604 100644
@@ -35,8 +35,8 @@ endif

# Temporary hack until we have migrated to asm-powerpc ifeq ($(ARCH),powerpc)
obj-$(CONFIG_CPM) += cpm_common.o
-obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o
+obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
obj-$(CONFIG_PPC_DCR) += dcr.o
-obj-$(CONFIG_8xx) += mpc8xx_pic.o commproc.o
+obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o
obj-$(CONFIG_UCODE_PATCH) += micropatch.o
endif

arch/powerpc/sysdev/commproc.c deleted +0 ~~-612~~

612 lines not on this page · raw message

arch/powerpc/sysdev/cpm1.c new file +612 -0

612 lines not on this page · raw message

arch/powerpc/sysdev/cpm2.c new file +469 -0

469 lines not on this page · raw message

arch/powerpc/sysdev/cpm2_common.c deleted +0 ~~-470~~

470 lines not on this page · raw message

arch/powerpc/sysdev/micropatch.c +0 -0

index 712b10a..d8d6028 100644
@@ -16,7 +16,7 @@

#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

/*
* I2C/SPI relocation patch arrays.

arch/ppc/8260_io/enet.c +1 -1

index 615b658..3ea4db2 100644
@@ -10,7 +10,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 <asm/commproc.h> and the
+ * configuration information is contained in <asm/cpm1.h> and the
 * remainder is here.
 *
 * Buffer descriptors are kept in the CPM dual port RAM, and the frame

arch/ppc/8xx_io/commproc.c +0 -0

index 3f93af8..9d656de 100644
@@ -34,7 +34,7 @@

#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/rheap.h>

arch/ppc/8xx_io/enet.c +1 -1

index eace3bc..c6d047a 100644
@@ -8,7 +8,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 <asm/commproc.h> and the
+ * configuration information is contained in <asm/cpm1.h> and the
 * remainder is here.
 *
 * Buffer descriptors are kept in the CPM dual port RAM, and the frame

@@ -43,7 +43,7 @@

#include <asm/pgtable.h>
#include <asm/mpc8xx.h>
#include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#include <asm/cacheflush.h>

/*
@@ -80,7 +80,7 @@
* programming documents for details unique to your board.
*
* For the TQM8xx(L) modules, there is no control register interface.
- * All functions are directly controlled using I/O pins. See <asm/commproc.h>.
+ * All functions are directly controlled using I/O pins. See <asm/cpm1.h>. */

/* The transmitter timeout

arch/ppc/8xx_io/fec.c +0 -0

index 0288279..11b0aa6 100644
@@ -53,7 +53,7 @@

#include <asm/mpc8xx.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

#ifdef CONFIG_USE_MDIO
/* Forward declarations of some structures to support different PHYs

arch/ppc/8xx_io/micropatch.c +0 -0

index cfad46b..9a5d95d 100644
@@ -16,7 +16,7 @@

#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

/*
* I2C/SPI relocation patch arrays.

arch/ppc/boot/simple/iic.c +0 -0

index e4efd83..5e91489 100644
@@ -5,7 +5,7 @@

#include <linux/types.h>
#include <asm/uaccess.h>
#include <asm/mpc8xx.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

/* IIC functions.

arch/ppc/boot/simple/m8xx_tty.c +0 -0

index ea615d8..f28924e 100644
@@ -11,7 +11,7 @@

#include <linux/types.h>
#include <asm/uaccess.h>
#include <asm/mpc8xx.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

#ifdef CONFIG_MBX
#define MBX_CSR1 ((volatile u_char *)0xfa100000)

arch/ppc/kernel/ppc_ksyms.c +0 -0

index 22494ec..0d53dc3 100644
@@ -45,7 +45,7 @@

#include <asm/dcr.h>

#ifdef CONFIG_8xx
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#endif

extern void transfer_to_handler(void);

arch/ppc/platforms/mpc866ads_setup.c +0 -0

index bf72204..62370f4 100644
@@ -32,7 +32,7 @@

#include <asm/time.h>
#include <asm/ppcboot.h>
#include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#include <asm/ppc_sys.h>
#include <asm/mpc8xx.h>

arch/ppc/platforms/mpc885ads_setup.c +0 -0

index 87deaef..ba06cc0 100644
@@ -31,7 +31,7 @@

#include <asm/time.h>
#include <asm/ppcboot.h>
#include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#include <asm/ppc_sys.h>

extern unsigned char __res[];

arch/ppc/syslib/mpc8xx_devices.c +0 -0

index c05ac87..80804ee 100644
@@ -16,7 +16,7 @@

#include <linux/device.h>
#include <linux/serial_8250.h>
#include <linux/mii.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#include <asm/mpc8xx.h>
#include <asm/irq.h>
#include <asm/ppc_sys.h>

arch/ppc/xmon/start_8xx.c +0 -0

index a48bd59..3097406 100644
@@ -14,7 +14,7 @@

#include <linux/kernel.h>
#include <asm/8xx_immap.h>
#include <asm/mpc8xx.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

extern void xmon_printf(const char *fmt, ...);
extern int xmon_8xx_write(char *str, int nb);

drivers/net/fec.c +0 -0

index 0fbf1bb..0800cce 100644
@@ -58,7 +58,7 @@

#else
#include <asm/8xx_immap.h>
#include <asm/mpc8xx.h>
-#include "commproc.h"
+#include "cpm1.h"
#endif

#if defined(CONFIG_FEC2)

drivers/net/fec.h +0 -0

index 1d42160..bcff463 100644
@@ -111,7 +111,7 @@ typedef struct bufdesc {

/*
- * The following definitions courtesy of commproc.h, which where
+ * The following definitions courtesy of cpm1.h, which where
* Copyright (c) 1997 Dan Malek ([email protected]).
*/
#define BD_SC_EMPTY ((ushort)0x8000) /* Recieve is empty */

drivers/net/fec_8xx/fec_8xx-netta.c +0 -0

index e492eb8..79deee2 100644
@@ -26,7 +26,7 @@

#include <asm/mpc8xx.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

#include "fec_8xx.h"

drivers/net/fec_8xx/fec_main.c +0 -0

index 8d2904f..795e22e 100644
@@ -35,7 +35,7 @@

#include <asm/mpc8xx.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

#include "fec_8xx.h"

drivers/net/fec_8xx/fec_mii.c +0 -0

index e8e10a0..3b6ca29 100644
@@ -34,7 +34,7 @@

#include <asm/mpc8xx.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

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

drivers/net/fs_enet/fs_enet.h +0 -0

index c675e29..e05389c 100644
@@ -12,7 +12,7 @@

#include <asm/fs_pd.h>

#ifdef CONFIG_CPM1
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

struct fec_info {
	fec_t __iomem *fecp;

drivers/net/fs_enet/mac-fec.c +0 -0

index c1fee48..8a311d1 100644
@@ -40,7 +40,7 @@

#include <asm/8xx_immap.h>
#include <asm/pgtable.h>
#include <asm/mpc8xx.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#endif

#ifdef CONFIG_PPC_CPM_NEW_BINDING

drivers/net/fs_enet/mac-scc.c +0 -0

index 1502dbf..d3cda70 100644
@@ -39,7 +39,7 @@

#ifdef CONFIG_8xx
#include <asm/8xx_immap.h>
#include <asm/pgtable.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
#endif

#ifdef CONFIG_PPC_CPM_NEW_BINDING

drivers/serial/68360serial.c +0 -0

index 2aa6bfe..2969ebc 100644
@@ -39,7 +39,7 @@

#include <linux/delay.h>
#include <asm/irq.h>
#include <asm/m68360.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>

#ifdef CONFIG_KGDB

drivers/serial/cpm_uart/cpm_uart_cpm1.h +0 -0

index 9b5465f..ddf46d3 100644
@@ -10,7 +10,7 @@

#ifndef CPM_UART_CPM1_H
#define CPM_UART_CPM1_H

-#include <asm/commproc.h>
+#include <asm/cpm1.h>

/* defines for IRQs */
#ifndef CONFIG_PPC_CPM_NEW_BINDING

include/asm-powerpc/commproc.h deleted +0 ~~-750~~

750 lines not on this page · raw message

include/asm-powerpc/cpm1.h new file +750 -0

69 lines not on this page · raw message

include/asm-ppc/commproc.h deleted +0 ~~-688~~

688 lines not on this page · raw message

include/asm-ppc/cpm1.h new file +688 -0

688 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.5.3.8

Part of the diff is not shown here. View the raw message.