diff mbox

[v3,1/2] ARM: tegra: Move pwm and dpaux labels to tegra124.dtsi

Message ID 1409869235-8121-1-git-send-email-dgreid@chromium.org
State Accepted, archived
Headers show

Commit Message

Dylan Reid Sept. 4, 2014, 10:20 p.m. UTC
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>
---
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(-)

Comments

Stephen Warren Sept. 5, 2014, 5:03 p.m. UTC | #1
On 09/04/2014 04:20 PM, Dylan Reid wrote:
> 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.

I've applied the series to Tegra's for-3.18/dt branch.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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 = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
@@ -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>;