From patchwork Fri Aug 9 14:49:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 2841976 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C4DCF9F314 for ; Fri, 9 Aug 2013 14:49:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D55E62034A for ; Fri, 9 Aug 2013 14:49:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBDA320300 for ; Fri, 9 Aug 2013 14:49:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758293Ab3HIOtq (ORCPT ); Fri, 9 Aug 2013 10:49:46 -0400 Received: from mail-bk0-f48.google.com ([209.85.214.48]:40349 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757614Ab3HIOtp (ORCPT ); Fri, 9 Aug 2013 10:49:45 -0400 Received: by mail-bk0-f48.google.com with SMTP id my13so1096135bkb.21 for ; Fri, 09 Aug 2013 07:49:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wUOy2PitijZrOFSU+Ii7WX7ChUYK5JP8dKHhnMmfmPM=; b=hUDLRen/rjmZrgkglk+d5iqGOJKBl0bar6RxTlzpv8NYYq6+EbPQn3IkAHzNH0esz4 YkjHVTjx3sOp1/iwxIR+kO4Q2FaUSfyiw9KY5UvmEtObzSJorbHsSBaSpBlpHHsRxFMx e3Vhce1kLSxsFvD4Y+MxwKYmd38d1x4UKkkEVs+3TYJ+V+rUUqlUZueEah1qiL2VFQHT 3ijxmWUmq233mr8qVUlyEcD73DNffm1zM5xYczvocWYDVCFjDJhDgeN5vAGLoQQ34Bxd 5fLdcWaTCGSW8TqBDEEstwwFYiawC3dNTLNoXdrNrwn60LuDIW0QTPlmb7WdXZ/YP0pj 6Sfw== X-Received: by 10.205.116.11 with SMTP id fg11mr2307702bkc.168.1376059783296; Fri, 09 Aug 2013 07:49:43 -0700 (PDT) Received: from localhost (port-24887.pppoe.wtnet.de. [46.59.158.238]) by mx.google.com with ESMTPSA id da7sm3511632bkb.1.2013.08.09.07.49.42 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 09 Aug 2013 07:49:42 -0700 (PDT) From: Thierry Reding To: Stephen Warren Cc: Bjorn Helgaas , Jason Cooper , linux-tegra@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v6 04/14] ARM: tegra: harmony: Initialize PCIe from DT Date: Fri, 9 Aug 2013 16:49:22 +0200 Message-Id: <1376059772-16669-5-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1376059772-16669-1-git-send-email-treding@nvidia.com> References: <1376059772-16669-1-git-send-email-treding@nvidia.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding 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 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 d9f89cd..8724dc7 100644 --- a/arch/arm/boot/dts/tegra20-harmony.dts +++ b/arch/arm/boot/dts/tegra20-harmony.dts @@ -335,7 +335,7 @@ regulator-always-on; }; - ldo0 { + pci_clk_reg: ldo0 { regulator-name = "vdd_ldo0,vddio_pex_clk"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -425,6 +425,20 @@ nvidia,sys-clock-req-active-high; }; + 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"; }; @@ -643,7 +657,7 @@ enable-active-high; }; - regulator@3 { + pci_vdd_reg: regulator@3 { compatible = "regulator-fixed"; reg = <3>; regulator-name = "vdd_1v05"; @@ -651,8 +665,6 @@ regulator-max-microvolt = <1050000>; gpio = <&pmic 2 GPIO_ACTIVE_HIGH>; enable-active-high; - /* Hack until board-harmony-pcie.c is removed */ - status = "disabled"; }; regulator@4 {