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.

---

arch/powerpc/platforms/8xx/ep88xc.c           |    1 +
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 => cpm1.c}    |    4 ++--
arch/powerpc/sysdev/{cpm2_common.c => cpm2.c} |    3 +--
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                             |    8 --------
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 => cpm1.h}    |    8 ++++----
include/asm-ppc/{commproc.h => cpm1.h}        |    8 ++++----
31 files changed, 40 insertions(+), 48 deletions(-)

rename arch/powerpc/sysdev/{commproc.c => cpm1.c} (99%) rename arch/powerpc/sysdev/{cpm2_common.c => cpm2.c} (99%) rename include/asm-powerpc/{commproc.h => cpm1.h} (99%) rename include/asm-ppc/{commproc.h => cpm1.h} (99%)

index 4897eda..a8dffa0 100644
@@ -16,6 +16,7 @@

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

#include "mpc8xx.h"

index c0dda53..c028a5b 100644
@@ -22,7 +22,7 @@

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

index 3be115e..6e7ded0 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>

index f17e7b8..928d75b 100644
@@ -36,8 +36,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

similarity index 99%
rename from arch/powerpc/sysdev/commproc.c
rename to arch/powerpc/sysdev/cpm1.c
index ef82587..df8bd2b 100644
@@ -33,7 +33,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>
@@ -290,7 +290,7 @@ cpm_setbrg(uint brg, uint rate)

		out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
	else
		out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) |

- CPM_BRG_EN | CPM_BRG_DIV16);
+ CPM_BRG_EN | CPM_BRG_DIV16);
}

#ifndef CONFIG_PPC_CPM_NEW_BINDING

similarity index 99%
rename from arch/powerpc/sysdev/cpm2_common.c
rename to arch/powerpc/sysdev/cpm2.c
index f7188e2..7be7112 100644
@@ -153,8 +153,7 @@ cpm2_fastbrg(uint brg, uint rate, int div16)
 

	if (brg < 4) {
		bp = cpm2_map_size(im_brgc1, 16);
-	}
-	else {
+	} else {
		bp = cpm2_map_size(im_brgc5, 16);
		brg -= 4;
	}

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.

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

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>

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

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

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.

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.

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)

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);

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>

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[];

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>

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);

index 0fbf1bb..7727cf5 100644
@@ -49,17 +49,9 @@

#include <asm/pgtable.h>
#include <asm/cacheflush.h>

-#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \
-    defined(CONFIG_M5272) || defined(CONFIG_M528x) || \
-    defined(CONFIG_M520x) || defined(CONFIG_M532x)

#include <asm/coldfire.h>
#include <asm/mcfsim.h>
#include "fec.h"
-#else
-#include <asm/8xx_immap.h>
-#include <asm/mpc8xx.h>
-#include "commproc.h"
-#endif

#if defined(CONFIG_FEC2)
#define FEC_MAX_PORTS 2

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 */

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"

index ab9637a..ca8d2e8 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"

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>

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

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;

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

index fe3d8a6..d7ca319 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

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

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

similarity index 99%
rename from include/asm-powerpc/commproc.h
rename to include/asm-powerpc/cpm1.h
index ec87b8f..901a00b 100644
@@ -14,8 +14,8 @@
 * IDMA1 space.  The remaining DP RAM is available for buffer descriptors
 * or other use.
 */
-#ifndef __CPM_8XX__
-#define __CPM_8XX__
+#ifndef __CPM1__
+#define __CPM1__
 

#include <asm/8xx_immap.h>
#include <asm/ptrace.h>
@@ -82,7 +82,7 @@ extern int cpm_dpfree(unsigned long offset);
extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); extern void cpm_dpdump(void);
extern void *cpm_dpram_addr(unsigned long offset);
-extern uint cpm_dpram_phys(u8* addr);
+extern uint cpm_dpram_phys(u8 *addr);
#endif

extern void cpm_setbrg(uint brg, uint rate);
@@ -747,4 +747,4 @@ enum cpm_clk {

int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode);

-#endif /* __CPM_8XX__ */
+#endif /* __CPM1__ */

similarity index 99%
rename from include/asm-ppc/commproc.h
rename to include/asm-ppc/cpm1.h
index 5418d6d..03035ac 100644
@@ -14,8 +14,8 @@
 * IDMA1 space.  The remaining DP RAM is available for buffer descriptors
 * or other use.
 */
-#ifndef __CPM_8XX__
-#define __CPM_8XX__
+#ifndef __CPM1__
+#define __CPM1__
 

#include <asm/8xx_immap.h>
#include <asm/ptrace.h>
@@ -72,7 +72,7 @@ extern int cpm_dpfree(unsigned long offset);
extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); extern void cpm_dpdump(void);
extern void *cpm_dpram_addr(unsigned long offset);
-extern uint cpm_dpram_phys(u8* addr);
+extern uint cpm_dpram_phys(u8 *addr);
extern void cpm_setbrg(uint brg, uint rate);

extern void cpm_load_patch(volatile immap_t *immr);
@@ -685,4 +685,4 @@ typedef struct risc_timer_pram {
extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); extern void cpm_free_handler(int vec);

-#endif /* __CPM_8XX__ */
+#endif /* __CPM1__ */

1.5.3.8

All of these files seem reasonable.

asm-m68knommu/commproc.h ?? these are only built on coldfire.

these seem ok.

I think this is using asm-m68knommu/commproc.h

Also, CC jgarizk since we will be touching netdev drivers. We've been pushing such updates via the powerpc tree's but its good that Jeff's aware.

- k

Hi Kumar,

Yes. Here I just removed dead code (commented out using #ifdef on coldfire). Apparently the driver was used on MPC8xx before or was copied from there but never cleaned up? Maybe this should be a seperate patch?

Oops, that one slipped through :-/.

Thanks,
Jochen