[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110628234130.GJ21898@n2100.arm.linux.org.uk>
Date: Wed, 29 Jun 2011 00:41:30 +0100
From: Russell King - ARM Linux <linux@....linux.org.uk>
To: Rob Herring <robherring2@...il.com>
Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Michal Simek <monstr@...str.eu>,
Rob Herring <rob.herring@...xeda.com>, nico@...xnic.net
Subject: Re: [PATCH 4/4] ARM: convert PCI defines to variables
On Tue, Jun 28, 2011 at 05:57:39PM -0500, Rob Herring wrote:
> From: Rob Herring <rob.herring@...xeda.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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists