summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYunus Bas <y.bas@phytec.de>2020-02-27 10:06:55 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2020-03-05 14:26:42 +0100
commit72ba815bf6feaa0a98d2496f52784dd5b4258e73 (patch)
treeb29429f754c2c25b65e13c3cb60b1773f9cae392
parent609b96faf4a7134bf97b49b51414b75aee8c10f2 (diff)
downloadbarebox-72ba815bf6feaa0a98d2496f52784dd5b4258e73.tar.gz
ARM: dts: phycore-imx6: change mtd-partition names for compatibility with kernel
The NVMEM-subsystem in newer kernels does not allow identical partition names on different subdevices. According to the recommendation, we have to rename the partition names to be compatible with actual kernel versions. To minimize the problems which could possibly arise, the nand device is not changed. For all other devices, we prepend the device name to the partitions. Signed-off-by: Yunus Bas <y.bas@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi10
1 files 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 918b62f..e99846c 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:barebox-environment";
+ device-path = &m25p80, "partname:nor.barebox-environment";
status = "disabled";
};
};
@@ -86,22 +86,22 @@
#size-cells = <1>;
partition@0 {
- label = "barebox";
+ label = "nor.barebox";
reg = <0x0 0x100000>;
};
partition@100000 {
- label = "barebox-environment";
+ label = "nor.barebox-environment";
reg = <0x100000 0x20000>;
};
partition@120000 {
- label = "oftree";
+ label = "nor.oftree";
reg = <0x120000 0x20000>;
};
partition@140000 {
- label = "kernel";
+ label = "nor.kernel";
reg = <0x140000 0x0>;
};
};