From: Dylan Reid <dgreid@chromium.org>
Date: Thu, 4 Sep 2014 22:20:34 +0000 (-0700)
Subject: ARM: tegra: Move pwm and dpaux labels to tegra124.dtsi
X-Git-Tag: fixes-for-v3.18-merge-window~4^2~15^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edfbad068bde82ef228c551569ae4eabeacaf9a6;p=pandora-kernel.git

ARM: tegra: Move pwm and dpaux labels to tegra124.dtsi

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 <dgreid@chromium.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index dcbe5858faf1..a076a2c53603 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";
 	};
 
Reading git-diff-tree failed