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 81BC3EB64DC for ; Thu, 20 Jul 2023 15:24:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 89FAD86801; Thu, 20 Jul 2023 17:24:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="VixRU/4c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4553A86805; Thu, 20 Jul 2023 17:24:38 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (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 D077584773 for ; Thu, 20 Jul 2023 17:24:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rogerq@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2E86B61B53; Thu, 20 Jul 2023 15:24:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76F45C433C8; Thu, 20 Jul 2023 15:24:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689866673; bh=mZfAs1mvQsTuvoBK8gRIyfJLm4Qlq2KIOe7V2oF+gbw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=VixRU/4cXu8/LAJckjabuKhcPVPBkbf3cshwWJe0P29VnSgkBlYCIDUG2BswlRrj9 OjBj138ZDDkKDWmiAzFsGskTkVALvpG9pmgn6vK7PCj3kWcU2UFxy8so9OrpgkZ+Wn v08AwUEeMhkrgQueqUrrL+GE7bKjZ6fxHoUyuTDdk3Mkmx68XwG/RBM0tpF+0FY4ZW ascd5ha4mBCHJK1OCtBUb8/x38yJSDu8zbbtjOyzv17B7s1Icket5+LcNgXA2Ig5bZ QQK50RjNfay/89Lck1rHTT72ptxJbN6iCSU3NxdlRVjbh23xuBJrP4AomXSu6rzMfp jHMZMgpXR3K4A== Message-ID: Date: Thu, 20 Jul 2023 18:24:28 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [RFC PATCH 4/4] arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1 Content-Language: en-US To: Nishanth Menon , u-boot@lists.denx.de, Tom Rini Cc: Wadim Egorov , Francesco Dolcini , Sjoerd Simons , Neha Malcom Francis , Bryan Brattlof , Vignesh Raghavendra , Nitin Yadav , "mripard@kernel.org >> Maxime Ripard" , "Gunasekaran, Ravi" , Siddharth Vadapalli , "J, KEERTHY" References: <20230713072019.3153871-1-nm@ti.com> <20230713072019.3153871-5-nm@ti.com> From: Roger Quadros In-Reply-To: <20230713072019.3153871-5-nm@ti.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 On 13/07/2023 10:20, Nishanth Menon wrote: > Update the am62 and am625 device-trees from linux v6.3-rc5 This needed the followin > tweaks to the u-boot specific dtsi as well: > - Switch tick-timer to the main_timer as it's now defined in the main dtsi > - Secure proxies are defined in Soc dtsis > - Drop duplicate nodes - u-boot.dtsi is includes in r5-sk, no need for > either the definitions from main.dtsi OR duplication from u-boot.dtsi > - Add mdio pins to the cpsw3g pinctrl in u-boot dtsi. It moved to a subnode in the > linux dtsi that u-boot doesn't use/support > > Cc: Francesco Dolcini > Cc: Sjoerd Simons > Cc: Wadim Egorov > Signed-off-by: Nishanth Menon > --- > > This is a respin of Sjoerd's series.. quiet a bit of sync there. but > should make it easier to add on newer boards by backporting from > upstream kernel. > > arch/arm/dts/k3-am62-main.dtsi | 389 +++++++++++++++++++++++-- > arch/arm/dts/k3-am62-mcu.dtsi | 66 +++++ > arch/arm/dts/k3-am62-thermal.dtsi | 33 +++ > arch/arm/dts/k3-am62-wakeup.dtsi | 33 ++- > arch/arm/dts/k3-am62.dtsi | 11 +- > arch/arm/dts/k3-am625-r5-sk.dts | 92 +----- > arch/arm/dts/k3-am625-sk-u-boot.dtsi | 24 +- > arch/arm/dts/k3-am625-sk.dts | 286 ++----------------- > arch/arm/dts/k3-am625.dtsi | 54 +++- > arch/arm/dts/k3-am62x-sk-common.dtsi | 412 +++++++++++++++++++++++++++ > arch/arm/dts/k3-pinctrl.h | 53 ++++ > 11 files changed, 1065 insertions(+), 388 deletions(-) > create mode 100644 arch/arm/dts/k3-am62-thermal.dtsi > create mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi > create mode 100644 arch/arm/dts/k3-pinctrl.h > > > diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi > index a60c37f1dbf0..76589c7025a0 100644 > --- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi > +++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi > @@ -9,7 +9,7 @@ > / { > chosen { > stdout-path = "serial2:115200n8"; > - tick-timer = &timer1; > + tick-timer = &main_timer0; > }; > > aliases { > @@ -21,16 +21,13 @@ > }; > }; > > -&cbass_main{ > +&cbass_main { > bootph-pre-ram; > +}; > > - timer1: timer@2400000 { > - compatible = "ti,omap5430-timer"; > - reg = <0x00 0x2400000 0x00 0x80>; > - ti,timer-alwon; > - clock-frequency = <25000000>; > - bootph-pre-ram; > - }; > +&main_timer0 { > + clock-frequency = <25000000>; > + bootph-pre-ram; > }; > > &dmss { > @@ -77,10 +74,6 @@ > bootph-pre-ram; > }; > > -&main_uart1 { > - bootph-pre-ram; > -}; > - > &cbass_mcu { > bootph-pre-ram; > }; > @@ -93,10 +86,6 @@ > bootph-pre-ram; > }; > > -&wkup_uart0 { > - bootph-pre-ram; > -}; > - > &sdhci1 { > bootph-pre-ram; > }; > @@ -135,6 +124,7 @@ > reg-names = "cpsw_nuss", "mac_efuse"; mac_efuse is another odd duck. The efuse offset needs to be obtained from "ti,syscon-efuse = <&wkup_conf 0x200>;" which is already present in am62-main.dtsi > /delete-property/ ranges; Any idea why we delete ranges? > bootph-pre-ram; > + pinctrl-0 = <&main_mdio1_pins_default &main_rgmii1_pins_default>; > > cpsw-phy-sel@04044 { > compatible = "ti,am64-phy-gmii-sel"; This can also go away. Only bootph-pre-ram required. -- cheers, -roger