imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux

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>

diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
index d0cbf79e33f29c9cbb00d64d6520abd711a55750..3bd6edb42e0bddbfa86d5778000f5a0b0182c6e6 100644 (file)
--- 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;
 };