From patchwork Thu Jul 25 17:53:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 261849 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 23B4F2C01D1 for ; Fri, 26 Jul 2013 03:58:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757317Ab3GYR6B (ORCPT ); Thu, 25 Jul 2013 13:58:01 -0400 Received: from mail-bk0-f50.google.com ([209.85.214.50]:33230 "EHLO mail-bk0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757141Ab3GYRyR (ORCPT ); Thu, 25 Jul 2013 13:54:17 -0400 Received: by mail-bk0-f50.google.com with SMTP id ik5so814293bkc.37 for ; Thu, 25 Jul 2013 10:54:15 -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:x-mailer:in-reply-to:references; bh=wG22GiUvc66nGEJbjakfNfCAl1IfigmxfQgB0qTEr8w=; b=XcGDsukhSA1zZU4rXqpBv8NAaUVd5fLAZ6Q2h4Ba+SWrsjpeDTKxPPh2w+vy2lNQlQ dysuHHiF5so0HTYne08Mp2+hm6cGQBTPVNL31Un4G7qbygJQDx/BbRd1dkctz4ns8slD 5QRn4+dzLI6OORxEzpIM637ydwQRSB3Pc/YLdhy89EdcfHbrQof6IXSpyBKHPPa0y1C7 s1VQFiDzR9C3Iu9InR0nNFzSveuDn9lYNMVKBSQInopoHAR9cFYLCRBFjjpUjy54w4cb m2+5NYNfsB45wt1zbtA516RJo0K0PPrebQWsT7fFthKtXQY6D43OrDJgZtKTyeRDYdBc h+hw== X-Received: by 10.205.25.9 with SMTP id rg9mr6314669bkb.26.1374774855458; Thu, 25 Jul 2013 10:54:15 -0700 (PDT) Received: from localhost (dotsec.net. [62.75.224.215]) by mx.google.com with ESMTPSA id px7sm11390658bkb.9.2013.07.25.10.54.11 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 25 Jul 2013 10:54:14 -0700 (PDT) From: Thierry Reding To: Bjorn Helgaas , Stephen Warren Cc: Russell King , Jason Cooper , Thomas Petazzoni , Jay Agarwal , linux-pci@vger.kernel.org, linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 06/16] ARM: tegra: harmony: Initialize PCIe from DT Date: Thu, 25 Jul 2013 10:53:20 -0700 Message-Id: <1374774810-18459-7-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1374774810-18459-1-git-send-email-thierry.reding@gmail.com> References: <1374774810-18459-1-git-send-email-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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 {