Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b51545 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Kumar Gala
Browse files

[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: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 9e8f38b0

arch/powerpc/platforms/8xx/ep88xc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/platforms/8xx/m8xx_setup.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/platforms/8xx/mpc86xads_setup.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/platforms/8xx/mpc885ads_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/sysdev/commproc.h→arch/powerpc/platforms/8xx/mpc8xx.h

+21 −0
Original line number Diff line number Diff line 
#ifndef _POWERPC_SYSDEV_COMMPROC_H

#define _POWERPC_SYSDEV_COMMPROC_H

/*

 * 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 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);
@@ -9,4 +18,4 @@ extern void mpc8xx_get_rtc_time(struct rtc_time *tm); 
extern void mpc8xx_pics_init(void);

extern unsigned int mpc8xx_get_irq(void);



#endif
 
#endif /* __MPC8xx_H */