From patchwork Wed Aug 15 08:57:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 1324791 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id ECD30DFFED for ; Wed, 15 Aug 2012 09:00:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T1ZPl-0002U7-7D; Wed, 15 Aug 2012 08:57:21 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T1ZPg-0002Sd-RB for linux-arm-kernel@lists.infradead.org; Wed, 15 Aug 2012 08:57:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:Content-Type:MIME-Version:Message-ID:Subject:To:From:Date; bh=us7pN2F23Amp/cTzSiHhwyPXkM5MU+kMGlYVvVunVbc=; b=VMM27qGzFM6cdNGvUFDtvbFI9/gUFD+xpMShHa/nYwKIJeNALmmdt78YCCv9x03NA4UlVQjk7YLeVxEO0mfCMWcB0bbphKzqy/GZfb01AMtBCrlfoHLfiyHzysiQkzgxygqPXm12mNqSX1MVHlzt0xUbepM5vyKcF6KrGoitvyQ=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:48899) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1T1ZPa-0005hI-N9; Wed, 15 Aug 2012 09:57:11 +0100 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1T1ZPZ-00071f-Pd; Wed, 15 Aug 2012 09:57:09 +0100 Date: Wed, 15 Aug 2012 09:57:09 +0100 From: Russell King - ARM Linux To: Jason Cooper , Andrew Lunn , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: Dove: allow PCI to be disabled Message-ID: <20120815085709.GI18957@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Allow PCI support for Dove to be disabled. Some platforms do not have anything connected to the PCIe ports, so requiring PCI support to be built into the kernel just wastes space, and presents a lot more config options than are necessary. However, select USB_ARCH_HAS_EHCI so that we can still have EHCI support. Signed-off-by: Russell King --- arch/arm/Kconfig | 3 ++- arch/arm/mach-dove/Makefile | 3 ++- arch/arm/mach-dove/common.h | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 27f5b2c..344d40e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -536,14 +536,15 @@ config ARCH_IXP4XX config ARCH_DOVE bool "Marvell Dove" select CPU_V7 - select PCI select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS + select MIGHT_HAVE_PCI select NEED_MACH_IO_H select PLAT_ORION select CLKDEV_LOOKUP select NEED_MACH_MEMORY_H select COMMON_CLK + select USB_ARCH_HAS_EHCI help Support for the Marvell Dove SoC 88AP510 diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index 7d89269..b5a5773 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -1,4 +1,5 @@ -obj-y += common.o addr-map.o irq.o pcie.o mpp.o clock.o dump_cp15_regs.o +obj-y += common.o addr-map.o irq.o mpp.o clock.o dump_cp15_regs.o +obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o obj-$(CONFIG_MACH_CM_A510) += cm-a510.o diff --git a/arch/arm/mach-dove/common.h b/arch/arm/mach-dove/common.h index 2ea271d..17404a0 100644 --- a/arch/arm/mach-dove/common.h +++ b/arch/arm/mach-dove/common.h @@ -29,7 +29,11 @@ void dove_setup_cpu_mbus(void); void dove_ge00_init(struct mv643xx_eth_platform_data *eth_data); void dove_hwmon_init(void); void dove_sata_init(struct mv_sata_platform_data *sata_data); +#ifdef CONfig_PCI void dove_pcie_init(int init_port0, int init_port1); +#else +static inline void dove_pcie_init(int init_port0, int init_port1) { } +#endif void dove_ehci0_init(void); void dove_ehci1_init(void); void dove_uart0_init(void);