diff mbox series

[v1,11/26] imx: imx7d-sdb: prepare to synchronise device trees with linux

Message ID 20220721132748.1052244-12-marcel@ziswiler.com
State Accepted
Commit 868b5cb74e30edb8444c75c3a6248ced29c4b5ee
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 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 <marcel.ziswiler@toradex.com>
---

 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(-)

Comments

Stefano Babic July 25, 2022, 4:39 p.m. UTC | #1 
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 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 <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/imx7d-sdb-qspi-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
index 585af6d211f..62cdcbaeb67 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 9bb4c743c14..9215d7c6160 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";