From patchwork Wed Jul 5 20:17:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Dahl X-Patchwork-Id: 1804002 X-Patchwork-Delegate: eugen.hristev@microchip.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qx9w65yvrz20bK for ; Thu, 6 Jul 2023 06:18:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 734B0863EA; Wed, 5 Jul 2023 22:17:50 +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 834BB86372; Wed, 5 Jul 2023 22:17:46 +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=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) (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 434F686372 for ; Wed, 5 Jul 2023 22:17:42 +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 (mreue109 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MPooP-1qdMU52CPb-00MvUV; Wed, 05 Jul 2023 22:17:30 +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 1qH8wK-0005AQ-Hp; Wed, 05 Jul 2023 22:17:29 +0200 Received: (nullmailer pid 322473 invoked by uid 2001); Wed, 05 Jul 2023 20:17:28 -0000 From: Alexander Dahl To: Eugen Hristev Cc: Alexander Dahl , Simon Glass , Durai Manickam KR , Sergiu Moga , u-boot@lists.denx.de Subject: [PATCH 4/5] ARM: dts: at91: sam9x60-curiosity: Improve alignment with upstream Date: Wed, 5 Jul 2023 22:17:00 +0200 Message-Id: <20230705201701.322372-5-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 X-Scan-Signature: fa598383d33cf8c61679ed75677215b4 X-Provags-ID: V03:K1:EI6KJdJHOXQsJ0/umjl/ZKhDxLq0bRscMaITRaI1ozIBAsl1K5E pgm7OEJXpG6+PVVxgv1W+qe9d0T8Kq5sKWHvJMxHaoL2swYBhgpovKFw5Zd+wMkOdy5l9dm gcj9iHMa0D0GxCbAQckE9MxMNpVqBamJhL07Z7jY2oobg3H/N5+qyg592zqL5pN89Guk594 iffdHbmtLMckZZ3GA0Ghg== UI-OutboundReport: notjunk:1;M01:P0:rCK4RZYjJxg=;fbU3nBm8G7N0BOldTmsn3m9gER2 YhE/QOSI4XCGP0XUVA8NFLaloJAMphK3KNlBEIAhsdoRFmGp7Rh0hvJgLXPDv4tNgmwOucXnc FFW6qLq3AHnUYfc1I/pfE8+YC2FFqqbiPMW8aTCxrkuS7RYRCxYtnmvmwCFVtXn45Kn0FOfsk EiRh1V4SGz0kitP7MbKWHg7+80DMtfGQUWVv4Up6Cma6sRR/WrXO3EEs0eKWK1MCSRiNEBXbw 4VYV4l9WSUoXFc9aJRaMEPfmam1gZlobwdilIlJkK/7FNn1mFRB2ZghUniNFf4WxucCPR3atF Nr9sqGb3I6v0sok1nbXSEp93jup4quVB/P589cHpEdhxOhKNWn+tyf2xtz+VL3TodkVhRQ2jC iBrwSd25rHpuwTAfuvBMnos0yP/DMI1rczrdlAkE/zf1RiBe0G/bKXc1Fz4D9y2U5KRST7bz1 xn6vccFt7z5Dayn9tFY015m1IJvBTJmfRlkaBLhoWoqAeykRutA6jZWsR0xFdne9zUmeRTu83 dab727T6n8QzO/2iXL5/AH3o4kea0cFW0GLEYvVG/Oz0e8uGBLgo98wiA7usy2EbhpK7x2D3M gihweL2UpO4x/GbJ10x/Fv9/EVM8lJR3YpWbj8SGg+X53jiFkW/PnhZr633mFXfmN0q0qpsvH /e3yR1V9xxP0owPXSJLzdf8/mxmi3v2Ncc6CS1tH8A== 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 - nodes moved - using node references by label instead of dulicating the node tree Makes it easier to compare with the dts file from Linux kernel. Signed-off-by: Alexander Dahl --- .../dts/at91-sam9x60_curiosity-u-boot.dtsi | 8 +- arch/arm/dts/at91-sam9x60_curiosity.dts | 100 +++++++++--------- 2 files changed, 53 insertions(+), 55 deletions(-) diff --git a/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi b/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi index 0c3c0406b4..a1b76e94d1 100644 --- a/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi +++ b/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi @@ -14,10 +14,6 @@ apb { bootph-all; - - pinctrl { - bootph-all; - }; }; }; @@ -42,6 +38,10 @@ bootph-all; }; +&pinctrl { + bootph-all; +}; + &pinctrl_dbgu { bootph-all; }; diff --git a/arch/arm/dts/at91-sam9x60_curiosity.dts b/arch/arm/dts/at91-sam9x60_curiosity.dts index ae707dd64b..fb59405b24 100644 --- a/arch/arm/dts/at91-sam9x60_curiosity.dts +++ b/arch/arm/dts/at91-sam9x60_curiosity.dts @@ -11,60 +11,18 @@ #include "sam9x60.dtsi" / { - model = "Microchip SAM9X60 CURIOSITY"; + model = "Microchip SAM9X60 Curiosity"; compatible = "microchip,sam9x60-curiosity", "microchip,sam9x60", "atmel,at91sam9"; - ahb { - apb { - flx0: flexcom@f801c600 { - atmel,flexcom-mode = ; - status = "okay"; - - i2c@600 { - compatible = "microchip,sam9x60-i2c"; - reg = <0x600 0x200>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_flx0>; - #address-cells = <1>; - #size-cells = <0>; - clocks = <&pmc PMC_TYPE_PERIPHERAL 5>; - status = "okay"; - - eeprom@53 { - compatible = "atmel,24c02"; - reg = <0x53>; - pagesize = <16>; - }; - }; - }; - - pinctrl { - pinctrl_flx0: flx0_default { - atmel,pins = - ; - }; - - pinctrl_onewire_tm_default: onewire_tm_default { - atmel,pins = - ; - }; - - usb1 { - pinctrl_usb_default: usb_default { - atmel,pins = ; - }; - }; - }; - }; - }; - chosen { stdout-path = &dbgu; i2c0 = &flx0; }; + memory { + reg = <0x20000000 0x8000000>; + }; + clocks { slow_xtal: slow_xtal { clock-frequency = <32768>; @@ -75,10 +33,6 @@ }; }; - memory { - reg = <0x20000000 0x8000000>; - }; - onewire_tm: onewire { gpios = <&pioD 14 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; @@ -92,11 +46,55 @@ }; }; +&flx0 { + atmel,flexcom-mode = ; + status = "okay"; + + i2c@600 { + compatible = "microchip,sam9x60-i2c"; + reg = <0x600 0x200>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flx0>; + #address-cells = <1>; + #size-cells = <0>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 5>; + status = "okay"; + + eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; + }; +}; + &macb0 { phy-mode = "rmii"; status = "okay"; }; +&pinctrl { + flexcom { + pinctrl_flx0: flx0_default { + atmel,pins = + ; + }; + }; + + pinctrl_onewire_tm_default: onewire_tm_default { + atmel,pins = + ; + }; + + usb1 { + pinctrl_usb_default: usb_default { + atmel,pins = ; + }; + }; +}; + &usb1 { num-ports = <3>; atmel,vbus-gpio = <0