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

Commit dc8d966b authored by Rob Herring's avatar Rob Herring
Browse files

ARM: pci: make pcibios_assign_all_busses use pci_has_flag 



Convert pcibios_assign_all_busses from a define to inline so platforms can
control this setting.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent b480a4b0

arch/arm/include/asm/pci.h

+6 −0
Original line number Diff line number Diff line
@@ -3,10 +3,16 @@ 


#ifdef __KERNEL__

#include <asm-generic/pci-dma-compat.h>

#include <asm-generic/pci-bridge.h>



#include <asm/mach/pci.h> /* for pci_sys_data */

#include <mach/hardware.h> /* for PCIBIOS_MIN_* */



static inline int pcibios_assign_all_busses(void)

{

	return pci_has_flag(PCI_REASSIGN_ALL_RSRC);

}



#ifdef CONFIG_PCI_DOMAINS

static inline int pci_domain_nr(struct pci_bus *bus)

{

arch/arm/mach-bcmring/include/mach/hardware.h

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#define RAM_SIZE                (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED)

#define RAM_BASE                PAGE_OFFSET



#define pcibios_assign_all_busses()	1



/* Macros to make managing spinlocks a bit more controlled in terms of naming. */

/* See reg_gpio.h, reg_irq.h, arch.c, gpio.c for example usage. */

#if defined(__KERNEL__)

arch/arm/mach-cns3xxx/include/mach/hardware.h

+0 −1
Original line number Diff line number Diff line
@@ -17,6 +17,5 @@ 
/* macro to get at IO space when running virtually */

#define PCIBIOS_MIN_IO		0x00000000

#define PCIBIOS_MIN_MEM		0x00000000

#define pcibios_assign_all_busses()	1



#endif

arch/arm/mach-dove/include/mach/hardware.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 


#include "dove.h"



#define pcibios_assign_all_busses()	1



#define PCIBIOS_MIN_IO			0x1000

#define PCIBIOS_MIN_MEM			0x01000000

#define PCIMEM_BASE			DOVE_PCIE0_MEM_PHYS_BASE

arch/arm/mach-ep93xx/include/mach/hardware.h

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include <mach/ep93xx-regs.h>

#include <mach/platform.h>



#define pcibios_assign_all_busses()	0



/*

 * The EP93xx has two external crystal oscillators.  To generate the

 * required high-frequency clocks, the processor uses two phase-locked-