From patchwork Mon Jun 3 11:09:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 248237 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 632732C00A8 for ; Mon, 3 Jun 2013 21:10:13 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjSe1-0000Wi-JO; Mon, 03 Jun 2013 11:09:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjSdy-0004jg-Qf; Mon, 03 Jun 2013 11:09:42 +0000 Received: from mail-oa0-x233.google.com ([2607:f8b0:4003:c02::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjSdv-0004jI-MV for linux-arm-kernel@lists.infradead.org; Mon, 03 Jun 2013 11:09:40 +0000 Received: by mail-oa0-f51.google.com with SMTP id f4so932739oah.24 for ; Mon, 03 Jun 2013 04:09:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type :x-gm-message-state; bh=KVdIRIEt7s3eTiHK3r2eAQ6+OoPvD6l71E6MtLRW3rw=; b=pSes6Y7GbIlO97aqmsfLMyS9oinS6HnBi0eRZHA7d49VDhM2/eYwkVwiXd3goKV3oh mETwlkX653kz+1rZXQtuYdy2Bj96stmuc46ovsqUIUwKJWciU+vNF3ICfp6L8CBDrqF9 KikFrD58GXscftIQi7+Wz1QmT7RvsCiL2dXAEKXcrq9xWLblohx2Ps84nJ/Em3u9SKTX 7FcaqIL86G61xjySANvtCXJs21T//TQ0RtiCJNcqbhmKUGmyQ5GOFNMg//db51cdEyJ0 r6SZrgDh5Uy0deP6bTdjSM/ztTloszk4cwAQD76X8UV3l0mWPL/RwF+zPLRqk2DOC97c 0KkQ== MIME-Version: 1.0 X-Received: by 10.182.40.202 with SMTP id z10mr1396302obk.74.1370257757904; Mon, 03 Jun 2013 04:09:17 -0700 (PDT) Received: by 10.182.38.130 with HTTP; Mon, 3 Jun 2013 04:09:17 -0700 (PDT) Date: Mon, 3 Jun 2013 13:09:17 +0200 Message-ID: Subject: [GIT PULL] Integrator/AP PCI DT support From: Linus Walleij To: "arm@kernel.org" X-Gm-Message-State: ALoCoQl/B/viCqToaSlxzh5Y9wf7a7oAMV6mYh1VjVg2+dmjHgK7B/m3QYj121tnnvx2SO3Gr7jk X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130603_070939_792842_CFD91082 X-CRM114-Status: GOOD ( 15.55 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi ARM SoC folks, here is a pull request for the Integrator/AP PCI DT support. This is the final stepping stone making way for this development TODO: - Preparing removal of the board files for the Integrators - Multiplatform support - Moving the PCIv3 driver to drivers/pci The patches have been around on the lists for a long time now, only waiting for the infrastructure recently added to the ARM SoC tree. As you can see it is based on the of/pci-helpers branch in the ARM SoC tree. I pulled this branch into my tree and rebased the patch set onto this. All is ACKed by Arnd except for the patch adding the function pci_common_init_dev() to arch/arm/include/asm/mach/pci.h. So this will be a good time for anyone who doesn't like that idea to protest in the last minute. Anyway: please pull it in. Yours, Linus Walleij The following changes since commit 4e23d3f505e8acfeac7cc33d4113fbb5a25c3090: of/pci: Add of_pci_parse_bus_range() function (2013-05-19 20:30:10 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-pci-for-arm-soc for you to fetch changes up to 81719809c6fa914e48c4d4e739eb643a40e87034: ARM: integrator: get PCI device IRQs from device tree (2013-06-03 10:00:40 +0200) ---------------------------------------------------------------- This is a patch series that: - Pulls the Integrator/AP PCI bridge driver into one file - Adds full device tree support for it ---------------------------------------------------------------- Linus Walleij (12): Documentation/devicetree: add a small note on PCI ARM: pci: create pci_common_init_dev() ARM: integrator: merge PCIv3 driver into one file ARM: integrator: convert PCIv3 bridge to platform device ARM: integrator: grab PCI error IRQ in probe() ARM: integrator: move PCI base address grab to probe ARM: integrator: move V3 register definitions into driver ARM: integrator: remap PCIv3 base dynamically ARM: integrator: move VGA base assignment ARM: integrator: move static ioremapping into PCIv3 driver ARM: integrator: basic PCIv3 device tree support ARM: integrator: get PCI device IRQs from device tree Documentation/devicetree/bindings/pci/pci.txt | 9 + .../devicetree/bindings/pci/v3-v360epc-pci.txt | 15 + .../devicetree/bindings/vendor-prefixes.txt | 1 + arch/arm/boot/dts/integratorap.dts | 41 ++ arch/arm/include/asm/hardware/pci_v3.h | 186 -------- arch/arm/include/asm/mach/pci.h | 17 +- arch/arm/kernel/bios32.c | 9 +- arch/arm/mach-integrator/Makefile | 2 +- arch/arm/mach-integrator/include/mach/platform.h | 23 - arch/arm/mach-integrator/integrator_ap.c | 31 +- arch/arm/mach-integrator/pci.c | 113 ----- arch/arm/mach-integrator/pci_v3.c | 520 +++++++++++++++++++-- arch/arm/mach-integrator/pci_v3.h | 2 + 13 files changed, 563 insertions(+), 406 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/pci.txt create mode 100644 Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt delete mode 100644 arch/arm/include/asm/hardware/pci_v3.h delete mode 100644 arch/arm/mach-integrator/pci.c create mode 100644 arch/arm/mach-integrator/pci_v3.h