diff options
author | Marcel Ziswiler | 2022-07-21 15:27:29 +0200 |
---|---|---|
committer | Stefano Babic | 2022-07-25 16:12:00 +0200 |
commit | 091a03f8f359911fc1e5154b06b6a4a58845ed09 (patch) | |
tree | b2c66f168618210001b8f67148e4d591464d79d5 | |
parent | bd483b7a9fd0468518b98105013c5a9fed0a3467 (diff) |
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>
-rw-r--r-- | arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 6 |
1 files changed, 0 insertions, 6 deletions
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; }; |