Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76f42fe8 authored by Jonas Gorski's avatar Jonas Gorski Committed by Ralf Baechle
Browse files

MIPS: BCM63XX: Move the PCI initialization into its own function 



Also make the cpu check a bit more explicit.

Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Maxime Bizon <mbizon@freebox.fr>
Cc: Florian Fainelli <florian@openwrt.org>
Cc: Kevin Cernekee <cernekee@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/3953/


Reviewed-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e5766aea

arch/mips/pci/pci-bcm63xx.c

+17 −8
Original line number Diff line number Diff line
@@ -94,17 +94,10 @@ static void bcm63xx_int_cfg_writel(u32 val, u32 reg) 


void __iomem *pci_iospace_start;



static int __init bcm63xx_pci_init(void)

static int __init bcm63xx_register_pci(void)

{

	unsigned int mem_size;

	u32 val;



	if (!BCMCPU_IS_6348() && !BCMCPU_IS_6358() && !BCMCPU_IS_6368())

		return -ENODEV;



	if (!bcm63xx_pci_enabled)

		return -ENODEV;



	/*

	 * configuration  access are  done through  IO space,  remap 4

	 * first bytes to access it from CPU.
@@ -221,4 +214,20 @@ static int __init bcm63xx_pci_init(void) 
	return 0;

}





static int __init bcm63xx_pci_init(void)

{

	if (!bcm63xx_pci_enabled)

		return -ENODEV;



	switch (bcm63xx_get_cpu_id()) {

	case BCM6348_CPU_ID:

	case BCM6358_CPU_ID:

	case BCM6368_CPU_ID:

		return bcm63xx_register_pci();

	default:

		return -ENODEV;

	}

}



arch_initcall(bcm63xx_pci_init);