mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 02/15] ARM: dts: fix now duplicate memory nodes
Date: Thu, 18 Jun 2020 11:10:49 +0200	[thread overview]
Message-ID: <20200618091102.30150-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20200618091102.30150-1-a.fatoum@pengutronix.de>

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>
---
 arch/arm/dts/am335x-bone.dts      | 7 +++----
 arch/arm/dts/am335x-boneblack.dts | 7 +++----
 arch/arm/dts/imx53-tqma53.dtsi    | 6 +++---
 arch/arm/dts/imx6dl-wandboard.dts | 6 +++---
 arch/arm/dts/imx6q-wandboard.dts  | 6 +++---
 arch/arm/dts/tegra30-beaver.dts   | 8 ++++----
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/arch/arm/dts/am335x-bone.dts b/arch/arm/dts/am335x-bone.dts
index a2e62a3b1c40..df044a57382b 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 f79a6bc8a4ca..80d710b924cb 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 860fb64df2b9..6efc0f1003a0 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 0a7a7182a596..c4695fb8d845 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 d96f0579615b..d182faf21718 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 acbdd318b12a..7a9ced6cef0f 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>;
+};
-- 
2.27.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-06-18  9:11 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-18  9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 01/15] ARM: i.MX50: fix renamed node reference Ahmad Fatoum
2020-06-18  9:10 ` Ahmad Fatoum [this message]
2020-06-18  9:10 ` [PATCH 03/15] ARM: dts: align all applicable memory nodes with spec and convention Ahmad Fatoum
2020-06-18 13:59   ` Sascha Hauer
2020-06-18  9:10 ` [PATCH 04/15] ARM: vexpress: dts: fix barebox partitioning breakage Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 05/15] ARM: at91: dts: extend, don't create anew, pinctrl node Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 06/15] ARM: dts: reference nodes to extend by phandles instead Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 07/15] ARM: i.MX7: warp: drop duplicate memory node Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 08/15] ARM: mvebu: remove reference to non-existant node Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 09/15] ARM: i.MX6UL: dts: remove defunct override of pico-hobbit memory node Ahmad Fatoum
2020-06-18  9:15   ` Michael Grzeschik
2020-06-18  9:10 ` [PATCH 10/15] ARM: layerscape: dts: combine fsl-ls1046a-rdb.dts aliases nodes Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 11/15] ARM: i.MX7: dts: replace commented-out code with status = "disabled" Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 12/15] ARM: i.MX: mx53-qsrb: dts: remove now-superfluous override Ahmad Fatoum
2020-06-18  9:11 ` [PATCH 13/15] ARM: zynqmp: dts: drop now superfluous zynqmp.dtsi Ahmad Fatoum
2020-06-18  9:11 ` [PATCH 14/15] ARM: socfpga: dts: remove unused nodes and phandles Ahmad Fatoum
2020-06-18  9:11 ` [PATCH 15/15] Documentation: devicetree: codify extension of upstream DTS by phandles Ahmad Fatoum

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200618091102.30150-3-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox