From patchwork Sat Jul 16 01:51:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 104927 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CB30EB6F6F for ; Sat, 16 Jul 2011 11:51:41 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qhu2Y-0000ws-C6; Sat, 16 Jul 2011 01:51:34 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qhu2Y-0003cm-0e; Sat, 16 Jul 2011 01:51:34 +0000 Received: from mail-yi0-f49.google.com ([209.85.218.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qhu2Q-0003cT-FU for linux-arm-kernel@lists.infradead.org; Sat, 16 Jul 2011 01:51:31 +0000 Received: by yib17 with SMTP id 17so874675yib.36 for ; Fri, 15 Jul 2011 18:51:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=J0DSLB31OCOBKuVZtg93vkrPQf6H0muyJsAFlznS3xQ=; b=CGZxI8iSX58/XTFkQPwWI/oBGtPAf4OjqocOB9NyvWeNddjyOQ0+wD29d9AkcASTJr 0ci8CxY0aaOwtCXp9S6FgkrN8kTVvX0EWWNsgOt4x/d3jNabJbuOCITFBgZQmS4wlDFU L7CU0wNB8759T+ddGL+39G40mtQZ7NsGNl/pw= Received: by 10.146.190.7 with SMTP id n7mr3821696yaf.28.1310781080754; Fri, 15 Jul 2011 18:51:20 -0700 (PDT) Received: from [192.168.1.101] (65-36-74-215.dyn.grandenetworks.net [65.36.74.215]) by mx.google.com with ESMTPS id t13sm1836537anl.45.2011.07.15.18.51.18 (version=SSLv3 cipher=OTHER); Fri, 15 Jul 2011 18:51:19 -0700 (PDT) Message-ID: <4E20EE96.6020500@gmail.com> Date: Fri, 15 Jul 2011 20:51:18 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110516 Lightning/1.0b2 Thunderbird/3.1.10 MIME-Version: 1.0 To: Arnd Bergmann Subject: [GIT PULL] ARM: make mach/hardware.h optional X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110715_215128_497340_D0DF6591 X-CRM114-Status: GOOD ( 12.49 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) 0.1 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.218.49 listed in list.dnswl.org] -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 Cc: "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Arnd, Here's the hardware.h clean-up in a git tree if you prefer to pull it. git://git.jdl.com/software/linux-3.0.git for-arm-soc Rob The following changes since commit fe0d42203cb5616eeff68b14576a0f7e2dd56625: Linux 3.0-rc6 (2011-07-04 15:56:24 -0700) are available in the git repository at: git://git.jdl.com/software/linux-3.0.git for-arm-soc Rob Herring (6): powerpc: rename ppc_pci_*_flags to pci_*_flags pci: move microblaze and powerpc pci flag functions into asm-generic ARM: remove unnecessary mach/hardware.h includes ARM: pci: make pcibios_assign_all_busses use pci_has_flag ARM: convert PCI defines to variables ARM: set vga memory base at run-time arch/arm/include/asm/pci.h | 12 ++++- arch/arm/include/asm/vga.h | 5 +- arch/arm/lib/ecard.S | 1 - arch/arm/lib/io-readsw-armv3.S | 1 - arch/arm/lib/io-writesw-armv3.S | 1 - arch/arm/mach-bcmring/include/mach/hardware.h | 2 - arch/arm/mach-cns3xxx/cns3420vb.c | 1 - arch/arm/mach-cns3xxx/include/mach/hardware.h | 22 ------- arch/arm/mach-cns3xxx/pcie.c | 3 + arch/arm/mach-dove/include/mach/hardware.h | 7 -- arch/arm/mach-dove/pcie.c | 3 + arch/arm/mach-ep93xx/include/mach/hardware.h | 2 - arch/arm/mach-footbridge/dc21285.c | 3 + arch/arm/mach-footbridge/include/mach/hardware.h | 5 -- arch/arm/mach-integrator/include/mach/hardware.h | 7 -- arch/arm/mach-integrator/pci_v3.c | 5 ++ arch/arm/mach-iop13xx/include/mach/hardware.h | 7 -- arch/arm/mach-iop13xx/pci.c | 5 +- arch/arm/mach-iop32x/include/mach/hardware.h | 3 - arch/arm/mach-iop33x/include/mach/hardware.h | 3 - arch/arm/mach-ixp2000/include/mach/hardware.h | 8 --- arch/arm/mach-ixp2000/pci.c | 5 ++ arch/arm/mach-ixp23xx/include/mach/hardware.h | 4 - arch/arm/mach-ixp23xx/pci.c | 5 ++ arch/arm/mach-ixp4xx/common-pci.c | 5 ++ arch/arm/mach-ixp4xx/include/mach/hardware.h | 5 -- arch/arm/mach-kirkwood/include/mach/hardware.h | 7 -- arch/arm/mach-kirkwood/pcie.c | 3 + arch/arm/mach-ks8695/include/mach/hardware.h | 9 --- arch/arm/mach-ks8695/pci.c | 3 + arch/arm/mach-mv78xx0/include/mach/hardware.h | 7 -- arch/arm/mach-mv78xx0/pcie.c | 3 + arch/arm/mach-orion5x/include/mach/hardware.h | 7 -- arch/arm/mach-orion5x/pci.c | 2 + arch/arm/mach-pxa/cm-x2xx-pci.c | 3 + arch/arm/mach-pxa/include/mach/hardware.h | 3 - arch/arm/mach-sa1100/include/mach/hardware.h | 8 --- arch/arm/mach-sa1100/pci-nanoengine.c | 3 + arch/arm/mach-shark/include/mach/hardware.h | 6 -- arch/arm/mach-shark/pci.c | 12 +++- arch/arm/mach-tegra/include/mach/hardware.h | 28 --------- arch/arm/mach-tegra/include/mach/system.h | 1 - arch/arm/mach-tegra/io.c | 1 - arch/arm/mach-tegra/pcie.c | 2 + arch/arm/mach-tegra/platsmp.c | 1 - arch/arm/mach-versatile/include/mach/hardware.h | 6 -- arch/arm/mach-versatile/pci.c | 3 + arch/arm/mm/iomap.c | 12 ++++ arch/arm/mm/proc-xsc3.S | 1 - arch/arm/plat-iop/pci.c | 3 + arch/microblaze/include/asm/pci-bridge.h | 67 +++------------------ arch/powerpc/include/asm/pci-bridge.h | 50 +---------------- arch/powerpc/include/asm/pci.h | 2 +- arch/powerpc/kernel/pci-common.c | 22 ++++---- arch/powerpc/kernel/pci_32.c | 2 +- arch/powerpc/kernel/pci_64.c | 4 +- arch/powerpc/kernel/rtas_pci.c | 2 +- arch/powerpc/platforms/40x/ep405.c | 2 +- arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +- arch/powerpc/platforms/40x/walnut.c | 2 +- arch/powerpc/platforms/44x/canyonlands.c | 2 +- arch/powerpc/platforms/44x/ebony.c | 2 +- arch/powerpc/platforms/44x/ppc44x_simple.c | 2 +- arch/powerpc/platforms/44x/sam440ep.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +- arch/powerpc/platforms/82xx/pq2.c | 2 +- arch/powerpc/platforms/chrp/pci.c | 2 +- arch/powerpc/platforms/powermac/pci.c | 6 +- arch/powerpc/sysdev/fsl_pci.c | 4 +- arch/powerpc/sysdev/grackle.c | 2 +- arch/powerpc/sysdev/ppc4xx_pci.c | 2 +- include/asm-generic/pci-bridge.h | 62 ++++++++++++++++++++ 72 files changed, 198 insertions(+), 311 deletions(-) delete mode 100644 arch/arm/mach-cns3xxx/include/mach/hardware.h delete mode 100644 arch/arm/mach-tegra/include/mach/hardware.h create mode 100644 include/asm-generic/pci-bridge.h