From patchwork Sat Jun 15 20:32:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 251638 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 C2B592C007B for ; Sun, 16 Jun 2013 06:33:22 +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 1Unx9r-0007Z7-Kd; Sat, 15 Jun 2013 20:33:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Unx9p-0002UP-38; Sat, 15 Jun 2013 20:33:09 +0000 Received: from mail-ob0-x22f.google.com ([2607:f8b0:4003:c01::22f]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Unx9m-0002Ti-UG for linux-arm-kernel@lists.infradead.org; Sat, 15 Jun 2013 20:33:08 +0000 Received: by mail-ob0-f175.google.com with SMTP id xn12so1841381obc.6 for ; Sat, 15 Jun 2013 13:32:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=tQJBHcC8dp7FE+/rMQfvPkPJfiVMy8VLsR5ads80h2c=; b=gLy5YcsYQtCrKFhodDGTiqE8gQ9tq8Ypr7oCOFegCGAUJKTN/1QtHupuC3Xr/Ci/9e 6G6IM7jYhk1WD1Wp26CzpzwXSGWiF7J7zFOalptag2/Z0sROQ9Hz6Hq1e1Y59Lao9rDC tiN1kqxTZgo1ezIAPiq/fDJ5UGuhpCdK6+tyvyFXy7fONrcmHdaRMpE07lqCvKmN7bkN rOeqU8GCnZ5TfGt0LQj6nvHMSNjK+Owy7NJTLqSClRhDllKx/ZC6FpuoSJKSmgbscVlw 2YuV/eAYJQKAB8w+3+z8LRmjzssTOQG46VtO888dTGOrNAtdWPoHswWPA3J+7PxCDVUm AvCA== MIME-Version: 1.0 X-Received: by 10.60.60.196 with SMTP id j4mr4931141oer.37.1371328365246; Sat, 15 Jun 2013 13:32:45 -0700 (PDT) Received: by 10.182.120.7 with HTTP; Sat, 15 Jun 2013 13:32:45 -0700 (PDT) In-Reply-To: <20130615000922.GG18124@quad.lixom.net> References: <20130614230838.GA18124@quad.lixom.net> <20130615000922.GG18124@quad.lixom.net> Date: Sat, 15 Jun 2013 22:32:45 +0200 Message-ID: Subject: Re: [GIT PULL] Integrator/AP PCI DT support From: Linus Walleij To: Olof Johansson X-Gm-Message-State: ALoCoQkfplG5luZ/yjPobuZOtugRkJGq8qojTv6qiUD+0lcqHR3bPTW29iYRsoFg1XLcLvaw4VuU X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130615_163307_048711_1EF2EB91 X-CRM114-Status: GOOD ( 25.30 ) 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: "arm@kernel.org" , "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 On Sat, Jun 15, 2013 at 2:09 AM, Olof Johansson wrote: > On Fri, Jun 14, 2013 at 04:08:38PM -0700, Olof Johansson wrote: >> On Mon, Jun 03, 2013 at 01:09:17PM +0200, Linus Walleij wrote: >> > 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 >> >> Pulled, apologies for the delay on this one, fell of my list of >> branches-to-pull somehow. > > Hmm. integrator_defconfig no longer builds: > > arch/arm/mach-integrator/pci_v3.c: In function 'pci_v3_map_irq_dt': > arch/arm/mach-integrator/pci_v3.c:835:16: error: storage size of 'oirq' isn't known > arch/arm/mach-integrator/pci_v3.c:845:2: error: implicit declaration of function 'irq_create_of_mapping' > > linux/of_irq.h is already included, but it seems that CONFIG_USE_OF is off in > integrator defconfig. Grrr what is wrong with me. OK I sent out a revised version of the DT enablement patch that adds some #ifdef. I also squashed the IRQ enablement into the main DT enablement patch. It now compiles nicely with and without ATAGs. > What's the plan here? Making DT mandatory? Or making PCI depend on DT for this > platform? I have a branch that selects USE_OF for the integrator and *deletes* the ATAG boot path. I will rebase that on top of this and send out ASAP, maybe you can even get those quite nice yet simple cleanups in for this merge window then, as a stepping stone to multiplatform. > I've dropped the branch again until resolved. OK here is the fixed branch, using the v3 patch of DT enablement just posted to the list, please pull this instead (still the same base): 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 f55b2b56cd37fa8bcfcb75248c27094eaf09e04c: ARM: integrator: basic PCIv3 device tree support (2013-06-15 22:18:39 +0200) ---------------------------------------------------------------- This is a patch series that: - Pulls the Integrator/AP PCI bridge driver into one file - Adds full device tree support for it - Keeps ATAG support around for the time being ---------------------------------------------------------------- Linus Walleij (11): 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 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 | 532 +++++++++++++++++++-- arch/arm/mach-integrator/pci_v3.h | 2 + 13 files changed, 575 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 Yours, Linus Walleij