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

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



This moves P2020 DS 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-8-pali@kernel.org
parent b1a54cb6

arch/powerpc/platforms/85xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o 
obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o

obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o

obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o

obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_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_P1010_RDB)   += p1010rdb.o

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

+3 −0
Original line number Diff line number Diff line
@@ -15,4 +15,7 @@ extern void mpc85xx_qe_par_io_init(void); 
static inline void __init mpc85xx_qe_par_io_init(void) {}

#endif



void __init mpc85xx_ds_pic_init(void);

void __init mpc85xx_ds_setup_arch(void);



#endif

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

+1 −15
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void __init mpc85xx_ds_pic_init(void) 
/*

 * Setup the architecture

 */

static void __init mpc85xx_ds_setup_arch(void)

void __init mpc85xx_ds_setup_arch(void)

{

	if (ppc_md.progress)

		ppc_md.progress("mpc85xx_ds_setup_arch()", 0);
@@ -116,7 +116,6 @@ static void __init mpc85xx_ds_setup_arch(void) 


machine_arch_initcall(mpc8544_ds, mpc85xx_common_publish_devices);

machine_arch_initcall(mpc8572_ds, mpc85xx_common_publish_devices);

machine_arch_initcall(p2020_ds, mpc85xx_common_publish_devices);



define_machine(mpc8544_ds) {

	.name			= "MPC8544 DS",
@@ -143,16 +142,3 @@ define_machine(mpc8572_ds) { 
	.get_irq		= mpic_get_irq,

	.progress		= udbg_progress,

};
 


define_machine(p2020_ds) {

	.name			= "P2020 DS",

	.compatible		= "fsl,P2020DS",

	.setup_arch		= mpc85xx_ds_setup_arch,

	.init_IRQ		= mpc85xx_ds_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,

};

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Freescale P2020 board Setup

 *

 * Copyright 2007,2009,2012-2013 Freescale Semiconductor Inc.

 * Copyright 2022-2023 Pali Rohár <pali@kernel.org>

 */



#include <linux/stddef.h>

#include <linux/kernel.h>

#include <linux/of.h>



#include <asm/machdep.h>

#include <asm/udbg.h>

#include <asm/mpic.h>

#include <asm/swiotlb.h>

#include <asm/ppc-pci.h>



#include <sysdev/fsl_pci.h>



#include "smp.h"

#include "mpc85xx.h"



#ifdef CONFIG_MPC85xx_DS

machine_arch_initcall(p2020_ds, mpc85xx_common_publish_devices);

#endif /* CONFIG_MPC85xx_DS */



#ifdef CONFIG_MPC85xx_DS

define_machine(p2020_ds) {

	.name			= "P2020 DS",

	.compatible		= "fsl,P2020DS",

	.setup_arch		= mpc85xx_ds_setup_arch,

	.init_IRQ		= mpc85xx_ds_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_DS */