From patchwork Tue Aug 17 10:29:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 1517689 X-Patchwork-Delegate: eugen.hristev@microchip.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=y+LPlaKo; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GpnNG1F4gz9sCD for ; Tue, 17 Aug 2021 20:30:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F0DE82C04; Tue, 17 Aug 2021 12:29:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.b="y+LPlaKo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F75C8297D; Tue, 17 Aug 2021 12:29:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B795E81BC8 for ; Tue, 17 Aug 2021 12:29:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=microchip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Eugen.Hristev@microchip.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1629196191; x=1660732191; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7JQ2VlGskSjuUcR+pjBy06F44uetTgR4kQIrQQf7faM=; b=y+LPlaKoMjM1gAofqG1HLipvwhIJmMXJqwfariYu9q6hNgsVTfBlWBAd 8iVVmVglsUg9FSwd/cf98nSe2e+/Q5l2UuyRhki7ZTDkz4Ay7JzVFbCeX PikY9QENR0ZHRQjHLI0VoV2yPHnL2i3xJeAXBIEcfOgRYb10JXAG/zbkE yZWOauedvgih7JoLSZOoAuzAbbBE9rl8JSgky+EBNWaRnFJd+qTVqPXE8 lqLo6/+uNRWVJOQ6LpkpTkimHHfXtGNByOH6NZ3hwnN9r9FgayrHenzAg UdU98Lry1W5lcpTY/cFkvjU/EM0BBrz9vuyA8lMbLr9HdP6LwXWB/egxS w==; IronPort-SDR: 03ywFh+PO/sV7+fjIBpVqMsZ3kLWwWhh61GC7A47NbpHrA50jVD4oLI4l6FoIpnCpj3/aZhsUX myOmoPIoXHiXqwlc2xUxD/RckalYPobEDiA12oR/3x2+M10dH4bBl+eeSnQh+FJVimUCV0V13g QEQML0Q/or+1zZpR3mWEzmmiq3jOYwZz9/d/fGSg3K+W2cBSsWbFP9eB9S6VSJ+QPCTWLMpxBO zxeVSaFoHtlGYqQE145+Vd72meb7rryq+XdJRef8rxTEk+YZFqVJXV+aeXOq5SpVuFt3vipiq7 1jMTChWQwd2848/8LTPI30ZT X-IronPort-AV: E=Sophos;i="5.84,328,1620716400"; d="scan'208";a="128557580" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 17 Aug 2021 03:29:49 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Tue, 17 Aug 2021 03:29:48 -0700 Received: from ROB-ULT-M18282.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Tue, 17 Aug 2021 03:29:39 -0700 From: Eugen Hristev To: CC: , Subject: [PATCH 2/4] ARM: dts: at91: sama5d2_icp: cosmetic arrangement of the nodes Date: Tue, 17 Aug 2021 13:29:23 +0300 Message-ID: <20210817102925.62787-2-eugen.hristev@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210817102925.62787-1-eugen.hristev@microchip.com> References: <20210817102925.62787-1-eugen.hristev@microchip.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 --- 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@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 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 @@ -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 = , + ; + bias-disable; + }; + pinctrl_qspi1_sck_cs_default: qspi1_sck_cs_default { pinmux = , ; @@ -148,12 +155,6 @@ ; bias-disable; }; - - pinctrl_mikrobus1_uart: mikrobus1_uart { - pinmux = , - ; - bias-disable; - }; }; }; };