diff options
| author | Yunus Bas <y.bas@phytec.de> | 2021-05-07 09:29:50 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-12 07:17:35 +0200 |
| commit | 27b0b0d3fc042cc66f85dad9803ff5cf55cc60db (patch) | |
| tree | b10c303a8e2b972d99dbce3ba27cbd74da691a7c /arch/arm | |
| parent | 4506ef2604cbfd04b6781abd8befa06227385aed (diff) | |
| download | barebox-27b0b0d3fc042cc66f85dad9803ff5cf55cc60db.tar.gz barebox-27b0b0d3fc042cc66f85dad9803ff5cf55cc60db.tar.xz | |
Revert "ARM: dts: phycore-imx6: change mtd-partition names for compatibility with kernel"
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.
Signed-off-by: Yunus Bas <y.bas@phytec.de>
Link: https://lore.barebox.org/20210507072950.2005039-1-y.bas@phytec.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 10 |
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 2fb920945f..2c333ce8fe 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>; }; }; |