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 X-Spam-Level: X-Spam-Status: No, score=-19.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE6DDC433EF for ; Tue, 7 Sep 2021 12:44:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0C9D60F92 for ; Tue, 7 Sep 2021 12:44:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344264AbhIGMpx (ORCPT ); Tue, 7 Sep 2021 08:45:53 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:38202 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231600AbhIGMpw (ORCPT ); Tue, 7 Sep 2021 08:45:52 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5AAA440195 for ; Tue, 7 Sep 2021 12:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631018685; bh=lSByXk3vZ2uUwX6aw8cCNLfpPVphgUncd0Iy1wU4m98=; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version: In-Reply-To:Content-Type; b=p4099gafmd/iIx92pLUfGVy44adGNGGWD/Y+FG2WQo/BejTH8tsNbhRb59lkBRgMg u5w7+aj/+/4z5/t7yy8P5d5Oq66Q++em0FQNuIzfBQH7bay60AtrnusnFYA35/8N99 1+/p7ISrW0sUBU41IAum8PXf4koxdwoISJ1MNfNEKsXP3+n6qIhBV0B21qrBxcQccb 5jByn86XM+LGq5p4llHGPwB8wS04arAFrsMgEHuoMQ+QmC5yvjIvS0Otzqj9gU1EOm 2jeVjPCEK0YrDSoK5NUaG5fd2WpIKHXwASkbrIDWIwQx7ToVXwFBLcpczUyVyyyutk 1HAfRmw4oJZYQ== Received: by mail-wr1-f70.google.com with SMTP id j1-20020adff541000000b001593715d384so2063813wrp.1 for ; Tue, 07 Sep 2021 05:44:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=lSByXk3vZ2uUwX6aw8cCNLfpPVphgUncd0Iy1wU4m98=; b=Bat3pXpFZ4Gp693Y79FJR1zFhuYRAojXUcDoX/DYM2tURU7ctHgtDEExW8C9CWdn6j U6Fd2JV9OjCFuWneklTu8CoTqS9GdBj3YYqm020IhAmm7LbBO7SNI4AQxzo4QvfXK45s 0+csRcX0s2yppZLTe+FBqSFk/1AOyij+1w2joTdYP1GgwkglIKOaUG6+esNIqG8lpZfP nE7rVFiJo8W/++tBwn5p3nEg19ct33vtfDkIJvCVdsGUo4UC+OzhVZ3JCzU93ULyWKwW M42p0KKUsG6vq1+jGoaz5PmxI79jo2gwbJKk1eKsdxs50qWNJU1xhw+awP5xtmCW8w1J 1i2A== X-Gm-Message-State: AOAM5320nXURU0zorY2Zo8HVZPaLry1f2dS54VbmXLYOFOneSlGk/fT7 q1IFPcngGGEXOUyOmVi0iggjy3MKYvmBj6u28i25h7n+NcsNQbCK6TvabC7YM2Ky9wthX1JOI8s 30XoSlv+4p5jLWE1rZqGGXwviY7f6Tf0HT6FjSEg= X-Received: by 2002:a05:600c:4293:: with SMTP id v19mr3778464wmc.32.1631018684945; Tue, 07 Sep 2021 05:44:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwK6fnMG9DMg8Wh9yb3/1zvfnsgWtOWMPQWv5TUQtox0L6VWRDRiglmp218n4VGf1BVNmBBdA== X-Received: by 2002:a05:600c:4293:: with SMTP id v19mr3778442wmc.32.1631018684754; Tue, 07 Sep 2021 05:44:44 -0700 (PDT) Received: from [192.168.3.211] ([79.98.113.74]) by smtp.gmail.com with ESMTPSA id o21sm2704077wms.32.2021.09.07.05.44.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Sep 2021 05:44:44 -0700 (PDT) Subject: Re: [PATCH v3 1/8] ARM: dts: omap: Fixup GPMC child nodes To: Roger Quadros , tony@atomide.com Cc: robh+dt@kernel.org, grygorii.strashko@ti.com, nm@ti.com, lokeshvutla@ti.com, nsekhar@ti.com, miquel.raynal@bootlin.com, devicetree@vger.kernel.org, linux-mtd@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210907113226.31876-1-rogerq@kernel.org> <20210907113226.31876-2-rogerq@kernel.org> From: Krzysztof Kozlowski Message-ID: <8e29cf74-313f-b8c5-7514-60b5e404833d@canonical.com> Date: Tue, 7 Sep 2021 14:44:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20210907113226.31876-2-rogerq@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 07/09/2021 13:32, Roger Quadros wrote: > Fixes up the GPMC child nodes to prevent dtbs_check errors > after device tree binding conversion to yaml. > > - Use reg address as node name > - gpmc,cycle2cycle-samecsen and gpmc,cycle2cycle-diffcsen are > boolean properties. > > Signed-off-by: Roger Quadros > --- > .../boot/dts/logicpd-som-lv-baseboard.dtsi | 2 +- > .../boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 +- > .../boot/dts/logicpd-torpedo-baseboard.dtsi | 2 +- > arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 62 +++++++++---------- > arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 59 +++++++++--------- > arch/arm/boot/dts/omap-zoom-common.dtsi | 16 ++--- > arch/arm/boot/dts/omap2430-sdp.dts | 6 +- > arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 6 +- > .../arm/boot/dts/omap3-devkit8000-common.dtsi | 4 +- > arch/arm/boot/dts/omap3-evm-37xx.dts | 1 + > arch/arm/boot/dts/omap3-evm-common.dtsi | 9 --- > .../boot/dts/omap3-evm-processor-common.dtsi | 5 +- > arch/arm/boot/dts/omap3-evm.dts | 1 + > arch/arm/boot/dts/omap3-igep0020-common.dtsi | 5 +- > arch/arm/boot/dts/omap3-ldp.dts | 5 +- > arch/arm/boot/dts/omap3-n900.dts | 2 +- > .../dts/omap3-overo-chestnut43-common.dtsi | 6 +- > .../arm/boot/dts/omap3-overo-tobi-common.dtsi | 6 +- > .../boot/dts/omap3-overo-tobiduo-common.dtsi | 8 +-- > arch/arm/boot/dts/omap3-sb-t35.dtsi | 4 +- > arch/arm/boot/dts/omap4-duovero-parlor.dts | 6 +- > 21 files changed, 105 insertions(+), 112 deletions(-) > > diff --git a/arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi b/arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi > index 7d0468a23781..f2364cb114c5 100644 > --- a/arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi > +++ b/arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi > @@ -65,7 +65,7 @@ > 1 0 0x2c000000 0x1000000 /* CS1: 16MB for LAN9221 */ > 2 0 0x10000000 0x2000000>; /* CS2: 32MB for NOR */ > > - ethernet@gpmc { > + gpmc_ethernet: ethernet@1,0 { > pinctrl-names = "default"; > pinctrl-0 = <&lan9221_pins>; > interrupt-parent = <&gpio5>; > diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts > index 5532db04046c..6357915d207b 100644 > --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts > +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts > @@ -4,8 +4,8 @@ > > #include "omap36xx.dtsi" > #include "logicpd-torpedo-som.dtsi" > -#include "omap-gpmc-smsc9221.dtsi" > #include "logicpd-torpedo-baseboard.dtsi" > +#include "omap-gpmc-smsc9221.dtsi" > > / { > model = "LogicPD Zoom DM3730 Torpedo + Wireless Development Kit"; > diff --git a/arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi b/arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi > index 533a47bc4a53..05049a34b6f1 100644 > --- a/arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi > +++ b/arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi > @@ -95,7 +95,7 @@ > ranges = <0 0 0x30000000 0x1000000 /* CS0: 16MB for NAND */ > 1 0 0x2c000000 0x1000000>; /* CS1: 16MB for LAN9221 */ > > - ethernet@gpmc { > + gpmc_ethernet: ethernet@1,0 { > pinctrl-names = "default"; > pinctrl-0 = <&lan9221_pins>; > interrupt-parent = <&gpio5>; > diff --git a/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi b/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi > index ded7e8fec9eb..2a462cb65a7d 100644 > --- a/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi > +++ b/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi > @@ -20,36 +20,34 @@ > }; > }; > > -&gpmc { > - ethernet@gpmc { > - compatible = "smsc,lan9221", "smsc,lan9115"; > - bank-width = <2>; > - gpmc,device-width = <1>; > - gpmc,cycle2cycle-samecsen = <1>; > - gpmc,cycle2cycle-diffcsen = <1>; > - gpmc,cs-on-ns = <5>; > - gpmc,cs-rd-off-ns = <150>; > - gpmc,cs-wr-off-ns = <150>; > - gpmc,adv-on-ns = <0>; > - gpmc,adv-rd-off-ns = <15>; > - gpmc,adv-wr-off-ns = <40>; > - gpmc,oe-on-ns = <45>; > - gpmc,oe-off-ns = <140>; > - gpmc,we-on-ns = <45>; > - gpmc,we-off-ns = <140>; > - gpmc,rd-cycle-ns = <155>; > - gpmc,wr-cycle-ns = <155>; > - gpmc,access-ns = <120>; > - gpmc,page-burst-access-ns = <20>; > - gpmc,bus-turnaround-ns = <75>; > - gpmc,cycle2cycle-delay-ns = <75>; > - gpmc,wait-monitoring-ns = <0>; > - gpmc,clk-activation-ns = <0>; > - gpmc,wr-data-mux-bus-ns = <0>; > - gpmc,wr-access-ns = <0>; > - vddvario-supply = <&vddvario>; > - vdd33a-supply = <&vdd33a>; > - reg-io-width = <4>; > - smsc,save-mac-address; > - }; > +&gpmc_ethernet { > + compatible = "smsc,lan9221", "smsc,lan9115"; This looks like regular override-by-label instead of full path. Unfortunately change of the indentation causes difficulties to find the real difference - if there is such. Can you split it into separate patch? The point is that override-by-label should have zero effect on functionality and produce same dtb. This is easy to compare with dtx_diff or fdt-decompile but if you mix it with other changes, the comparison is not straight-forward. > + bank-width = <2>; > + gpmc,device-width = <1>; > + gpmc,cycle2cycle-samecsen; > + gpmc,cycle2cycle-diffcsen; > + gpmc,cs-on-ns = <5>; > + gpmc,cs-rd-off-ns = <150>; > + gpmc,cs-wr-off-ns = <150>; > + gpmc,adv-on-ns = <0>; > + gpmc,adv-rd-off-ns = <15>; > + gpmc,adv-wr-off-ns = <40>; > + gpmc,oe-on-ns = <45>; > + gpmc,oe-off-ns = <140>; > + gpmc,we-on-ns = <45>; > + gpmc,we-off-ns = <140>; > + gpmc,rd-cycle-ns = <155>; > + gpmc,wr-cycle-ns = <155>; > + gpmc,access-ns = <120>; > + gpmc,page-burst-access-ns = <20>; > + gpmc,bus-turnaround-ns = <75>; > + gpmc,cycle2cycle-delay-ns = <75>; > + gpmc,wait-monitoring-ns = <0>; > + gpmc,clk-activation-ns = <0>; > + gpmc,wr-data-mux-bus-ns = <0>; > + gpmc,wr-access-ns = <0>; > + vddvario-supply = <&vddvario>; > + vdd33a-supply = <&vdd33a>; > + reg-io-width = <4>; > + smsc,save-mac-address; > }; > diff --git a/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi b/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi > index 7f6aefd13451..c1e78f929d2b 100644 > --- a/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi > +++ b/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi > @@ -24,36 +24,33 @@ > }; > }; > > -&gpmc { > - ethernet@gpmc { > - compatible = "smsc,lan9221","smsc,lan9115"; > - bank-width = <2>; > +&gpmc_ethernet { > + compatible = "smsc,lan9221","smsc,lan9115"; > + bank-width = <2>; > + gpmc,mux-add-data = <0>; > + gpmc,cs-on-ns = <0>; > + gpmc,cs-rd-off-ns = <42>; > + gpmc,cs-wr-off-ns = <36>; > + gpmc,adv-on-ns = <6>; > + gpmc,adv-rd-off-ns = <12>; > + gpmc,adv-wr-off-ns = <12>; > + gpmc,oe-on-ns = <0>; > + gpmc,oe-off-ns = <42>; > + gpmc,we-on-ns = <0>; > + gpmc,we-off-ns = <36>; > + gpmc,rd-cycle-ns = <60>; > + gpmc,wr-cycle-ns = <54>; > + gpmc,access-ns = <36>; > + gpmc,page-burst-access-ns = <0>; > + gpmc,bus-turnaround-ns = <0>; > + gpmc,cycle2cycle-delay-ns = <0>; > + gpmc,wr-data-mux-bus-ns = <18>; > + gpmc,wr-access-ns = <42>; > + gpmc,cycle2cycle-samecsen; > + gpmc,cycle2cycle-diffcsen; > > - gpmc,mux-add-data; Same here and in other places. Actually here a sneaky change is visible - different property. Best regards, Krzysztof