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

Configure Feed

Select the types of activity you want to include in your feed.

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: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/afe23bf3624c389ff17e9789884c78c124b7b202.1691474658.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by
Michael Ellerman
fecc436a e6e077cb

+3 -45
+3
arch/powerpc/include/asm/cpm2.h
··· 1080 1080 #define FCC2_MEM_OFFSET FCC_MEM_OFFSET(1) 1081 1081 #define FCC3_MEM_OFFSET FCC_MEM_OFFSET(2) 1082 1082 1083 + /* Pipeline Maximum Depth */ 1084 + #define MPC82XX_BCR_PLDP 0x00800000 1085 + 1083 1086 /* Clocks and GRG's */ 1084 1087 1085 1088 enum cpm_clk_dir {
-4
arch/powerpc/include/asm/fs_pd.h
··· 17 17 #ifdef CONFIG_CPM2 18 18 #include <asm/cpm2.h> 19 19 20 - #if defined(CONFIG_8260) 21 - #include <asm/mpc8260.h> 22 - #endif 23 - 24 20 #define cpm2_map(member) (&cpm2_immr->member) 25 21 #define cpm2_map_size(member, size) (&cpm2_immr->member) 26 22 #define cpm2_unmap(addr) do {} while(0)
-22
arch/powerpc/include/asm/mpc8260.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* 3 - * Since there are many different boards and no standard configuration, 4 - * we have a unique include file for each. Rather than change every 5 - * file that has to include MPC8260 configuration, they all include 6 - * this one and the configuration switching is done here. 7 - */ 8 - #ifdef __KERNEL__ 9 - #ifndef __ASM_POWERPC_MPC8260_H__ 10 - #define __ASM_POWERPC_MPC8260_H__ 11 - 12 - #define MPC82XX_BCR_PLDP 0x00800000 /* Pipeline Maximum Depth */ 13 - 14 - #ifdef CONFIG_8260 15 - 16 - #ifdef CONFIG_PCI_8260 17 - #include <platforms/82xx/m82xx_pci.h> 18 - #endif 19 - 20 - #endif /* CONFIG_8260 */ 21 - #endif /* !__ASM_POWERPC_MPC8260_H__ */ 22 - #endif /* __KERNEL__ */
-1
arch/powerpc/platforms/82xx/ep8248e.c
··· 20 20 #include <asm/udbg.h> 21 21 #include <asm/machdep.h> 22 22 #include <asm/time.h> 23 - #include <asm/mpc8260.h> 24 23 25 24 #include <sysdev/fsl_soc.h> 26 25 #include <sysdev/cpm2_pic.h>
-1
arch/powerpc/platforms/82xx/km82xx.c
··· 19 19 #include <asm/udbg.h> 20 20 #include <asm/machdep.h> 21 21 #include <linux/time.h> 22 - #include <asm/mpc8260.h> 23 22 24 23 #include <sysdev/fsl_soc.h> 25 24 #include <sysdev/cpm2_pic.h>
-14
arch/powerpc/platforms/82xx/m82xx_pci.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0-or-later */ 2 - #ifndef _PPC_KERNEL_M82XX_PCI_H 3 - #define _PPC_KERNEL_M82XX_PCI_H 4 - 5 - /* 6 - */ 7 - 8 - #define SIU_INT_IRQ1 ((uint)0x13 + CPM_IRQ_OFFSET) 9 - 10 - #ifndef _IO_BASE 11 - #define _IO_BASE isa_io_base 12 - #endif 13 - 14 - #endif /* _PPC_KERNEL_M8260_PCI_H */
-1
arch/powerpc/sysdev/cpm2.c
··· 37 37 38 38 #include <asm/io.h> 39 39 #include <asm/irq.h> 40 - #include <asm/mpc8260.h> 41 40 #include <asm/page.h> 42 41 #include <asm/cpm2.h> 43 42 #include <asm/rheap.h>
-1
arch/powerpc/sysdev/cpm2_pic.c
··· 33 33 #include <linux/irqdomain.h> 34 34 35 35 #include <asm/immap_cpm2.h> 36 - #include <asm/mpc8260.h> 37 36 #include <asm/io.h> 38 37 #include <asm/fs_pd.h> 39 38
-1
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
··· 38 38 #include <linux/pgtable.h> 39 39 40 40 #include <asm/immap_cpm2.h> 41 - #include <asm/mpc8260.h> 42 41 #include <asm/cpm2.h> 43 42 44 43 #include <asm/irq.h>