Commit fecc436a authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/include: Remove mpc8260.h and m82xx_pci.h 



SIU_INT_IRQ1 is not used anywhere and __IO_BASE is defined in
asm/io.h

Remove m82xx_pci.h

Then the only thing remaining in mpc8260.h is MPC82XX_BCR_PLDP

Move MPC82XX_BCR_PLDP into asm/cpm2.h then remove mpc8260.h

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/afe23bf3624c389ff17e9789884c78c124b7b202.1691474658.git.christophe.leroy@csgroup.eu
parent e6e077cb

arch/powerpc/include/asm/cpm2.h

+3 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,9 @@ typedef struct im_idma { 
#define FCC2_MEM_OFFSET FCC_MEM_OFFSET(1)

#define FCC3_MEM_OFFSET FCC_MEM_OFFSET(2)



/* Pipeline Maximum Depth */

#define MPC82XX_BCR_PLDP 0x00800000



/* Clocks and GRG's */



enum cpm_clk_dir {

arch/powerpc/include/asm/fs_pd.h

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#ifdef CONFIG_CPM2

#include <asm/cpm2.h>



#if defined(CONFIG_8260)

#include <asm/mpc8260.h>

#endif



#define cpm2_map(member) (&cpm2_immr->member)

#define cpm2_map_size(member, size) (&cpm2_immr->member)

#define cpm2_unmap(addr) do {} while(0)

arch/powerpc/include/asm/mpc8260.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Since there are many different boards and no standard configuration,

 * we have a unique include file for each.  Rather than change every

 * file that has to include MPC8260 configuration, they all include

 * this one and the configuration switching is done here.

 */

#ifdef __KERNEL__

#ifndef __ASM_POWERPC_MPC8260_H__

#define __ASM_POWERPC_MPC8260_H__



#define MPC82XX_BCR_PLDP 0x00800000 /* Pipeline Maximum Depth */



#ifdef CONFIG_8260



#ifdef CONFIG_PCI_8260

#include <platforms/82xx/m82xx_pci.h>

#endif



#endif /* CONFIG_8260 */

#endif /* !__ASM_POWERPC_MPC8260_H__ */

#endif /* __KERNEL__ */

arch/powerpc/platforms/82xx/ep8248e.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <asm/udbg.h>

#include <asm/machdep.h>

#include <asm/time.h>

#include <asm/mpc8260.h>



#include <sysdev/fsl_soc.h>

#include <sysdev/cpm2_pic.h>

arch/powerpc/platforms/82xx/km82xx.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <asm/udbg.h>

#include <asm/machdep.h>

#include <linux/time.h>

#include <asm/mpc8260.h>



#include <sysdev/fsl_soc.h>

#include <sysdev/cpm2_pic.h>