From patchwork Wed Apr 3 14:45:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 2388121 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E72743FD8C for ; Wed, 3 Apr 2013 14:52:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759356Ab3DCOwB (ORCPT ); Wed, 3 Apr 2013 10:52:01 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:63605 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760264Ab3DCOpo (ORCPT ); Wed, 3 Apr 2013 10:45:44 -0400 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LeWL4-1UyS7t26Vq-00qIFC; Wed, 03 Apr 2013 16:45:28 +0200 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id B685E2A280D0; Wed, 3 Apr 2013 16:45:26 +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 L-jTNYQIhbo3; Wed, 3 Apr 2013 16:45:25 +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 907BA2A28126; 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 0DA23100CE5; 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 10/12] ARM: tegra: harmony: Initialize PCIe from DT Date: Wed, 3 Apr 2013 16:45:16 +0200 Message-Id: <1365000318-28256-11-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:4H3lAOLAouA4fgU1nG5/ANqsB64br7T6/3++Mqp0HQ2 GBxK1YZoWwJprvNuLasQplv9NwgjvSt4XWOXHVATlJVDJZl0UJ KT+Xl4L9g+qo9oc0zJj3owewWv1qQzYTwnM76ANtCQDs795H78 gvfl5aL+Cp9QGOoO49tybTIXpmbFiQAyvPElEO6uiK7B4Ti/bF CNXexrgJOQPkwVSoL15jJDPX68kRK6oO52XlchIauEN+Cqd4iD 3tfUPeTQ/r6uEhhpXmq23taXPF5hmhP56RtkuIp/MAtxOZQ/qB XqEwL4m2+q+LLVbgSz5kSryKpKN1Xwj02+s8b2KE2AXxenfUM3 fK9/MlDVZ2Z2XdXizLo5V/i9vEJ7XgpsF43ArIlJNsnNhHwobc I0OIdvzdgbrPHAV0WikuVSNM1mvaESZgfu0F8BCm3+YHZySCxI NylVl 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 --- arch/arm/boot/dts/tegra20-harmony.dts | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts index 5fb0888..8799d7a 100644 --- a/arch/arm/boot/dts/tegra20-harmony.dts +++ b/arch/arm/boot/dts/tegra20-harmony.dts @@ -334,7 +334,7 @@ regulator-always-on; }; - ldo0 { + pci_clk_reg: ldo0 { regulator-name = "vdd_ldo0,vddio_pex_clk"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -418,6 +418,20 @@ nvidia,invert-interrupt; }; + pcie-controller { + pex-clk-supply = <&pci_clk_reg>; + vdd-supply = <&pci_vdd_reg>; + status = "okay"; + + pci@1,0 { + status = "okay"; + }; + + pci@2,0 { + status = "okay"; + }; + }; + usb@c5000000 { status = "okay"; }; @@ -601,7 +615,7 @@ enable-active-high; }; - regulator@3 { + pci_vdd_reg: regulator@3 { compatible = "regulator-fixed"; reg = <3>; regulator-name = "vdd_1v05"; @@ -609,8 +623,6 @@ regulator-max-microvolt = <1050000>; gpio = <&pmic 2 0>; enable-active-high; - /* Hack until board-harmony-pcie.c is removed */ - status = "disabled"; }; regulator@4 {