On Fri, May 07, 2021 at 09:29:50AM +0200, Yunus Bas wrote:
> 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 <[email protected]>
Applied, thanks
Sascha
> ---
> Changes in v2:
> - Added missing signed-off
> ---
> 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
> [email protected]
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
