Commit c30aa8fd authored by Pali Rohár's avatar Pali Rohár Committed by Michael Ellerman
Browse files

powerpc/85xx: p2020: Move all P2020 RDB machine descriptions to p2020.c 



This moves P2020 RDB machine descriptions into new p2020.c source file.
This is preparation for code de-duplication and providing one unified
machine description for all P2020 boards.

Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230408140122.25293-9-pali@kernel.org
parent ba5a7ca2

arch/powerpc/platforms/85xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o 
obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o

obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o p2020.o

obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o

obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o

obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o p2020.o

obj-$(CONFIG_P1010_RDB)   += p1010rdb.o

obj-$(CONFIG_P1022_DS)    += p1022_ds.o

obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o

arch/powerpc/platforms/85xx/mpc85xx.h

+2 −0
Original line number Diff line number Diff line
@@ -17,5 +17,7 @@ static inline void __init mpc85xx_qe_par_io_init(void) {} 


void __init mpc85xx_ds_pic_init(void);

void __init mpc85xx_ds_setup_arch(void);

void __init mpc85xx_rdb_setup_arch(void);

void __init mpc85xx_rdb_pic_init(void);



#endif

arch/powerpc/platforms/85xx/mpc85xx_rdb.c

+1 −29
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void __init mpc85xx_rdb_pic_init(void) 
/*

 * Setup the architecture

 */

static void __init mpc85xx_rdb_setup_arch(void)

void __init mpc85xx_rdb_setup_arch(void)

{

	if (ppc_md.progress)

		ppc_md.progress("mpc85xx_rdb_setup_arch()", 0);
@@ -93,8 +93,6 @@ static void __init mpc85xx_rdb_setup_arch(void) 
	pr_info("MPC85xx RDB board from Freescale Semiconductor\n");

}



machine_arch_initcall(p2020_rdb, mpc85xx_common_publish_devices);

machine_arch_initcall(p2020_rdb_pc, mpc85xx_common_publish_devices);

machine_arch_initcall(p1020_mbg_pc, mpc85xx_common_publish_devices);

machine_arch_initcall(p1020_rdb, mpc85xx_common_publish_devices);

machine_arch_initcall(p1020_rdb_pc, mpc85xx_common_publish_devices);
@@ -104,19 +102,6 @@ machine_arch_initcall(p1021_rdb_pc, mpc85xx_common_publish_devices); 
machine_arch_initcall(p1025_rdb, mpc85xx_common_publish_devices);

machine_arch_initcall(p1024_rdb, mpc85xx_common_publish_devices);



define_machine(p2020_rdb) {

	.name			= "P2020 RDB",

	.compatible		= "fsl,P2020RDB",

	.setup_arch		= mpc85xx_rdb_setup_arch,

	.init_IRQ		= mpc85xx_rdb_pic_init,

#ifdef CONFIG_PCI

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

	.pcibios_fixup_phb      = fsl_pcibios_fixup_phb,

#endif

	.get_irq		= mpic_get_irq,

	.progress		= udbg_progress,

};



define_machine(p1020_rdb) {

	.name			= "P1020 RDB",

	.compatible		= "fsl,P1020RDB",
@@ -143,19 +128,6 @@ define_machine(p1021_rdb_pc) { 
	.progress		= udbg_progress,

};



define_machine(p2020_rdb_pc) {

	.name			= "P2020RDB-PC",

	.compatible		= "fsl,P2020RDB-PC",

	.setup_arch		= mpc85xx_rdb_setup_arch,

	.init_IRQ		= mpc85xx_rdb_pic_init,

#ifdef CONFIG_PCI

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

	.pcibios_fixup_phb      = fsl_pcibios_fixup_phb,

#endif

	.get_irq		= mpic_get_irq,

	.progress		= udbg_progress,

};



define_machine(p1025_rdb) {

	.name			= "P1025 RDB",

	.compatible		= "fsl,P1025RDB",

arch/powerpc/platforms/85xx/p2020.c

+33 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
machine_arch_initcall(p2020_ds, mpc85xx_common_publish_devices);

#endif /* CONFIG_MPC85xx_DS */



#ifdef CONFIG_MPC85xx_RDB

machine_arch_initcall(p2020_rdb, mpc85xx_common_publish_devices);

machine_arch_initcall(p2020_rdb_pc, mpc85xx_common_publish_devices);

#endif /* CONFIG_MPC85xx_RDB */



#ifdef CONFIG_MPC85xx_DS

define_machine(p2020_ds) {

	.name			= "P2020 DS",
@@ -39,3 +44,31 @@ define_machine(p2020_ds) { 
	.progress		= udbg_progress,

};

#endif /* CONFIG_MPC85xx_DS */



#ifdef CONFIG_MPC85xx_RDB

define_machine(p2020_rdb) {

	.name			= "P2020 RDB",

	.compatible		= "fsl,P2020RDB",

	.setup_arch		= mpc85xx_rdb_setup_arch,

	.init_IRQ		= mpc85xx_rdb_pic_init,

#ifdef CONFIG_PCI

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

	.pcibios_fixup_phb	= fsl_pcibios_fixup_phb,

#endif

	.get_irq		= mpic_get_irq,

	.progress		= udbg_progress,

};



define_machine(p2020_rdb_pc) {

	.name			= "P2020RDB-PC",

	.compatible		= "fsl,P2020RDB-PC",

	.setup_arch		= mpc85xx_rdb_setup_arch,

	.init_IRQ		= mpc85xx_rdb_pic_init,

#ifdef CONFIG_PCI

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

	.pcibios_fixup_phb	= fsl_pcibios_fixup_phb,

#endif

	.get_irq		= mpic_get_irq,

	.progress		= udbg_progress,

};

#endif /* CONFIG_MPC85xx_RDB */