From: Eugen Hristev <eugen.hristev@microchip.com>
Date: Tue, 17 Aug 2021 10:29:23 +0000 (+0300)
Subject: ARM: dts: at91: sama5d2_icp: cosmetic arrangement of the nodes
X-Git-Tag: v2022.01~102^2~16^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6a8cce9414f9665216f70ddea369bd604e21f28;p=platform%2Fkernel%2Fu-boot.git

ARM: dts: at91: sama5d2_icp: cosmetic arrangement of the nodes

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@microchip.com>
---

diff --git a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
index 68c27f2..b45de97 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@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@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 2c6e91c..4452219 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@microchip.com>
@@ -48,16 +48,16 @@
 				};
 			};
 
-			uart0: serial@f801c000 { /* mikrobus1 uart */
+			macb0: ethernet@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@f8008000 {
+			uart0: serial@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@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;
-					};
 				};
 			};
 		};