[PATCH 2/4] ARM: dts: at91: sama5d2_icp: cosmetic arrangement of the nodes
Eugen Hristev
eugen.hristev at microchip.com
Tue Aug 17 12:29:23 CEST 2021
Reorder the nodes following the kernel rules: nodes in a range are sorted
by ascending bus address, and when referenced by phandle, are ordered
alphabetically.
Signed-off-by: Eugen Hristev <eugen.hristev at microchip.com>
---
arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi | 23 +++++++++++----------
arch/arm/dts/at91-sama5d2_icp.dts | 25 ++++++++++++-----------
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
index 68c27f229f..b45de978c2 100644
--- a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
+++ b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
@@ -13,34 +13,35 @@
};
};
-&sdmmc0 {
+&pinctrl_mikrobus1_uart {
u-boot,dm-pre-reloc;
};
-&uart0 { /* mikrobus1 uart */
+&pinctrl_qspi1_sck_cs_default {
u-boot,dm-pre-reloc;
};
-&pinctrl_sdmmc0_default {
+&pinctrl_qspi1_dat_default {
u-boot,dm-pre-reloc;
};
-&pinctrl_mikrobus1_uart {
+&pinctrl_sdmmc0_default {
u-boot,dm-pre-reloc;
};
-&pinctrl_qspi1_sck_cs_default {
+&qspi1 {
u-boot,dm-pre-reloc;
+
+ flash at 0 {
+ u-boot,dm-pre-reloc;
+ };
};
-&pinctrl_qspi1_dat_default {
+&sdmmc0 {
u-boot,dm-pre-reloc;
};
-&qspi1 {
+&uart0 { /* mikrobus1 uart */
u-boot,dm-pre-reloc;
-
- flash at 0 {
- u-boot,dm-pre-reloc;
- };
};
+
diff --git a/arch/arm/dts/at91-sama5d2_icp.dts b/arch/arm/dts/at91-sama5d2_icp.dts
index 2c6e91c1c7..44522197ff 100644
--- a/arch/arm/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/dts/at91-sama5d2_icp.dts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* at91-sama5d2_icp.dts - Device Tree file for SAMA5D2 ICP board
- * SAMA5D2 Industrial Connectivity Board
+ * SAMA5D2 Industrial Connectivity Platform
*
* Copyright (c) 2018, Microchip Technology Inc.
* 2018, Eugen Hristev <eugen.hristev at microchip.com>
@@ -48,16 +48,16 @@
};
};
- uart0: serial at f801c000 { /* mikrobus1 uart */
+ macb0: ethernet at f8008000 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_mikrobus1_uart>;
+ pinctrl-0 = <&pinctrl_macb0_rmii &pinctrl_macb0_phy_irq &pinctrl_macb0_rst>;
+ phy-mode = "internal";
status = "okay";
};
- macb0: ethernet at f8008000 {
+ uart0: serial at f801c000 { /* mikrobus1 uart */
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_macb0_rmii &pinctrl_macb0_phy_irq &pinctrl_macb0_rst>;
- phy-mode = "internal";
+ pinctrl-0 = <&pinctrl_mikrobus1_uart>;
status = "okay";
};
@@ -85,6 +85,7 @@
pagesize = <16>;
};
};
+
pioA: gpio at fc038000 {
status = "okay";
pinctrl {
@@ -124,6 +125,12 @@
bias-pull-up;
};
+ pinctrl_mikrobus1_uart: mikrobus1_uart {
+ pinmux = <PIN_PB26__URXD0>,
+ <PIN_PB27__UTXD0>;
+ bias-disable;
+ };
+
pinctrl_qspi1_sck_cs_default: qspi1_sck_cs_default {
pinmux = <PIN_PA6__QSPI1_SCK>,
<PIN_PA11__QSPI1_CS>;
@@ -148,12 +155,6 @@
<PIN_PA13__SDMMC0_CD>;
bias-disable;
};
-
- pinctrl_mikrobus1_uart: mikrobus1_uart {
- pinmux = <PIN_PB26__URXD0>,
- <PIN_PB27__UTXD0>;
- bias-disable;
- };
};
};
};
--
2.25.1
More information about the U-Boot
mailing list