diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:50 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:50 +0200 |
| commit | ca7163dc46ad767f6f33832bc416943f4deba416 (patch) | |
| tree | ec36c89a7eed66d9c9ad321bad02e92666bf5d39 /arch/arm/dts | |
| parent | 0352849942a048b18f01405fc742005e428c043d (diff) | |
| parent | 24ee98513ff80acea199990ebf0b765869234945 (diff) | |
| download | barebox-ca7163dc46ad767f6f33832bc416943f4deba416.tar.gz barebox-ca7163dc46ad767f6f33832bc416943f4deba416.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm/dts/imx8mq-mnt-reform2.dts | 2 |
2 files changed, 6 insertions, 6 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>; }; }; diff --git a/arch/arm/dts/imx8mq-mnt-reform2.dts b/arch/arm/dts/imx8mq-mnt-reform2.dts index 4e80e00dd1..5a65324b3c 100644 --- a/arch/arm/dts/imx8mq-mnt-reform2.dts +++ b/arch/arm/dts/imx8mq-mnt-reform2.dts @@ -12,7 +12,7 @@ / { model = "MNT Reform2"; - compatible = "mnt,reform2", "fsl,imx8mq"; + compatible = "mntre,reform2", "fsl,imx8mq"; chosen { stdout-path = &uart1; |