mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-28 14:11:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

imx: imx7d-sdb: prepare to synchronise device trees with linux

Browse Source 
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>
This commit is contained in:
Marcel Ziswiler 2022-07-21 15:27:33 +02:00 committed by Stefano Babic
parent 7b4a934d73
commit 868b5cb74e
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
View File

@ -3,7 +3,7 @@
* Copyright 2018 NXP
*/
&qspi1 {
&qspi {
flash0: mx25l51245g@0 {
compatible = "jedec,spi-nor";
};

7
arch/arm/dts/imx7d-sdb-qspi.dts
View File

@ -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";