tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[POWERPC] 8xx: Remove sysdev/commproc.h

Move cpm1 specific prototypes to asm/commproc.h and mpc8xx specific
prototypes to asm/mpc8xx.h. Adjust includes accordingly. Remove now
unneeded sysdev/commproc.h.

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 49b51545 9e8f38b0

+28 -20
+1 -1
arch/powerpc/platforms/8xx/ep88xc.c
··· 17 17 #include <asm/udbg.h> 18 18 #include <asm/commproc.h> 19 19 20 - #include <sysdev/commproc.h> 20 + #include "mpc8xx.h" 21 21 22 22 struct cpm_pin { 23 23 int port, pin, flags;
+2 -1
arch/powerpc/platforms/8xx/m8xx_setup.c
··· 25 25 #include <mm/mmu_decl.h> 26 26 27 27 #include <sysdev/mpc8xx_pic.h> 28 - #include <sysdev/commproc.h> 28 + 29 + #include "mpc8xx.h" 29 30 30 31 #ifdef CONFIG_PCMCIA_M8XX 31 32 struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
+1 -3
arch/powerpc/platforms/8xx/mpc86xads_setup.c
··· 21 21 #include <asm/machdep.h> 22 22 #include <asm/system.h> 23 23 #include <asm/time.h> 24 - #include <asm/mpc8xx.h> 25 24 #include <asm/8xx_immap.h> 26 25 #include <asm/commproc.h> 27 26 #include <asm/fs_pd.h> 28 27 #include <asm/udbg.h> 29 28 30 - #include <sysdev/commproc.h> 31 - 32 29 #include "mpc86xads.h" 30 + #include "mpc8xx.h" 33 31 34 32 struct cpm_pin { 35 33 int port, pin, flags;
+1 -1
arch/powerpc/platforms/8xx/mpc885ads_setup.c
··· 40 40 #include <asm/fs_pd.h> 41 41 #include <asm/udbg.h> 42 42 43 - #include <sysdev/commproc.h> 43 + #include "mpc8xx.h" 44 44 45 45 static u32 __iomem *bcsr, *bcsr5; 46 46
+21
arch/powerpc/platforms/8xx/mpc8xx.h
··· 1 + /* 2 + * Prototypes, etc. for the Freescale MPC8xx embedded cpu chips 3 + * May need to be cleaned as the port goes on ... 4 + * 5 + * Copyright (C) 2008 Jochen Friedrich <jochen@scram.de> 6 + * 7 + * This file is licensed under the terms of the GNU General Public License 8 + * version 2. This program is licensed "as is" without any warranty of any 9 + * kind, whether express or implied. 10 + */ 11 + #ifndef __MPC8xx_H 12 + #define __MPC8xx_H 13 + 14 + extern void mpc8xx_restart(char *cmd); 15 + extern void mpc8xx_calibrate_decr(void); 16 + extern int mpc8xx_set_rtc_time(struct rtc_time *tm); 17 + extern void mpc8xx_get_rtc_time(struct rtc_time *tm); 18 + extern void mpc8xx_pics_init(void); 19 + extern unsigned int mpc8xx_get_irq(void); 20 + 21 + #endif /* __MPC8xx_H */
-1
arch/powerpc/sysdev/commproc.c
··· 30 30 #include <linux/interrupt.h> 31 31 #include <linux/irq.h> 32 32 #include <linux/module.h> 33 - #include <asm/mpc8xx.h> 34 33 #include <asm/page.h> 35 34 #include <asm/pgtable.h> 36 35 #include <asm/8xx_immap.h>
-12
arch/powerpc/sysdev/commproc.h
··· 1 - #ifndef _POWERPC_SYSDEV_COMMPROC_H 2 - #define _POWERPC_SYSDEV_COMMPROC_H 3 - 4 - extern void cpm_reset(void); 5 - extern void mpc8xx_restart(char *cmd); 6 - extern void mpc8xx_calibrate_decr(void); 7 - extern int mpc8xx_set_rtc_time(struct rtc_time *tm); 8 - extern void mpc8xx_get_rtc_time(struct rtc_time *tm); 9 - extern void mpc8xx_pics_init(void); 10 - extern unsigned int mpc8xx_get_irq(void); 11 - 12 - #endif
-1
arch/powerpc/sysdev/mpc8xx_pic.c
··· 10 10 #include <asm/irq.h> 11 11 #include <asm/io.h> 12 12 #include <asm/8xx_immap.h> 13 - #include <asm/mpc8xx.h> 14 13 15 14 #include "mpc8xx_pic.h" 16 15
+2
include/asm-powerpc/commproc.h
··· 89 89 90 90 extern void cpm_load_patch(cpm8xx_t *cp); 91 91 92 + extern void cpm_reset(void); 93 + 92 94 /* Buffer descriptors used by many of the CPM protocols. 93 95 */ 94 96 typedef struct cpm_buf_desc {