From: Yunus Bas <y.bas@phytec.de>
To: barebox@lists.infradead.org
Subject: [PATCH] Revert "ARM: dts: phycore-imx6: change mtd-partition names for compatibility with kernel"
Date: Fri, 7 May 2021 09:27:11 +0200 [thread overview]
Message-ID: <20210507072711.2004235-1-y.bas@phytec.de> (raw)
This reverts commit 72ba815bf6feaa0a98d2496f52784dd5b4258e73.
The NVMEM name-clashing has been fixed on Linux-upstream. NVMEM devices
are now registered with the unique device names instead of the
MTD-partition names. This fix is no longer needed.
---
arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
index 2fb920945..2c333ce8f 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
@@ -29,7 +29,7 @@
environment-spinor {
compatible = "barebox,environment";
- device-path = &m25p80, "partname:nor.barebox-environment";
+ device-path = &m25p80, "partname:barebox-environment";
status = "disabled";
};
};
@@ -86,22 +86,22 @@
#size-cells = <1>;
partition@0 {
- label = "nor.barebox";
+ label = "barebox";
reg = <0x0 0x100000>;
};
partition@100000 {
- label = "nor.barebox-environment";
+ label = "barebox-environment";
reg = <0x100000 0x20000>;
};
partition@120000 {
- label = "nor.oftree";
+ label = "oftree";
reg = <0x120000 0x20000>;
};
partition@140000 {
- label = "nor.kernel";
+ label = "kernel";
reg = <0x140000 0x0>;
};
};
--
2.30.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
reply other threads:[~2021-05-07 7:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210507072711.2004235-1-y.bas@phytec.de \
--to=y.bas@phytec.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