From patchwork Thu Jul 25 17:53:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 2833629 Return-Path: X-Original-To: patchwork-linux-arm@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 9B1419F4D4 for ; Thu, 25 Jul 2013 18:38:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6250C2046C for ; Thu, 25 Jul 2013 18:38:03 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 256D920468 for ; Thu, 25 Jul 2013 18:38:02 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2Pn3-0006wZ-GR; Thu, 25 Jul 2013 17:57:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2PmC-0000qV-Q6; Thu, 25 Jul 2013 17:56:32 +0000 Received: from mail-bk0-x22e.google.com ([2a00:1450:4008:c01::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2Pl7-0000fF-L0 for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2013 17:55:26 +0000 Received: by mail-bk0-f46.google.com with SMTP id na10so800357bkb.33 for ; Thu, 25 Jul 2013 10:54:59 -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=gIUYPsllVoWyX4J3I1/PSAC3KNWvUJQJtxgB8t7+4qU=; b=N73lFTBzuU0gJr5sEMv/uj79Vo0j4qh0YcKbfe+Q4FBFAFZuWlRjAxElabKa6HPqLF Yzex4P3E66y77+NHAhfM6PLB3lzFYReBjZgwzjFpQPbe1N4ReQv+lQ5AIerRaFCqD5la 8BARABALTrbVsBuiwPJuW6kg1q/9U/D5ZTivuc1RRIK2pwIwum6Ex6npMDpTpP8YteZk XbmNieYcEjZkx+pZ4zPrjDL4I3YVNBV+GpihRuPJWu4+Ix8UwnrEyCOuszo/HvKHYFFJ rQa+X9s10xfbhBoO5tCwu2ZW7PSsBL+v0A1fW7PmTHRXYGUPCA/mScX+4Yw7WGwGhF+D sDpg== X-Received: by 10.204.117.1 with SMTP id o1mr6625313bkq.103.1374774899539; Thu, 25 Jul 2013 10:54:59 -0700 (PDT) Received: from localhost (dotsec.net. [62.75.224.215]) by mx.google.com with ESMTPSA id fc7sm11355285bkc.3.2013.07.25.10.54.55 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 25 Jul 2013 10:54:58 -0700 (PDT) From: Thierry Reding To: Bjorn Helgaas , Stephen Warren Subject: [PATCH v5 13/16] ARM: tegra: Fix Beaver's PCIe lane configuration Date: Thu, 25 Jul 2013 10:53:27 -0700 Message-Id: <1374774810-18459-14-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130725_135525_863538_FD2CEE16 X-CRM114-Status: GOOD ( 10.55 ) X-Spam-Score: -2.0 (--) Cc: Thomas Petazzoni , devicetree@vger.kernel.org, Russell King , Jason Cooper , Jay Agarwal , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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: Stephen Warren Beaver's PCIe lane configuration most closely matches x2 x2 x2 rather than x4 x1 x1, since clocks 0 and 2 are used, and lanes 0 and 5 are used, and the only way those align is with a x2 x2 x2 configuration. Also, disable root port 1; there's nothing connected to it. Root port 0 is the on-board PCIe Ethernet, and port 2 is the mini-PCIe slot. Signed-off-by: Stephen Warren Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra30-beaver.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 4d9fa31..e1dd644 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -18,16 +18,16 @@ pci@1,0 { status = "okay"; - nvidia,num-lanes = <4>; + nvidia,num-lanes = <2>; }; pci@2,0 { - status = "okay"; - nvidia,num-lanes = <1>; + nvidia,num-lanes = <2>; }; pci@3,0 { - nvidia,num-lanes = <1>; + status = "okay"; + nvidia,num-lanes = <2>; }; };