summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Warren <twarren@nvidia.com>2013-03-11 17:07:21 -0700
committerTom Warren <twarren@nvidia.com>2013-03-14 11:49:07 -0700
commit5647c0343176d8ea257abf44211c493ef139d3e8 (patch)
tree486a00d42c8950f73b44c2073ea10d83315a0be0
parentf31a5443a8b52a613fcafc0330a303420eafcca4 (diff)
downloadu-boot-imx-5647c0343176d8ea257abf44211c493ef139d3e8.zip
u-boot-imx-5647c0343176d8ea257abf44211c493ef139d3e8.tar.gz
u-boot-imx-5647c0343176d8ea257abf44211c493ef139d3e8.tar.bz2
Tegra114: fdt: Move aliases from dtsi to dts file as per other Tegras
All other Tegra boards have their alias nodes in the .dts file Signed-off-by: Tom Warren <twarren@nvidia.com> Reviewed-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--arch/arm/dts/tegra114.dtsi8
-rw-r--r--board/nvidia/dts/tegra114-dalmore.dts8
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>;