From patchwork Tue Mar 12 16:08:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 227069 X-Patchwork-Delegate: twarren@nvidia.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 8F89A2C0293 for ; Wed, 13 Mar 2013 03:09:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7EDA74A225; Tue, 12 Mar 2013 17:09:22 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RvVIPzbnrhti; Tue, 12 Mar 2013 17:09:22 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9464D4A227; Tue, 12 Mar 2013 17:09:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 137534A227 for ; Tue, 12 Mar 2013 17:09:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YHbJJHhpMB+V for ; Tue, 12 Mar 2013 17:09:01 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-da0-f54.google.com (mail-da0-f54.google.com [209.85.210.54]) by theia.denx.de (Postfix) with ESMTPS id 4A30C4A225 for ; Tue, 12 Mar 2013 17:08:59 +0100 (CET) Received: by mail-da0-f54.google.com with SMTP id p1so1112dad.13 for ; Tue, 12 Mar 2013 09:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-nvconfidentiality; bh=LJuItpTYyXmZSNI+KsDm+/K9Z2s3C0frLslYGz8plmM=; b=oYyedUyoVCr+facKrpxcaQURBcwC9DS89iaAWW4ofrGvA4If0Ia/XNAMP/ZSYLIIyz 67b3DFTm37i70pQ3J1l4q7M74fzPg7hZC4uV6wAMbgof6xHftGssy9IqfWSyVixPBcHY c4f1jXUqr/Pc/eTACt8UtyNvT8k3GLMLKr9iYpUxEX8hYTSA0ZeCGTCk3qVNfQRvcJWy MS9iId6sLPZfmwqZ8wBfgaqZgECF4KwI/gV+Rc+KDLfGaZexJZ7DRMmXnr8iATo7rrt0 gEHupLghkmQjOv0lEboiRPl6bLO78FfEvDlDQahS92Hst9pgqdgQ3QKUmDePv2rnNbaq 34lg== X-Received: by 10.68.129.9 with SMTP id ns9mr38957526pbb.16.1363104534428; Tue, 12 Mar 2013 09:08:54 -0700 (PDT) Received: from localhost.localdomain (ip68-230-103-25.ph.ph.cox.net. [68.230.103.25]) by mx.google.com with ESMTPS id ti8sm25606106pbc.12.2013.03.12.09.08.51 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 12 Mar 2013 09:08:52 -0700 (PDT) From: Tom Warren To: u-boot@lists.denx.de Date: Tue, 12 Mar 2013 09:08:39 -0700 Message-Id: <1363104519-30029-1-git-send-email-twarren@nvidia.com> X-Mailer: git-send-email 1.7.0.4 X-NVConfidentiality: public Cc: swarren@nvidia.com, Tom Warren , twarren.nvidia@gmail.com Subject: [U-Boot] [PATCH] Tegra114: fdt: Move aliases from dtsi to dts file as per other Tegras X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de All other Tegra boards have their aliase nodes in the .dts file Signed-off-by: Tom Warren Reviewed-by: Stephen Warren --- arch/arm/dts/tegra114.dtsi | 8 -------- board/nvidia/dts/tegra114-dalmore.dts | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi index dfeac53..701c0f9 100644 --- a/arch/arm/dts/tegra114.dtsi +++ b/arch/arm/dts/tegra114.dtsi @@ -3,14 +3,6 @@ / { compatible = "nvidia,tegra114"; - aliases { - i2c0 = "/i2c@7000d000"; - i2c1 = "/i2c@7000c000"; - i2c2 = "/i2c@7000c400"; - i2c3 = "/i2c@7000c500"; - i2c4 = "/i2c@7000c700"; - }; - tegra_car: clock { compatible = "nvidia,tegra114-car"; reg = <0x60006000 0x1000>; diff --git a/board/nvidia/dts/tegra114-dalmore.dts b/board/nvidia/dts/tegra114-dalmore.dts index 3e1e1ea..30cf1fb 100644 --- a/board/nvidia/dts/tegra114-dalmore.dts +++ b/board/nvidia/dts/tegra114-dalmore.dts @@ -6,6 +6,14 @@ model = "NVIDIA Dalmore"; compatible = "nvidia,dalmore", "nvidia,tegra114"; + aliases { + i2c0 = "/i2c@7000d000"; + i2c1 = "/i2c@7000c000"; + i2c2 = "/i2c@7000c400"; + i2c3 = "/i2c@7000c500"; + i2c4 = "/i2c@7000c700"; + }; + memory { device_type = "memory"; reg = <0x80000000 0x80000000>;