[PATCH 4/4] ARM: convert PCI defines to variables

[Russell King - ARM Linux]

On Tue, Jun 28, 2011 at 05:57:39PM -0500, Rob Herring wrote:
> From: Rob Herring <rob.herring at calxeda.com>
> 
> Convert PCIBIOS_MIN_IO, PCIBIOS_MIN_MEM, and PCIMEM_BASE to variables to allow
> multi-platform builds. This also removes the requirement for a platform to
> have a mach/hardware.h.

Please don't include PCIMEM_BASE in that - move that into asm/vga.h and
call it VGA_BASE because that's really what it is.  There's also the
matter of a definition of a HAS_ symbol...

> diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h
> index 250a4dd..86290df 100644
> --- a/arch/arm/include/asm/vga.h
> +++ b/arch/arm/include/asm/vga.h
> @@ -2,7 +2,7 @@
>  #define ASMARM_VGA_H
>  
>  #include <linux/io.h>
> -#include <mach/hardware.h>
> +#include <asm/pci.h>
>  
>  #define VGA_MAP_MEM(x,s)	(PCIMEM_BASE + (x))
>  

VGA is not dependent on having PCI - there have been ARM platforms which
have VGA without PCI.

> diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
> index b4ea392..de63ca3 100644
> --- a/arch/arm/mach-pxa/include/mach/hardware.h
> +++ b/arch/arm/mach-pxa/include/mach/hardware.h
> @@ -337,8 +337,6 @@ extern unsigned long get_clock_tick_rate(void);
>  #endif
>  
>  #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
> -#define PCIBIOS_MIN_IO		0
> -#define PCIBIOS_MIN_MEM		0
>  #define ARCH_HAS_DMA_SET_COHERENT_MASK
>  #endif
>  

This definitely breaks because ARCH_HAS_DMA_SET_COHERENT_MASK needs to
be picked up by linux/dma-mapping.h.  However, this may already be
broken as there's no clear path where this reliably happens.