diff mbox series

[v1,07/26] imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux

Message ID 20220721132748.1052244-8-marcel@ziswiler.com
State Accepted
Commit 091a03f8f359911fc1e5154b06b6a4a58845ed09
Delegated to: Stefano Babic
Headers show
Series arm: dts: imx: sync device trees with upstream linux kernel ones | expand

Commit Message

Marcel Ziswiler July 21, 2022, 1:27 p.m. UTC 
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

As a preparatory step remove the qspi node with its flash0 label as this
is already in the Linux upstream device tree.

This avoids the following error once synchronised:

+arch/arm/dts/imx6ul-14x14-evk.dtb: ERROR (duplicate_label):
 /soc/bus@2100000/spi@21e0000/n25q256a@0: Duplicate label 'flash0' on
 /soc/bus@2100000/spi@21e0000/n25q256a@0 and
 /soc/bus@2100000/spi@21e0000/flash@0

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

 arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 6 ------
 1 file changed, 6 deletions(-)

Comments

Stefano Babic July 25, 2022, 4:42 p.m. UTC | #1 
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> As a preparatory step remove the qspi node with its flash0 label as this
> is already in the Linux upstream device tree.
> This avoids the following error once synchronised:
> +arch/arm/dts/imx6ul-14x14-evk.dtb: ERROR (duplicate_label):
>  /soc/bus@2100000/spi@21e0000/n25q256a@0: Duplicate label 'flash0' on
>  /soc/bus@2100000/spi@21e0000/n25q256a@0 and
>  /soc/bus@2100000/spi@21e0000/flash@0
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
index d0cbf79e33f..3bd6edb42e0 100644
--- a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
@@ -8,12 +8,6 @@ 
 	display0 = &lcdif;
 };
 
-&qspi {
-	flash0: n25q256a@0 {
-		compatible = "jedec,spi-nor";
-	};
-};
-
 &{/soc} {
 	u-boot,dm-pre-reloc;
 };