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: 210851 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 80D692C0864 for ; Thu, 10 Jan 2013 07:45:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934248Ab3AIUo0 (ORCPT ); Wed, 9 Jan 2013 15:44:26 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:61282 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934120Ab3AIUns (ORCPT ); Wed, 9 Jan 2013 15:43:48 -0500 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 Cc: Grant Likely , Rob Herring , Russell King , Stephen Warren , Bjorn Helgaas , Andrew Murray , Jason Gunthorpe , Arnd Bergmann , Thomas Petazzoni , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@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 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.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 }, };