From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9E2FAEB64DD for ; Wed, 5 Jul 2023 20:17:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2725286372; Wed, 5 Jul 2023 22:17:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=lespocky.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 420F786203; Wed, 5 Jul 2023 22:17:44 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.135]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E47218627C for ; Wed, 5 Jul 2023 22:17:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=lespocky.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=alex@home.lespocky.de Received: from methusalix.internal.home.lespocky.de ([89.245.58.120]) by mrelayeu.kundenserver.de (mreue012 [213.165.67.97]) with ESMTPSA (Nemesis) id 1MvKTJ-1pz3rB38qX-00rEWL; Wed, 05 Jul 2023 22:17:24 +0200 Received: from lemmy.internal.home.lespocky.de ([192.168.243.178] helo=lemmy.home.lespocky.de) by methusalix.internal.home.lespocky.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qH8wE-00059w-PU; Wed, 05 Jul 2023 22:17:23 +0200 Received: (nullmailer pid 322442 invoked by uid 2001); Wed, 05 Jul 2023 20:17:22 -0000 From: Alexander Dahl To: Eugen Hristev Cc: Alexander Dahl , Mihai Sain , Marek Vasut , Balamanikandan Gunasundar , Sergiu Moga , u-boot@lists.denx.de Subject: [PATCH 1/5] ARM: dts: at91: sam9x60: Better align with upstream dtsi Date: Wed, 5 Jul 2023 22:16:57 +0200 Message-Id: <20230705201701.322372-2-post@lespocky.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230705201701.322372-1-post@lespocky.de> References: <20230705201701.322372-1-post@lespocky.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scan-Signature: 98a917a92abcc2d28a6d62367cc24fe7 X-Provags-ID: V03:K1:NBDYKvDiZ/Kj86wMb7ZeEeFL9xpBYBUg6l5ticAPrdmlf1xAhXB PKqzjUgJn42IP3rCkY1wQzfEoPR2ttmf0ghNX631CLbyDHR4m//JbzZ3o+HzBGiqW6qqrNx nU+L3IQtNeF1Wt5pd/befOOIBiR8sLAYIuKD03x9aKUSeXZ4Dd4rS2b87XJEsw1N6Sp84Ws xMSN45Kd9K0mv6q79dsUg== UI-OutboundReport: notjunk:1;M01:P0:jb/abj1Ak2g=;mpwGfiZluQtX5GcF2SX/FE856wZ 7vVQ08Q4LSpO+9TuS8Uftnmx5BOMTshD4M+xJuNKu0RquL/ovE28mrJDCuYBbqTPCL1N8mFu6 dIjifKZowe0ZnOO3UM/fMUZmucSIZj27ZhstabpHOiniAYyfQCco2z3vWU0akPXvYVFW4gmmZ WO2deQDQ6sB4u+mKbZSLdNIFx87su1+CcIghcY5p+EZdbY6eQtqSB1ERsP7rSSzOtzAqe9wJ8 wfsbrpZI/35WLkPJ87HiJBCRMTNCmAeQihqzYA3IMy5iA0zU+LY+HDsqa24LLVL80agwoYlnM PBGNlmxbonnHoMGu7sBh5qCqIc19TtN0KmTSsPhrGij5r4tGrDO3GHRUczudS3LaQ294iHc2s B6t04zrJZwkuSkPaG8YMbOz0tfgzrDUvAV8cyge4SZUHUZkAfA0veZKXIRxxaIXmLRZ1Px9vT 6OfNCE9zrpTKLJoeGcSiO59FGINuDOXkKnXITqr6EHX4dMWnzCmtvRFvRr7A8nU0R9pIAXnXz 8MRil5Z7KAWYj2HN82bN1/fjnUxDqPoKsaN77gu5fj8naYiuBt+9OvKsFIfJytfFIg1pb9yY2 vQZ7bAsrGTfeBrJO2VrSsgWRt1iscH6ELR+iaG63Kxeeh7Z31AI1IFhItAUgrQqR2aG+fD1zM UgEgrJF1v7csoqJvtAIs2nTX5MYwKxulfJJtpiKffA== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Alexander Dahl No functional changes, but this: - reorder nodes (ordered by memory offset as in Linux) - add label to pinctrl node name for easier reference in board files - fix whitespace Diff to sam9x60.dtsi in Linux is much better readable now. Signed-off-by: Alexander Dahl --- arch/arm/dts/sam9x60.dtsi | 66 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi index 2b93d08938..3b684fc63d 100644 --- a/arch/arm/dts/sam9x60.dtsi +++ b/arch/arm/dts/sam9x60.dtsi @@ -27,6 +27,18 @@ spi0 = &qspi; }; + cpus { + #address-cells = <1>; + #size-cells = <0>; + + ARM9260_0: cpu@0 { + device_type = "cpu"; + compatible = "arm,arm926ej-s"; + clocks = <&pmc PMC_TYPE_CORE 19>, <&pmc PMC_TYPE_CORE 11>, <&main_xtal>; + clock-names = "cpu", "master", "xtal"; + }; + }; + clocks { slow_rc_osc: slow_rc_osc { compatible = "fixed-clock"; @@ -51,18 +63,6 @@ }; }; - cpus { - #address-cells = <1>; - #size-cells = <0>; - - ARM9260_0: cpu@0 { - device_type = "cpu"; - compatible = "arm,arm926ej-s"; - clocks = <&pmc PMC_TYPE_CORE 19>, <&pmc PMC_TYPE_CORE 11>, <&main_xtal>; - clock-names = "cpu", "master", "xtal"; - }; - }; - ahb { compatible = "simple-bus"; #address-cells = <1>; @@ -149,13 +149,20 @@ compatible = "microchip,sam9x60-qspi"; reg = <0xf0014000 0x100>, <0x70000000 0x10000000>; reg-names = "qspi_base", "qspi_mmap"; - clocks = <&pmc PMC_TYPE_PERIPHERAL 35>, <&pmc PMC_TYPE_SYSTEM 18>; /* ID_QSPI */ + clocks = <&pmc PMC_TYPE_PERIPHERAL 35>, <&pmc PMC_TYPE_SYSTEM 18>; /* ID_QSPI */ clock-names = "pclk", "qspick"; #address-cells = <1>; #size-cells = <0>; status = "disabled"; }; + pit64b0: timer@f0028000 { + compatible = "microchip,sam9x60-pit64b"; + reg = <0xf0028000 0xec>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 37>, <&pmc PMC_TYPE_GCK 37>; + clock-names = "pclk", "gclk"; + }; + flx0: flexcom@f801c600 { compatible = "atmel,sama5d2-flexcom"; reg = <0xf801c000 0x200>; @@ -181,6 +188,17 @@ reg = <0xf8050000 0x100>; }; + pmecc: ecc-engine@ffffe000 { + compatible = "microchip,sam9x60-pmecc", "atmel,at91sam9g45-pmecc"; + reg = <0xffffe000 0x300>, + <0xffffe600 0x100>; + }; + + smc: smc@ffffea00 { + compatible = "microchip,sam9x60-smc", "atmel,at91sam9260-smc", "syscon"; + reg = <0xffffea00 0x100>; + }; + dbgu: serial@fffff200 { compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; reg = <0xfffff200 0x200>; @@ -190,7 +208,7 @@ clock-names = "usart"; }; - pinctrl { + pinctrl: pinctrl@fffff400 { #address-cells = <1>; #size-cells = <1>; compatible = "microchip,sam9x60-pinctrl", "simple-bus"; @@ -205,7 +223,7 @@ pinctrl_dbgu: dbgu-0 { atmel,pins = ; + AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; }; }; @@ -256,17 +274,6 @@ }; }; - pmecc: ecc-engine@ffffe000 { - compatible = "microchip,sam9x60-pmecc", "atmel,at91sam9g45-pmecc"; - reg = <0xffffe000 0x300>, - <0xffffe600 0x100>; - }; - - smc: smc@ffffea00 { - compatible = "microchip,sam9x60-smc", "atmel,at91sam9260-smc", "syscon"; - reg = <0xffffea00 0x100>; - }; - pioA: gpio@fffff400 { compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; reg = <0xfffff400 0x200>; @@ -320,13 +327,6 @@ clocks = <&pmc PMC_TYPE_CORE 11>; /* ID_MCK. */ }; - pit64b0: timer@f0028000 { - compatible = "microchip,sam9x60-pit64b"; - reg = <0xf0028000 0xec>; - clocks = <&pmc PMC_TYPE_PERIPHERAL 37>, <&pmc PMC_TYPE_GCK 37>; - clock-names = "pclk", "gclk"; - }; - clk32: sckc@fffffe50 { compatible = "microchip,sam9x60-sckc"; reg = <0xfffffe50 0x4>; -- 2.30.2