From patchwork Thu Sep 4 22:20:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Reid X-Patchwork-Id: 4848281 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 6F4AE9F3B4 for ; Thu, 4 Sep 2014 22:24:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A08C20279 for ; Thu, 4 Sep 2014 22:24:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 639CD20272 for ; Thu, 4 Sep 2014 22:23:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XPfOp-0007ix-3s; Thu, 04 Sep 2014 22:21:03 +0000 Received: from mail-ig0-f202.google.com ([209.85.213.202]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XPfOm-0007ds-O4 for linux-arm-kernel@lists.infradead.org; Thu, 04 Sep 2014 22:21:01 +0000 Received: by mail-ig0-f202.google.com with SMTP id r2so1908480igi.1 for ; Thu, 04 Sep 2014 15:20:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tp3gDCs6iBiSobIqU9Nim0SZla44uUAP/HEeJSxab7o=; b=Bf/walqQQlpQdTOnHH9rFZ2+FeRipuTm/iSLdY4nGVxPnrqjbr3eyzMi/3iN9QmA/z E5FRb9kOpTk4Q8g3Ub/CU0hi2rw5WWQfUFGWdcTR15PaHkeVIw4X+eJKQ4h+51K3VY1k e82ZyU1Up7CW6HerB7/3Azq1SH1h771m3djHdQmepSgx1fQCL9cgsJW4yyFfsIuDkplM DoaW32Su16W3Ft9XANYkq7N3AIF8leS8zxezyBBiE8UJhSYqCiAuAUd9WSunY4RPifw+ iobbWW59YjKB1RbRHydCSWVDTaVEmfPuMC45wJPU+Jmb/QOr5KpZqoCasvho98ohWEwu WJrA== X-Gm-Message-State: ALoCoQlyIHbhgTfLAU7sDDkOvBwKvYo1vlnK+vUBncUr3OzjhM+XnGqdzymDkD1ePVibEGWsKHtZ X-Received: by 10.182.251.135 with SMTP id zk7mr29001obc.14.1409869237827; Thu, 04 Sep 2014 15:20:37 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id j25si55331yhb.0.2014.09.04.15.20.37 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Sep 2014 15:20:37 -0700 (PDT) Received: from hojo20.mtv.corp.google.com (hojo20.mtv.corp.google.com [172.22.65.103]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 9543631C2E5; Thu, 4 Sep 2014 15:20:37 -0700 (PDT) Received: by hojo20.mtv.corp.google.com (Postfix, from userid 123195) id 280E61C067D; Thu, 4 Sep 2014 15:20:37 -0700 (PDT) From: Dylan Reid To: linux-tegra@vger.kernel.org Subject: [PATCH v3 1/2] ARM: tegra: Move pwm and dpaux labels to tegra124.dtsi Date: Thu, 4 Sep 2014 15:20:34 -0700 Message-Id: <1409869235-8121-1-git-send-email-dgreid@chromium.org> X-Mailer: git-send-email 2.1.0.24.g4109c28 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140904_152100_819596_6B0042E8 X-CRM114-Status: GOOD ( 10.88 ) X-Spam-Score: -2.4 (--) Cc: swarren@wwwdotorg.org, abrestic@chromium.org, thierry.reding@gmail.com, olof@lixom.net, Dylan Reid , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-3.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 These labels will be used by other boards in addition to Venice2, move them to tegra124.dtsi so they are defined in a common place. Signed-off-by: Dylan Reid --- This patch first appeared in v3 of this series. --- arch/arm/boot/dts/tegra124-venice2.dts | 4 ++-- arch/arm/boot/dts/tegra124.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts index dcbe585..a076a2c 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts @@ -36,7 +36,7 @@ nvidia,panel = <&panel>; }; - dpaux: dpaux@0,545c0000 { + dpaux@0,545c0000 { vdd-supply = <&vdd_3v3_panel>; status = "okay"; }; @@ -587,7 +587,7 @@ status = "okay"; }; - pwm: pwm@0,7000a000 { + pwm@0,7000a000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index a6e4814..0ba3a0b 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -78,7 +78,7 @@ status = "disabled"; }; - dpaux@0,545c0000 { + dpaux: dpaux@0,545c0000 { compatible = "nvidia,tegra124-dpaux"; reg = <0x0 0x545c0000 0x0 0x00040000>; interrupts = ; @@ -272,7 +272,7 @@ status = "disabled"; }; - pwm@0,7000a000 { + pwm: pwm@0,7000a000 { compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm"; reg = <0x0 0x7000a000 0x0 0x100>; #pwm-cells = <2>;