iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/85xx: p2020: Unify .setup_arch and .init_IRQ callbacks

Browse Source 
Make just one .setup_arch and one .init_IRQ callback implementation for all
P2020 board code. This deduplicate repeated and same code.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230408140122.25293-11-pali@kernel.org
This commit is contained in:
Pali Rohár 2023-04-08 16:01:19 +02:00 committed by Michael Ellerman
parent 92189c902c
commit 7d8ae6e081
4 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/platforms/85xx/mpc85xx.h
View File

@ -21,9 +21,4 @@ void __init mpc85xx_8259_init(void);
static inline void __init mpc85xx_8259_init(void) {}
#endif
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

4
arch/powerpc/platforms/85xx/mpc85xx_ds.c
View File

@ -34,7 +34,7 @@
#include "mpc85xx.h"
void __init mpc85xx_ds_pic_init(void)
static void __init mpc85xx_ds_pic_init(void)
{
struct mpic *mpic;
int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;
@ -55,7 +55,7 @@ void __init mpc85xx_ds_pic_init(void)
/*
* Setup the architecture
*/
void __init mpc85xx_ds_setup_arch(void)
static void __init mpc85xx_ds_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc85xx_ds_setup_arch()", 0);

4
arch/powerpc/platforms/85xx/mpc85xx_rdb.c
View File

@ -29,7 +29,7 @@
#include "mpc85xx.h"
void __init mpc85xx_rdb_pic_init(void)
static void __init mpc85xx_rdb_pic_init(void)
{
struct mpic *mpic;
int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;
@ -48,7 +48,7 @@ void __init mpc85xx_rdb_pic_init(void)
/*
* Setup the architecture
*/
void __init mpc85xx_rdb_setup_arch(void)
static void __init mpc85xx_rdb_setup_arch(void)
{
if (ppc_md.progress)
ppc_md.progress("mpc85xx_rdb_setup_arch()", 0);

38
arch/powerpc/platforms/85xx/p2020.c
View File

@ -21,6 +21,32 @@
#include "smp.h"
#include "mpc85xx.h"
static void __init p2020_pic_init(void)
{
struct mpic *mpic;
int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;
mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC ");
if (WARN_ON(!mpic))
return;
mpic_init(mpic);
mpc85xx_8259_init();
}
/*
* Setup the architecture
*/
static void __init p2020_setup_arch(void)
{
swiotlb_detect_4g();
fsl_pci_assign_primary();
uli_init();
mpc85xx_smp_init();
mpc85xx_qe_par_io_init();
}
#ifdef CONFIG_MPC85xx_DS
machine_arch_initcall(p2020_ds, mpc85xx_common_publish_devices);
#endif /* CONFIG_MPC85xx_DS */
@ -34,8 +60,8 @@ machine_arch_initcall(p2020_rdb_pc, mpc85xx_common_publish_devices);
define_machine(p2020_ds) {
.name = "P2020 DS",
.compatible = "fsl,P2020DS",
.setup_arch = mpc85xx_ds_setup_arch,
.init_IRQ = mpc85xx_ds_pic_init,
.setup_arch = p2020_setup_arch,
.init_IRQ = p2020_pic_init,
#ifdef CONFIG_PCI
.pcibios_fixup_bus = fsl_pcibios_fixup_bus,
.pcibios_fixup_phb = fsl_pcibios_fixup_phb,
@ -49,8 +75,8 @@ define_machine(p2020_ds) {
define_machine(p2020_rdb) {
.name = "P2020 RDB",
.compatible = "fsl,P2020RDB",
.setup_arch = mpc85xx_rdb_setup_arch,
.init_IRQ = mpc85xx_rdb_pic_init,
.setup_arch = p2020_setup_arch,
.init_IRQ = p2020_pic_init,
#ifdef CONFIG_PCI
.pcibios_fixup_bus = fsl_pcibios_fixup_bus,
.pcibios_fixup_phb = fsl_pcibios_fixup_phb,
@ -62,8 +88,8 @@ define_machine(p2020_rdb) {
define_machine(p2020_rdb_pc) {
.name = "P2020RDB-PC",
.compatible = "fsl,P2020RDB-PC",
.setup_arch = mpc85xx_rdb_setup_arch,
.init_IRQ = mpc85xx_rdb_pic_init,
.setup_arch = p2020_setup_arch,
.init_IRQ = p2020_pic_init,
#ifdef CONFIG_PCI
.pcibios_fixup_bus = fsl_pcibios_fixup_bus,
.pcibios_fixup_phb = fsl_pcibios_fixup_phb,