Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753239Ab1F1Xlv (ORCPT ); Tue, 28 Jun 2011 19:41:51 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:39230 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752414Ab1F1Xlq (ORCPT ); Tue, 28 Jun 2011 19:41:46 -0400 Date: Wed, 29 Jun 2011 00:41:30 +0100 From: Russell King - ARM Linux To: Rob Herring Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Michal Simek , Rob Herring , nico@fluxnic.net Subject: Re: [PATCH 4/4] ARM: convert PCI defines to variables Message-ID: <20110628234130.GJ21898@n2100.arm.linux.org.uk> References: <1309301859-17651-1-git-send-email-robherring2@gmail.com> <1309301859-17651-5-git-send-email-robherring2@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1309301859-17651-5-git-send-email-robherring2@gmail.com> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1867 Lines: 50 On Tue, Jun 28, 2011 at 05:57:39PM -0500, Rob Herring wrote: > From: Rob Herring > > 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 > -#include > +#include > > #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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/