From 868b5cb74e30edb8444c75c3a6248ced29c4b5ee Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 21 Jul 2022 15:27:33 +0200 Subject: [PATCH] imx: imx7d-sdb: prepare to synchronise device trees with linux As a preparatory step remove the epdc reference which does not exist in the Linux upstream device tree and rename the qspi1 reference to qspi as this is how it is named in the Linux upstream device tree. This avoids the following error once synchronised: +Error: arch/arm/dts/.imx7d-sdb-qspi.dtb.pre.tmp:10.1-6 Label or path epdc not found +Error: arch/arm/dts/.imx7d-sdb-qspi.dtb.pre.tmp:29.1-7 Label or path qspi1 not found +Error: arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi:6.1-7 Label or path qspi1 not found Signed-off-by: Marcel Ziswiler --- arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi | 2 +- arch/arm/dts/imx7d-sdb-qspi.dts | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi index 585af6d..62cdcba 100644 --- a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi +++ b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi @@ -3,7 +3,7 @@ * Copyright 2018 NXP */ -&qspi1 { +&qspi { flash0: mx25l51245g@0 { compatible = "jedec,spi-nor"; }; diff --git a/arch/arm/dts/imx7d-sdb-qspi.dts b/arch/arm/dts/imx7d-sdb-qspi.dts index 9bb4c74..9215d7c 100644 --- a/arch/arm/dts/imx7d-sdb-qspi.dts +++ b/arch/arm/dts/imx7d-sdb-qspi.dts @@ -6,11 +6,6 @@ #include "imx7d-sdb.dts" -/* disable epdc, conflict with qspi */ -&epdc { - status = "disabled"; -}; - &iomuxc { qspi1 { pinctrl_qspi1_1: qspi1grp_1 { @@ -26,7 +21,7 @@ }; }; -&qspi1 { +&qspi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_qspi1_1>; status = "okay"; -- 2.7.4