From patchwork Wed Jan 9 20:43:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1955521 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 46153DFABD for ; Wed, 9 Jan 2013 20:50:47 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tt2Xv-0005Pq-E4; Wed, 09 Jan 2013 20:46:48 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tt2V5-00048G-F8 for linux-arm-kernel@lists.infradead.org; Wed, 09 Jan 2013 20:43:54 +0000 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MWSUM-1TVLT30ITi-00X4gk; Wed, 09 Jan 2013 21:43:27 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 368012A28146; Wed, 9 Jan 2013 21:43:26 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nhLYNObTER2m; Wed, 9 Jan 2013 21:43:25 +0100 (CET) Received: from mailman.adnet.avionic-design.de (mailman.adnet.avionic-design.de [172.20.31.172]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 2732D2A28153; Wed, 9 Jan 2013 21:43:17 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) by mailman.adnet.avionic-design.de (Postfix) with ESMTP id B1C61100800; Wed, 9 Jan 2013 21:43:12 +0100 (CET) From: Thierry Reding To: linux-tegra@vger.kernel.org Subject: [PATCH 14/14] ARM: tegra: trimslice: Initialize PCIe from DT Date: Wed, 9 Jan 2013 21:43:14 +0100 Message-Id: <1357764194-12677-15-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1357764194-12677-1-git-send-email-thierry.reding@avionic-design.de> References: <1357764194-12677-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:QXNWuyRfoCoPMrhKx+Qqs1TtC7knjtIl476g4j89lGH g/JUZWgjeYg7+WDCjWZ8Ylkj7gLQ3cE1Y+Jfh5zYkG+rAd/hqZ mQmkYBUU+LA+xARAwSGRxKfFsTGfutXBRog2aaiBLtlaLng6wo vpM5xh6MDyz4546L+5IVqCZ23yTwvR6eHoE9pIMuAfqFWxy0Vj YhNf5MFrfHAvp/V4OCGEzYaLjTOUqsO0gUv1cDhYfdHaN74cjw xat4J8Ly03F1p0PU1mHBscThTjZvPg1kghK92be+BcN2H/Cbe+ c5okVqCDkx3XfFxLhIpYyJ5tzvc/TZifMhL5zkfh8XCjCNPaJN 6pk/ICWG83mhedKYEE//17zZ9PnzaHOP19xY9vTgBzTfio+rO+ SI3IGHGfFZyshtPDZJhkv1ML6CfMUorCCW2qTjs9AQsqOmZpj4 dQh9z X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130109_154353_209196_061A0830 X-CRM114-Status: GOOD ( 11.83 ) X-Spam-Score: 1.1 (+) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Thomas Petazzoni , Jason Gunthorpe , Russell King , Arnd Bergmann , Stephen Warren , linux-pci@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, Rob Herring , Grant Likely , Bjorn Helgaas , Andrew Murray , linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org With the device tree support in place, probe the PCIe controller from the device tree and remove the corresponding workaround in the board file. Signed-off-by: Thierry Reding --- Changes in v3: - update for new DT binding Changes in v2: - new patch --- arch/arm/boot/dts/tegra20-trimslice.dts | 12 ++++++++++++ arch/arm/mach-tegra/board-dt-tegra20.c | 8 -------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts index 4b6c486..ebb4c17 100644 --- a/arch/arm/boot/dts/tegra20-trimslice.dts +++ b/arch/arm/boot/dts/tegra20-trimslice.dts @@ -301,6 +301,18 @@ }; }; + pcie-controller { + status = "okay"; + + pci@0 { + status = "okay"; + }; + + pci@1 { + status = "okay"; + }; + }; + usb@c5000000 { status = "okay"; nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */ diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 9e8256ab..67090fe 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -145,13 +145,6 @@ static void __init tegra_dt_init(void) tegra20_auxdata_lookup, NULL); } -static void __init trimslice_init(void) -{ -#ifdef CONFIG_TEGRA_PCI - platform_device_register(&tegra_pcie_device); -#endif -} - static void __init paz00_init(void) { tegra_paz00_wifikill_init(); @@ -161,7 +154,6 @@ static struct { char *machine; void (*init)(void); } board_init_funcs[] = { - { "compulab,trimslice", trimslice_init }, { "compal,paz00", paz00_init }, };