[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>
This commit is contained in:
parent
9e8f38b038
commit
49b51545ff
|
@ -17,7 +17,7 @@
|
|||
#include <asm/udbg.h>
|
||||
#include <asm/commproc.h>
|
||||
|
||||
#include <sysdev/commproc.h>
|
||||
#include "mpc8xx.h"
|
||||
|
||||
struct cpm_pin {
|
||||
int port, pin, flags;
|
||||
|
|
|
@ -25,7 +25,8 @@
|
|||
#include <mm/mmu_decl.h>
|
||||
|
||||
#include <sysdev/mpc8xx_pic.h>
|
||||
#include <sysdev/commproc.h>
|
||||
|
||||
#include "mpc8xx.h"
|
||||
|
||||
#ifdef CONFIG_PCMCIA_M8XX
|
||||
struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
|
||||
|
|
|
@ -21,15 +21,13 @@
|
|||
#include <asm/machdep.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/time.h>
|
||||
#include <asm/mpc8xx.h>
|
||||
#include <asm/8xx_immap.h>
|
||||
#include <asm/commproc.h>
|
||||
#include <asm/fs_pd.h>
|
||||
#include <asm/udbg.h>
|
||||
|
||||
#include <sysdev/commproc.h>
|
||||
|
||||
#include "mpc86xads.h"
|
||||
#include "mpc8xx.h"
|
||||
|
||||
struct cpm_pin {
|
||||
int port, pin, flags;
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include <asm/fs_pd.h>
|
||||
#include <asm/udbg.h>
|
||||
|
||||
#include <sysdev/commproc.h>
|
||||
#include "mpc8xx.h"
|
||||
|
||||
static u32 __iomem *bcsr, *bcsr5;
|
||||
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
/*
|
||||
* Prototypes, etc. for the Freescale MPC8xx embedded cpu chips
|
||||
* May need to be cleaned as the port goes on ...
|
||||
*
|
||||
* Copyright (C) 2008 Jochen Friedrich <jochen@scram.de>
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public License
|
||||
* version 2. This program is licensed "as is" without any warranty of any
|
||||
* kind, whether express or implied.
|
||||
*/
|
||||
#ifndef __MPC8xx_H
|
||||
#define __MPC8xx_H
|
||||
|
||||
extern void mpc8xx_restart(char *cmd);
|
||||
extern void mpc8xx_calibrate_decr(void);
|
||||
extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
|
||||
extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
|
||||
extern void mpc8xx_pics_init(void);
|
||||
extern unsigned int mpc8xx_get_irq(void);
|
||||
|
||||
#endif /* __MPC8xx_H */
|
|
@ -30,7 +30,6 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/module.h>
|
||||
#include <asm/mpc8xx.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/8xx_immap.h>
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
#ifndef _POWERPC_SYSDEV_COMMPROC_H
|
||||
#define _POWERPC_SYSDEV_COMMPROC_H
|
||||
|
||||
extern void cpm_reset(void);
|
||||
extern void mpc8xx_restart(char *cmd);
|
||||
extern void mpc8xx_calibrate_decr(void);
|
||||
extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
|
||||
extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
|
||||
extern void mpc8xx_pics_init(void);
|
||||
extern unsigned int mpc8xx_get_irq(void);
|
||||
|
||||
#endif
|
|
@ -10,7 +10,6 @@
|
|||
#include <asm/irq.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/8xx_immap.h>
|
||||
#include <asm/mpc8xx.h>
|
||||
|
||||
#include "mpc8xx_pic.h"
|
||||
|
||||
|
|
|
@ -89,6 +89,8 @@ extern void cpm_setbrg(uint brg, uint rate);
|
|||
|
||||
extern void cpm_load_patch(cpm8xx_t *cp);
|
||||
|
||||
extern void cpm_reset(void);
|
||||
|
||||
/* Buffer descriptors used by many of the CPM protocols.
|
||||
*/
|
||||
typedef struct cpm_buf_desc {
|
||||
|
|
Loading…
Reference in New Issue