From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932526AbeEWKqR (ORCPT ); Wed, 23 May 2018 06:46:17 -0400 Received: from mail.kmu-office.ch ([178.209.48.109]:52682 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932424AbeEWKqL (ORCPT ); Wed, 23 May 2018 06:46:11 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Date: Wed, 23 May 2018 12:46:09 +0200 From: Stefan Agner To: Krzysztof Kozlowski Cc: Rob Herring , Mark Rutland , Thierry Reding , Jonathan Hunter , devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, Marcel Ziswiler , Lucas Stach Subject: Re: [PATCH v6 1/4] ARM: dts: tegra: Remove usage of deprecated skeleton.dtsi In-Reply-To: <1527069406-6359-1-git-send-email-krzk@kernel.org> References: <1527069406-6359-1-git-send-email-krzk@kernel.org> Message-ID: <9a42132399d8ea69b5b7ce76c442b7b0@agner.ch> User-Agent: Roundcube Webmail/1.3.4 X-Spamd-Result: default: False [-3.10 / 15.00]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_RCPT(0.00)[dt]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[10]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; ASN(0.00)[asn:29691, ipnet:2a02:418::/29, country:CH]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23.05.2018 11:56, Krzysztof Kozlowski wrote: > Remove the usage of skeleton.dtsi because it was deprecated since commit > 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as deprecated"). > It also allows later to fix DTC warnings for missing unit name in > /memory nodes. > > The /chosen and /aliases nodes are added only when dependent DTSes do > not define them. Compiled DTB is the same as before this commit. > > Signed-off-by: Krzysztof Kozlowski Hm I see, you cannot add unit address here because the board level device tree do not have it yet... That makes the split indeed a bit less appealing. Anyway, now we have it, and I think it is still nice to have a separate change. Reviewed-by: Stefan Agner -- Stefan > > --- > > Changes since v5: > 1. New patch, split with skeleton.dtsi removal (suggested by Stefan). > --- > arch/arm/boot/dts/tegra114.dtsi | 8 ++++++-- > arch/arm/boot/dts/tegra124.dtsi | 6 ++++-- > arch/arm/boot/dts/tegra20.dtsi | 11 +++++++++-- > arch/arm/boot/dts/tegra30-apalis.dtsi | 4 ++++ > arch/arm/boot/dts/tegra30.dtsi | 11 +++++++++-- > 5 files changed, 32 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi > index 0e4a13295d8a..27ef515e5640 100644 > --- a/arch/arm/boot/dts/tegra114.dtsi > +++ b/arch/arm/boot/dts/tegra114.dtsi > @@ -5,11 +5,15 @@ > #include > #include > > -#include "skeleton.dtsi" > - > / { > compatible = "nvidia,tegra114"; > interrupt-parent = <&lic>; > + #address-cells = <1>; > + #size-cells = <1>; > + > + memory { > + device_type = "memory"; > + }; > > host1x@50000000 { > compatible = "nvidia,tegra114-host1x", "simple-bus"; > diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi > index 174092bfac90..951feea784af 100644 > --- a/arch/arm/boot/dts/tegra124.dtsi > +++ b/arch/arm/boot/dts/tegra124.dtsi > @@ -7,14 +7,16 @@ > #include > #include > > -#include "skeleton.dtsi" > - > / { > compatible = "nvidia,tegra124"; > interrupt-parent = <&lic>; > #address-cells = <2>; > #size-cells = <2>; > > + memory { > + device_type = "memory"; > + }; > + > pcie@1003000 { > compatible = "nvidia,tegra124-pcie"; > device_type = "pci"; > diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi > index 0a7136462a1a..88dd1afb5877 100644 > --- a/arch/arm/boot/dts/tegra20.dtsi > +++ b/arch/arm/boot/dts/tegra20.dtsi > @@ -4,11 +4,18 @@ > #include > #include > > -#include "skeleton.dtsi" > - > / { > compatible = "nvidia,tegra20"; > interrupt-parent = <&lic>; > + #address-cells = <1>; > + #size-cells = <1>; > + > + chosen { }; > + aliases { }; > + > + memory { > + device_type = "memory"; > + }; > > iram@40000000 { > compatible = "mmio-sram"; > diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi > b/arch/arm/boot/dts/tegra30-apalis.dtsi > index d1d21ec2a844..6f29cbad6e8a 100644 > --- a/arch/arm/boot/dts/tegra30-apalis.dtsi > +++ b/arch/arm/boot/dts/tegra30-apalis.dtsi > @@ -10,6 +10,10 @@ > model = "Toradex Apalis T30"; > compatible = "toradex,apalis_t30", "nvidia,tegra30"; > > + memory { > + reg = <0 0>; > + }; > + > pcie@3000 { > avdd-pexa-supply = <&vdd2_reg>; > vdd-pexa-supply = <&vdd2_reg>; > diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi > index a110cf84d85f..19237c08c166 100644 > --- a/arch/arm/boot/dts/tegra30.dtsi > +++ b/arch/arm/boot/dts/tegra30.dtsi > @@ -5,11 +5,18 @@ > #include > #include > > -#include "skeleton.dtsi" > - > / { > compatible = "nvidia,tegra30"; > interrupt-parent = <&lic>; > + #address-cells = <1>; > + #size-cells = <1>; > + > + chosen { }; > + aliases { }; > + > + memory { > + device_type = "memory"; > + }; > > pcie@3000 { > compatible = "nvidia,tegra30-pcie";