summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2020-06-18 11:10:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-06-23 09:55:26 +0200
commit2b62fd9f118812da5ebc5c53f25939f2c819e8df (patch)
tree82c84a17c549c0794a055191ed6bc4fad5d7118f
parent70756a85f8c296395bcf2033fe7f5589ba0638b8 (diff)
downloadbarebox-2b62fd9f118812da5ebc5c53f25939f2c819e8df.tar.gz
barebox-2b62fd9f118812da5ebc5c53f25939f2c819e8df.tar.xz
ARM: dts: fix now duplicate memory nodes
With the upstream migration to memory@BASE_ADDRESS naming scheme in the device tree of some SoC families, we now have multiple overlapping memory nodes in some of the barebox device trees. Rename the defunct overrides, so they once again override the upstream nodes. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/dts/am335x-bone.dts7
-rw-r--r--arch/arm/dts/am335x-boneblack.dts7
-rw-r--r--arch/arm/dts/imx53-tqma53.dtsi6
-rw-r--r--arch/arm/dts/imx6dl-wandboard.dts6
-rw-r--r--arch/arm/dts/imx6q-wandboard.dts6
-rw-r--r--arch/arm/dts/tegra30-beaver.dts8
6 files changed, 19 insertions, 21 deletions
diff --git a/arch/arm/dts/am335x-bone.dts b/arch/arm/dts/am335x-bone.dts
index a2e62a3b1c..df044a5738 100644
--- a/arch/arm/dts/am335x-bone.dts
+++ b/arch/arm/dts/am335x-bone.dts
@@ -13,11 +13,10 @@
/ {
model = "TI AM335x BeagleBone";
compatible = "ti,am335x-bone", "ti,am33xx";
+};
- memory {
- device_type = "memory";
- reg = <0x80000000 0x10000000>; /* 256 MB */
- };
+&{/memory@80000000} {
+ reg = <0x80000000 0x10000000>; /* 256 MB */
};
&ldo3_reg {
diff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack.dts
index f79a6bc8a4..80d710b924 100644
--- a/arch/arm/dts/am335x-boneblack.dts
+++ b/arch/arm/dts/am335x-boneblack.dts
@@ -13,11 +13,10 @@
/ {
model = "TI AM335x BeagleBone black";
compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+};
- memory {
- device_type = "memory";
- reg = <0x80000000 0x20000000>; /* 512 MB */
- };
+&{/memory@80000000} {
+ reg = <0x80000000 0x20000000>; /* 512 MB */
};
&ldo3_reg {
diff --git a/arch/arm/dts/imx53-tqma53.dtsi b/arch/arm/dts/imx53-tqma53.dtsi
index 860fb64df2..6efc0f1003 100644
--- a/arch/arm/dts/imx53-tqma53.dtsi
+++ b/arch/arm/dts/imx53-tqma53.dtsi
@@ -18,10 +18,10 @@
status = "disabled";
};
};
+};
- memory {
- reg = <0x70000000 0x0>; /* Up to 1GiB */
- };
+&{/memory@70000000} {
+ reg = <0x70000000 0x0>; /* Up to 1GiB */
};
&esdhc3 { /* EMMC */
diff --git a/arch/arm/dts/imx6dl-wandboard.dts b/arch/arm/dts/imx6dl-wandboard.dts
index 0a7a7182a5..c4695fb8d8 100644
--- a/arch/arm/dts/imx6dl-wandboard.dts
+++ b/arch/arm/dts/imx6dl-wandboard.dts
@@ -11,10 +11,10 @@
device-path = &environment_usdhc3;
};
};
+};
- memory {
- reg = <0x0 0x0>;
- };
+&{/memory@10000000} {
+ reg = <0x10000000 0x0>;
};
&ocotp {
diff --git a/arch/arm/dts/imx6q-wandboard.dts b/arch/arm/dts/imx6q-wandboard.dts
index d96f057961..d182faf217 100644
--- a/arch/arm/dts/imx6q-wandboard.dts
+++ b/arch/arm/dts/imx6q-wandboard.dts
@@ -11,10 +11,10 @@
device-path = &environment_usdhc3;
};
};
+};
- memory {
- reg = <0x0 0x0>;
- };
+&{/memory@10000000} {
+ reg = <0x10000000 0x0>;
};
&ocotp {
diff --git a/arch/arm/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts
index acbdd318b1..7a9ced6cef 100644
--- a/arch/arm/dts/tegra30-beaver.dts
+++ b/arch/arm/dts/tegra30-beaver.dts
@@ -22,10 +22,6 @@
};
};
- memory {
- reg = <0x80000000 0x7ff00000>;
- };
-
pcie-controller@00003000 {
status = "okay";
pex-clk-supply = <&sys_3v3_pexs_reg>;
@@ -936,3 +932,7 @@
clock-names = "pll_a", "pll_a_out0", "mclk";
};
};
+
+&{/memory@80000000} {
+ reg = <0x80000000 0x7ff00000>;
+};