Rename commproc to cpm1 and cpm2_common.c to cpm2.c
PATCH 1/1 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 | 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_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/cpm_uart/cpm_uart_cpm1.h | 2 +-
include/asm-powerpc/{commproc.h => cpm1.h} | 8 ++++----
include/asm-ppc/{commproc.h => cpm1.h} | 8 ++++----
28 files changed, 38 insertions(+), 38 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%)arch/powerpc/platforms/8xx/ep88xc.c +1 -0
@@ -16,6 +16,7 @@#include <asm/io.h> #include <asm/udbg.h> #include <asm/commproc.h> +#include <asm/cpm1.h> #include "mpc8xx.h"
arch/powerpc/platforms/8xx/mpc86xads_setup.c +1 -1
@@ -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>
arch/powerpc/platforms/8xx/mpc885ads_setup.c +1 -1
@@ -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 +2 -2
@@ -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
arch/powerpc/sysdev/cpm1.c renamed from arch/powerpc/sysdev/commproc.c +2 -2
@@ -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
arch/powerpc/sysdev/cpm2.c renamed from arch/powerpc/sysdev/cpm2_common.c +1 -2
@@ -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 ; }
arch/powerpc/sysdev/micropatch.c +1 -1
@@ -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
@@ -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 +1 -1
@@ -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 +3 -3
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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_8xx/fec_8xx-netta.c +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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/serial/cpm_uart/cpm_uart_cpm1.h +1 -1
@@ -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/cpm1.h renamed from include/asm-powerpc/commproc.h +4 -4
@@ -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__ */
include/asm-ppc/cpm1.h renamed from include/asm-ppc/commproc.h +4 -4
@@ -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__ */
Signature · 1 line
1.5.3.8
Kumar Gala
AppliedQuoted 31 lines · Jochen Friedrich
Rename commproc.[ch] to cpm1.[ch] to be more consistent with cpm2. Also rename
cpm2_common.ctocpm2.cas suggested by Scott Wood. Adjust the includes accordingly.Signed-off-by Jochen Friedrich <[email protected]>--- 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_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 +-
Quoted 9 lines
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 ++++----
28 files changed, 38 insertions(+), 38 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%)applied.
- k