From patchwork Mon Jun 11 15:05:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 164210 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 B4291100814 for ; Tue, 12 Jun 2012 01:06:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755600Ab2FKPFr (ORCPT ); Mon, 11 Jun 2012 11:05:47 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:56371 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755592Ab2FKPFk (ORCPT ); Mon, 11 Jun 2012 11:05:40 -0400 Received: from benhur.adnet.avionic-design.de (p548E0634.dip0.t-ipconnect.de [84.142.6.52]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LlLtL-1S3fZN2nih-00bI0p; Mon, 11 Jun 2012 17:05:32 +0200 Received: from mailbox.adnet.avionic-design.de (add-virt-zarafa.adnet.avionic-design.de [172.20.129.9]) by benhur.adnet.avionic-design.de (Postfix) with ESMTP id BD10F2C411B; Mon, 11 Jun 2012 17:05:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 117542A28173; Mon, 11 Jun 2012 17:05:29 +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 6mCQEBERfS6t; Mon, 11 Jun 2012 17:05:28 +0200 (CEST) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) (Authenticated sender: thierry.reding) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id F16AE2A28213; Mon, 11 Jun 2012 17:05:24 +0200 (CEST) From: Thierry Reding To: linux-tegra@vger.kernel.org Cc: Jesse Barnes , linux-pci@vger.kernel.org, Grant Likely , Rob Herring , devicetree-discuss@lists.ozlabs.org, Russell King , linux-arm-kernel@lists.infradead.org, Colin Cross , Olof Johansson , Stephen Warren Subject: [PATCH v2 10/10] ARM: tegra: trimslice: Initialize PCIe from DT Date: Mon, 11 Jun 2012 17:05:18 +0200 Message-Id: <1339427118-32263-11-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1339427118-32263-1-git-send-email-thierry.reding@avionic-design.de> References: <1339427118-32263-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:s0C3tE8v3u3pgrt3wxsCXlKitgqr6ZnYBH9mszmo8Fg LS2UVeTr45LKA67vNS4bvGMuYtRzSqx6aOUcYRogiqTHkhCr3K 3gvCK1miySqL1CSHlGn0hSuU+M2TgOHzOa/WeA82l9Uo+Gbue8 YucUw/Gxbbv2cagb7tNUHdJRL723DAauhsOb3JJBpJQyW/CAfM W10DOsdl+BGhRh9a6fQxZCCdBtEpFUzj/+RChMIkG8BgtbOKoN D/s9o3AcZ47YDtFKO6oGRdKAfH43kYEeOrTYeThFw3aXL4+knz 2X7H/YOeALVz7arsN35RrqfbipccokmsxL1WDNOBPbPyWyoZql UfKrPYR8SKQQvtom6LUVfQTcaZWm7RbpNGrkUwi0UpYqc90D/N SUWMBlEuZ+nsxgs8wAKXD39yqKSTr1kGuhGxE7SBXhbHWtZPhR EHMAM Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@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: - new patch --- arch/arm/boot/dts/tegra-trimslice.dts | 4 ++++ arch/arm/mach-tegra/board-dt-tegra20.c | 18 ------------------ 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts index 9de5636..fc48f371 100644 --- a/arch/arm/boot/dts/tegra-trimslice.dts +++ b/arch/arm/boot/dts/tegra-trimslice.dts @@ -274,6 +274,10 @@ }; }; + pci { + status = "okay"; + }; + usb@c5000000 { status = "okay"; }; diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index c7b6ae2..3a8b825 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -116,21 +116,6 @@ static void __init tegra_dt_init(void) tegra20_auxdata_lookup, NULL); } -#ifdef CONFIG_MACH_TRIMSLICE -static struct tegra_pcie_pdata trimslice_pcie_pdata = { - .enable_ports = { - [0] = true, - [1] = true, - }, -}; - -static void __init trimslice_init(void) -{ - tegra_pcie_device.dev.platform_data = &trimslice_pcie_pdata; - platform_device_register(&tegra_pcie_device); -} -#endif - #ifdef CONFIG_MACH_PAZ00 static void __init paz00_init(void) { @@ -142,9 +127,6 @@ static struct { char *machine; void (*init)(void); } board_init_funcs[] = { -#ifdef CONFIG_MACH_TRIMSLICE - { "compulab,trimslice", trimslice_init }, -#endif #ifdef CONFIG_MACH_PAZ00 { "compal,paz00", paz00_init }, #endif