From patchwork Wed Apr 3 14:45:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 2387861 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 89D1BDFB79 for ; Wed, 3 Apr 2013 14:49:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761463Ab3DCOqA (ORCPT ); Wed, 3 Apr 2013 10:46:00 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:63954 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761496Ab3DCOp4 (ORCPT ); Wed, 3 Apr 2013 10:45:56 -0400 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MSr7l-1UDkSM3ZjB-00RazW; Wed, 03 Apr 2013 16:45:32 +0200 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 0E6072A280D4; Wed, 3 Apr 2013 16:45:31 +0200 (CEST) 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 ivinsi7eyjt2; Wed, 3 Apr 2013 16:45:30 +0200 (CEST) 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 DEFA92A2814B; Wed, 3 Apr 2013 16:45:19 +0200 (CEST) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) by mailman.adnet.avionic-design.de (Postfix) with ESMTP id 197C11003F0; Wed, 3 Apr 2013 16:45:17 +0200 (CEST) From: Thierry Reding To: Grant Likely , Rob Herring , Stephen Warren , Bjorn Helgaas Cc: Russell King , 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-tegra@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v3 11/12] ARM: tegra: trimslice: Initialize PCIe from DT Date: Wed, 3 Apr 2013 16:45:17 +0200 Message-Id: <1365000318-28256-12-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1365000318-28256-1-git-send-email-thierry.reding@avionic-design.de> References: <1365000318-28256-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:trOP8LBb4LNP9JfOnczvJM4gVUGbXQ+YSgPrSfEi+sg UVu4iH7GSrGYPa4HZTOZkGmOYqIPGHrN47iAukLuodJu/kqnWk Z0OPftfcy7sBgGaM7wN/PIwoxAyLV1WuLzsWENt0L3oWPLJFkY q68UbU28VMd97gkjtNkO4rhvVj2zwyf3DOU7v/dHIeauE8QALH eFJ8IOoF9FLUvLxnwEUUS8L73q1qd0aLdhpp5nLbTbqmnb9IKS 0vgdY5kitIidvqQmhwcn97tSvXz5OI8EQSGYx5UMsbs0VIUixT hDXJeaJtfwtSHFeR1MO/9JD5gooLbqALieJPGVlpvgz5WZcI5G 5xYcE1LrSJtxT7qCioNEty0P0HB0VeL8q4FSywIGvtUFKW4EaV 5Se2G0L7Gk8FwKqcg4J7Bjip4aoLOLG+D30ZiXmsLujHhM6hzQ q7uec Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@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 v2: - add missing dummy regulator nodes by Stephen Warren - rename port 0 DT node and disable unused port 1 arch/arm/boot/dts/tegra20-trimslice.dts | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts index 955bf49..dc081c3 100644 --- a/arch/arm/boot/dts/tegra20-trimslice.dts +++ b/arch/arm/boot/dts/tegra20-trimslice.dts @@ -300,6 +300,16 @@ }; }; + pcie-controller { + status = "okay"; + pex-clk-supply = <&pci_clk_reg>; + vdd-supply = <&pci_vdd_reg>; + + pci@1,0 { + status = "okay"; + }; + }; + usb@c5000000 { status = "okay"; nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */ @@ -357,6 +367,24 @@ regulator-max-microvolt = <1800000>; regulator-always-on; }; + + pci_clk_reg: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "pci_clk"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + pci_vdd_reg: regulator@3 { + compatible = "regulator-fixed"; + reg = <3>; + regulator-name = "pci_vdd"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-always-on; + }; }; sound {