Commit f48ba1ae authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Thierry Reding
Browse files

ARM: tegra: Remove usage of deprecated skeleton.dtsi 



Remove the usage of skeleton.dtsi because it was deprecated since commit
9c0da3cc ("ARM: dts: explicitly mark skeleton.dtsi as deprecated").
It also allows later to fix DTC warnings for missing unit name in
/memory nodes.

Compiled DTBs are the same as before this commit.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 700253e7

arch/arm/boot/dts/tegra114.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -5,11 +5,15 @@ 
#include <dt-bindings/pinctrl/pinctrl-tegra.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#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";

arch/arm/boot/dts/tegra124.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -7,14 +7,16 @@ 
#include <dt-bindings/reset/tegra124-car.h>

#include <dt-bindings/thermal/tegra124-soctherm.h>



#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";

arch/arm/boot/dts/tegra20.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -5,11 +5,15 @@ 
#include <dt-bindings/pinctrl/pinctrl-tegra.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "skeleton.dtsi"



/ {

	compatible = "nvidia,tegra20";

	interrupt-parent = <&lic>;

	#address-cells = <1>;

	#size-cells = <1>;



	memory {

		device_type = "memory";

	};



	iram@40000000 {

		compatible = "mmio-sram";

arch/arm/boot/dts/tegra30-apalis.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/tegra30.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -5,11 +5,15 @@ 
#include <dt-bindings/pinctrl/pinctrl-tegra.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "skeleton.dtsi"



/ {

	compatible = "nvidia,tegra30";

	interrupt-parent = <&lic>;

	#address-cells = <1>;

	#size-cells = <1>;



	memory {

		device_type = "memory";

	};



	pcie@3000 {

		compatible = "nvidia,tegra30-pcie";

CRA Git | Maintained and supported by SUSTech CRA and CCSE