From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: Re: [PATCH v7 1/4] ARM: dts: tegra: Remove usage of deprecated skeleton.dtsi Date: Mon, 9 Jul 2018 17:27:58 +0200 Message-ID: <20180709152758.GD18353@ulmo> References: <1527144833-24285-1-git-send-email-krzk@kernel.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bjuZg6miEcdLYP6q" Return-path: Content-Disposition: inline In-Reply-To: <1527144833-24285-1-git-send-email-krzk@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Krzysztof Kozlowski Cc: Rob Herring , Mark Rutland , Jonathan Hunter , devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, Marcel Ziswiler , Stefan Agner , Lucas Stach List-Id: devicetree@vger.kernel.org --bjuZg6miEcdLYP6q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 24, 2018 at 08:53:50AM +0200, 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. >=20 > The /chosen and /aliases nodes are added only when dependent DTSes do > not define them. Compiled DTB is the same as before this commit. >=20 > Signed-off-by: Krzysztof Kozlowski > Reviewed-by: Stefan Agner >=20 > --- >=20 > Changes since v6: > 1. Add Stefan's reviewed-by tag. >=20 > 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(-) >=20 > diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114= =2Edtsi > index 0e4a13295d8a..27ef515e5640 100644 > --- a/arch/arm/boot/dts/tegra114.dtsi > +++ b/arch/arm/boot/dts/tegra114.dtsi > @@ -5,11 +5,15 @@ > #include > #include > =20 > -#include "skeleton.dtsi" > - > / { > compatible =3D "nvidia,tegra114"; > interrupt-parent =3D <&lic>; > + #address-cells =3D <1>; > + #size-cells =3D <1>; > + > + memory { > + device_type =3D "memory"; > + }; > =20 > host1x@50000000 { > compatible =3D "nvidia,tegra114-host1x", "simple-bus"; > diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124= =2Edtsi > index 174092bfac90..951feea784af 100644 > --- a/arch/arm/boot/dts/tegra124.dtsi > +++ b/arch/arm/boot/dts/tegra124.dtsi > @@ -7,14 +7,16 @@ > #include > #include > =20 > -#include "skeleton.dtsi" > - > / { > compatible =3D "nvidia,tegra124"; > interrupt-parent =3D <&lic>; > #address-cells =3D <2>; > #size-cells =3D <2>; > =20 > + memory { > + device_type =3D "memory"; > + }; > + > pcie@1003000 { > compatible =3D "nvidia,tegra124-pcie"; > device_type =3D "pci"; > diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.d= tsi > index 0a7136462a1a..88dd1afb5877 100644 > --- a/arch/arm/boot/dts/tegra20.dtsi > +++ b/arch/arm/boot/dts/tegra20.dtsi > @@ -4,11 +4,18 @@ > #include > #include > =20 > -#include "skeleton.dtsi" > - > / { > compatible =3D "nvidia,tegra20"; > interrupt-parent =3D <&lic>; > + #address-cells =3D <1>; > + #size-cells =3D <1>; > + > + chosen { }; > + aliases { }; > + > + memory { > + device_type =3D "memory"; > + }; > =20 > iram@40000000 { > compatible =3D "mmio-sram"; Any idea why Tegra20 here and Tegra30 below get empty chosen and aliases nodes while Tegra114 and Tegra124 don't? Thierry > diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/te= gra30-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 =3D "Toradex Apalis T30"; > compatible =3D "toradex,apalis_t30", "nvidia,tegra30"; > =20 > + memory { > + reg =3D <0 0>; > + }; > + > pcie@3000 { > avdd-pexa-supply =3D <&vdd2_reg>; > vdd-pexa-supply =3D <&vdd2_reg>; > diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.d= tsi > index a110cf84d85f..19237c08c166 100644 > --- a/arch/arm/boot/dts/tegra30.dtsi > +++ b/arch/arm/boot/dts/tegra30.dtsi > @@ -5,11 +5,18 @@ > #include > #include > =20 > -#include "skeleton.dtsi" > - > / { > compatible =3D "nvidia,tegra30"; > interrupt-parent =3D <&lic>; > + #address-cells =3D <1>; > + #size-cells =3D <1>; > + > + chosen { }; > + aliases { }; > + > + memory { > + device_type =3D "memory"; > + }; > =20 > pcie@3000 { > compatible =3D "nvidia,tegra30-pcie"; > --=20 > 2.7.4 >=20 --bjuZg6miEcdLYP6q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAltDfvwACgkQ3SOs138+ s6EA8A/9HoX9mAttPZpyA2xDqoRKQ0NsaVz+MV9Pv1tXqekZZDES/59JUNLUK6Ul jTtKzSo1tksaiZC+kfqfn1QXV4EqpG9IhFgRMNc1SXuBbP7G3PmO7Ji1l99e+Noj plV7aBTujj7kqRIal3KsifvgKn+CyJ+8LS7bCw89NWXTMTlpwzjYgwT7CBNpczNl 1eDnlstYIQn5AuAXI795MIHUNlPPxeupaX+WJS4CFXx8Mo7WwcYZWC2Dr8JiZbYt BWHkOmgNpfZAc1AXimBm8hWHFb9f4yS15We7BXAxjDsN00eXRKWd38+Z9vz/YfIH 69petUoITag+JQNVm03YN2jR33x4RExkZ6rignHlpJT0Vs0seBv7alaeyV7EJpQQ 5OCzT/HnQs5wSZjWxE2D5udcaoaOwBCk3BNIvb8gnCr/UTTOkTqK2U2+jzsAT1Wl YLrC0ue+xH7Do/ICIYjVQAAEpWo5EzHpReeEkai4PA6v9dF9gTuOKLqZlo0mlCpv tG9I1SS5O5Ts9II5fpvKUBg3m+1RJYxV8IXC97BSJZRQTJkSRsFhkLSeZzdPbWMH ZrsW/42CcEtwU8utzkYvZaK+/+FSSu6W5C2M/XySZ4JmA4f1aD8rxq6LvSI79YMK j3bRMILPvTdSCzCxtCyhZlftN/GxqLP7Bfg6MdeLjUE78qLlmDI= =aG6/ -----END PGP SIGNATURE----- --bjuZg6miEcdLYP6q--