tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[POWERPC] CPM: 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 <jochen@scram.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
authored by
Jochen Friedrich
and committed by
Kumar Gala
b5677d84
02753cb6
+38
-38
+1
arch/powerpc/platforms/8xx/ep88xc.c
+1
arch/powerpc/platforms/8xx/ep88xc.c
+1
-1
arch/powerpc/platforms/8xx/mpc86xads_setup.c
+1
-1
arch/powerpc/platforms/8xx/mpc86xads_setup.c
+1
-1
arch/powerpc/platforms/8xx/mpc885ads_setup.c
+1
-1
arch/powerpc/platforms/8xx/mpc885ads_setup.c
+2
-2
arch/powerpc/sysdev/Makefile
+2
-2
arch/powerpc/sysdev/Makefile
···
37
37
# Temporary hack until we have migrated to asm-powerpc
38
38
ifeq ($(ARCH),powerpc)
39
39
obj-$(CONFIG_CPM) += cpm_common.o
40
-
obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o
40
+
obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
41
41
obj-$(CONFIG_PPC_DCR) += dcr.o
42
-
obj-$(CONFIG_8xx) += mpc8xx_pic.o commproc.o
42
+
obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o
43
43
obj-$(CONFIG_UCODE_PATCH) += micropatch.o
44
44
endif
+2
-2
arch/powerpc/sysdev/commproc.c
arch/powerpc/sysdev/cpm1.c
+2
-2
arch/powerpc/sysdev/commproc.c
arch/powerpc/sysdev/cpm1.c
···
33
33
#include <asm/page.h>
34
34
#include <asm/pgtable.h>
35
35
#include <asm/8xx_immap.h>
36
-
#include <asm/commproc.h>
36
+
#include <asm/cpm1.h>
37
37
#include <asm/io.h>
38
38
#include <asm/tlbflush.h>
39
39
#include <asm/rheap.h>
···
290
290
out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
291
291
else
292
292
out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) |
293
-
CPM_BRG_EN | CPM_BRG_DIV16);
293
+
CPM_BRG_EN | CPM_BRG_DIV16);
294
294
}
295
295
296
296
#ifndef CONFIG_PPC_CPM_NEW_BINDING
+1
-2
arch/powerpc/sysdev/cpm2_common.c
arch/powerpc/sysdev/cpm2.c
+1
-2
arch/powerpc/sysdev/cpm2_common.c
arch/powerpc/sysdev/cpm2.c
+1
-1
arch/powerpc/sysdev/micropatch.c
+1
-1
arch/powerpc/sysdev/micropatch.c
+1
-1
arch/ppc/8260_io/enet.c
+1
-1
arch/ppc/8260_io/enet.c
···
10
10
* This version of the driver is somewhat selectable for the different
11
11
* processor/board combinations. It works for the boards I know about
12
12
* now, and should be easily modified to include others. Some of the
13
-
* configuration information is contained in <asm/commproc.h> and the
13
+
* configuration information is contained in <asm/cpm1.h> and the
14
14
* remainder is here.
15
15
*
16
16
* Buffer descriptors are kept in the CPM dual port RAM, and the frame
+1
-1
arch/ppc/8xx_io/commproc.c
+1
-1
arch/ppc/8xx_io/commproc.c
+3
-3
arch/ppc/8xx_io/enet.c
+3
-3
arch/ppc/8xx_io/enet.c
···
8
8
* This version of the driver is somewhat selectable for the different
9
9
* processor/board combinations. It works for the boards I know about
10
10
* now, and should be easily modified to include others. Some of the
11
-
* configuration information is contained in <asm/commproc.h> and the
11
+
* configuration information is contained in <asm/cpm1.h> and the
12
12
* remainder is here.
13
13
*
14
14
* Buffer descriptors are kept in the CPM dual port RAM, and the frame
···
43
43
#include <asm/pgtable.h>
44
44
#include <asm/mpc8xx.h>
45
45
#include <asm/uaccess.h>
46
-
#include <asm/commproc.h>
46
+
#include <asm/cpm1.h>
47
47
#include <asm/cacheflush.h>
48
48
49
49
/*
···
80
80
* programming documents for details unique to your board.
81
81
*
82
82
* For the TQM8xx(L) modules, there is no control register interface.
83
-
* All functions are directly controlled using I/O pins. See <asm/commproc.h>.
83
+
* All functions are directly controlled using I/O pins. See <asm/cpm1.h>.
84
84
*/
85
85
86
86
/* The transmitter timeout
+1
-1
arch/ppc/8xx_io/fec.c
+1
-1
arch/ppc/8xx_io/fec.c
+1
-1
arch/ppc/8xx_io/micropatch.c
+1
-1
arch/ppc/8xx_io/micropatch.c
+1
-1
arch/ppc/boot/simple/iic.c
+1
-1
arch/ppc/boot/simple/iic.c
+1
-1
arch/ppc/boot/simple/m8xx_tty.c
+1
-1
arch/ppc/boot/simple/m8xx_tty.c
+1
-1
arch/ppc/kernel/ppc_ksyms.c
+1
-1
arch/ppc/kernel/ppc_ksyms.c
+1
-1
arch/ppc/platforms/mpc866ads_setup.c
+1
-1
arch/ppc/platforms/mpc866ads_setup.c
+1
-1
arch/ppc/platforms/mpc885ads_setup.c
+1
-1
arch/ppc/platforms/mpc885ads_setup.c
+1
-1
arch/ppc/syslib/mpc8xx_devices.c
+1
-1
arch/ppc/syslib/mpc8xx_devices.c
+1
-1
arch/ppc/xmon/start_8xx.c
+1
-1
arch/ppc/xmon/start_8xx.c
+1
-1
drivers/net/fec_8xx/fec_8xx-netta.c
+1
-1
drivers/net/fec_8xx/fec_8xx-netta.c
+1
-1
drivers/net/fec_8xx/fec_main.c
+1
-1
drivers/net/fec_8xx/fec_main.c
+1
-1
drivers/net/fec_8xx/fec_mii.c
+1
-1
drivers/net/fec_8xx/fec_mii.c
+1
-1
drivers/net/fs_enet/fs_enet.h
+1
-1
drivers/net/fs_enet/fs_enet.h
+1
-1
drivers/net/fs_enet/mac-fec.c
+1
-1
drivers/net/fs_enet/mac-fec.c
+1
-1
drivers/net/fs_enet/mac-scc.c
+1
-1
drivers/net/fs_enet/mac-scc.c
+1
-1
drivers/serial/cpm_uart/cpm_uart_cpm1.h
+1
-1
drivers/serial/cpm_uart/cpm_uart_cpm1.h
+4
-4
include/asm-powerpc/commproc.h
include/asm-powerpc/cpm1.h
+4
-4
include/asm-powerpc/commproc.h
include/asm-powerpc/cpm1.h
···
14
14
* IDMA1 space. The remaining DP RAM is available for buffer descriptors
15
15
* or other use.
16
16
*/
17
-
#ifndef __CPM_8XX__
18
-
#define __CPM_8XX__
17
+
#ifndef __CPM1__
18
+
#define __CPM1__
19
19
20
20
#include <asm/8xx_immap.h>
21
21
#include <asm/ptrace.h>
···
82
82
extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
83
83
extern void cpm_dpdump(void);
84
84
extern void *cpm_dpram_addr(unsigned long offset);
85
-
extern uint cpm_dpram_phys(u8* addr);
85
+
extern uint cpm_dpram_phys(u8 *addr);
86
86
#endif
87
87
88
88
extern void cpm_setbrg(uint brg, uint rate);
···
747
747
748
748
int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode);
749
749
750
-
#endif /* __CPM_8XX__ */
750
+
#endif /* __CPM1__ */
+4
-4
include/asm-ppc/commproc.h
include/asm-ppc/cpm1.h
+4
-4
include/asm-ppc/commproc.h
include/asm-ppc/cpm1.h
···
14
14
* IDMA1 space. The remaining DP RAM is available for buffer descriptors
15
15
* or other use.
16
16
*/
17
-
#ifndef __CPM_8XX__
18
-
#define __CPM_8XX__
17
+
#ifndef __CPM1__
18
+
#define __CPM1__
19
19
20
20
#include <asm/8xx_immap.h>
21
21
#include <asm/ptrace.h>
···
72
72
extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
73
73
extern void cpm_dpdump(void);
74
74
extern void *cpm_dpram_addr(unsigned long offset);
75
-
extern uint cpm_dpram_phys(u8* addr);
75
+
extern uint cpm_dpram_phys(u8 *addr);
76
76
extern void cpm_setbrg(uint brg, uint rate);
77
77
78
78
extern void cpm_load_patch(volatile immap_t *immr);
···
685
685
extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id);
686
686
extern void cpm_free_handler(int vec);
687
687
688
-
#endif /* __CPM_8XX__ */
688
+
#endif /* __CPM1__ */