| 修订版 | 868b5cb74e30edb8444c75c3a6248ced29c4b5ee (tree) |
|---|---|
| 时间 | 2022-07-25 23:12:00 |
| 作者 | Marcel Ziswiler <marcel.ziswiler@tora...> |
| Commiter | Stefano Babic |
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
+Error: arch/arm/dts/.imx7d-sdb-qspi.dtb.pre.tmp:29.1-7 Label or path
+Error: arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi:6.1-7 Label or path
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi (diff) arch/arm/dts/imx7d-sdb-qspi.dts (diff)| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | * Copyright 2018 NXP |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -&qspi1 { | |
| 6 | +&qspi { | |
| 7 | 7 | flash0: mx25l51245g@0 { |
| 8 | 8 | compatible = "jedec,spi-nor"; |
| 9 | 9 | }; |
| @@ -6,11 +6,6 @@ | ||
| 6 | 6 | |
| 7 | 7 | #include "imx7d-sdb.dts" |
| 8 | 8 | |
| 9 | -/* disable epdc, conflict with qspi */ | |
| 10 | -&epdc { | |
| 11 | - status = "disabled"; | |
| 12 | -}; | |
| 13 | - | |
| 14 | 9 | &iomuxc { |
| 15 | 10 | qspi1 { |
| 16 | 11 | pinctrl_qspi1_1: qspi1grp_1 { |
| @@ -26,7 +21,7 @@ | ||
| 26 | 21 | }; |
| 27 | 22 | }; |
| 28 | 23 | |
| 29 | -&qspi1 { | |
| 24 | +&qspi { | |
| 30 | 25 | pinctrl-names = "default"; |
| 31 | 26 | pinctrl-0 = <&pinctrl_qspi1_1>; |
| 32 | 27 | status = "okay"; |
Fork