[U-Boot] [PATCH v6 10/13] tegra: Use a U-Boot-specific .dtsi file

[Simon Glass]

With the new device-tree rules it is possible to put device-tree changes
needed by U-Boot into their own file. As an example of this approach, move
Tegra over to use it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

Changes in v6:
- Drop unwanted root-node properties from tegra20-u-boot.dtsi

Changes in v5:
- Add a new tegra patch to use an automatically included .dtsi file

Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm/dts/tegra124-nyan-big-u-boot.dtsi | 15 +++++++++++++++
 arch/arm/dts/tegra124-nyan-big.dts         |  2 --
 arch/arm/dts/tegra20-u-boot.dtsi           |  8 ++++++++
 arch/arm/dts/tegra20.dtsi                  |  2 --
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/dts/tegra124-nyan-big-u-boot.dtsi
 create mode 100644 arch/arm/dts/tegra20-u-boot.dtsi

diff --git a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi
new file mode 100644
index 0000000..fff1d78
--- /dev/null
+++ b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2016 Google, Inc
+ * Written by Simon Glass <sjg at chromium.org>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/ {
+	host1x at 50000000 {
+		u-boot,dm-pre-reloc;
+		dc at 54200000 {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts
index 3758395..62f89d0 100644
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -27,9 +27,7 @@
 	};
 
 	host1x at 50000000 {
-		u-boot,dm-pre-reloc;
 		dc at 54200000 {
-			u-boot,dm-pre-reloc;
 			display-timings {
 				timing at 0 {
 					clock-frequency = <69500000>;
diff --git a/arch/arm/dts/tegra20-u-boot.dtsi b/arch/arm/dts/tegra20-u-boot.dtsi
new file mode 100644
index 0000000..9b9835d
--- /dev/null
+++ b/arch/arm/dts/tegra20-u-boot.dtsi
@@ -0,0 +1,8 @@
+/ {
+	host1x at 50000000 {
+		u-boot,dm-pre-reloc;
+		dc at 54200000 {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
index 84bb1b0..e21ee25 100644
--- a/arch/arm/dts/tegra20.dtsi
+++ b/arch/arm/dts/tegra20.dtsi
@@ -10,7 +10,6 @@
 	interrupt-parent = <&lic>;
 
 	host1x at 50000000 {
-		u-boot,dm-pre-reloc;
 		compatible = "nvidia,tegra20-host1x", "simple-bus";
 		reg = <0x50000000 0x00024000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
@@ -78,7 +77,6 @@
 		};
 
 		dc at 54200000 {
-			u-boot,dm-pre-reloc;
 			compatible = "nvidia,tegra20-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-- 
2.8.0.rc3.226.g39d4020