imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>
Thu, 21 Jul 2022 13:27:29 +0000 (15:27 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 25 Jul 2022 14:12:00 +0000 (16:12 +0200)
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

index d0cbf79..3bd6edb 100644 (file)
@@ -8,12 +8,6 @@
        display0 = &lcdif;
 };
 
-&qspi {
-       flash0: n25q256a@0 {
-               compatible = "jedec,spi-nor";
-       };
-};
-
 &{/soc} {
        u-boot,dm-pre-reloc;
 };