Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abe60a3a authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

ARM: dts: Kill off skeleton{64}.dtsi 



Remove the usage of skeleton.dtsi in the remaining dts files. It was
deprecated since commit 9c0da3cc ("ARM: dts: explicitly mark
skeleton.dtsi as deprecated"). This will make adding a unit-address to
memory nodes easier.

The main tricky part to removing skeleton.dtsi is we could end up with
no /memory node at all when a bootloader depends on one being present. I
hacked up dtc to check for this condition.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Acked-by: default avatarAlexandre TORGUE <alexandre.torgue@st.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Tested-by: default avatarKevin Hilman <khilman@baylibre.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Tested-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Tested-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6569df3d

arch/arm/boot/dts/alphascale-asm9260.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -4,10 +4,11 @@ 
 * Licensed under the X11 license or the GPL v2 (or later)

 */



#include "skeleton.dtsi"

#include <dt-bindings/clock/alphascale,asm9260.h>



/ {

	#address-cells = <1>;

	#size-cells = <1>;

	interrupt-parent = <&icoll>;



	memory {

arch/arm/boot/dts/alpine.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -25,12 +25,18 @@ 
 */



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

#include "skeleton64.dtsi"



/ {

	#address-cells = <2>;

	#size-cells = <2>;

	/* SOC compatibility */

	compatible = "al,alpine";



	memory {

		device_type = "memory";

		reg = <0 0 0 0>;

	};



	/* CPU Configuration */

	cpus {

		#address-cells = <1>;

arch/arm/boot/dts/arm-realview-eb.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ 


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

#include <dt-bindings/gpio/gpio.h>

#include "skeleton.dtsi"



/ {

	#address-cells = <1>;

	#size-cells = <1>;

	compatible = "arm,realview-eb";



	chosen { };
@@ -38,6 +39,7 @@ 
	};



	memory {

		device_type = "memory";

		/* 128 MiB memory @ 0x0 */

		reg = <0x00000000 0x08000000>;

	};

arch/arm/boot/dts/arm-realview-pb1176.dts

+3 −1
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ 
/dts-v1/;

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

#include <dt-bindings/gpio/gpio.h>

#include "skeleton.dtsi"



/ {

	#address-cells = <1>;

	#size-cells = <1>;

	model = "ARM RealView PB1176";

	compatible = "arm,realview-pb1176";
@@ -40,6 +41,7 @@ 
	};



	memory {

		device_type = "memory";

		/* 128 MiB memory @ 0x0 */

		reg = <0x00000000 0x08000000>;

	};

arch/arm/boot/dts/arm-realview-pb11mp.dts

+3 −1
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ 
/dts-v1/;

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

#include <dt-bindings/gpio/gpio.h>

#include "skeleton.dtsi"



/ {

	#address-cells = <1>;

	#size-cells = <1>;

	model = "ARM RealView PB11MPcore";

	compatible = "arm,realview-pb11mp";
@@ -39,6 +40,7 @@ 
	};



	memory {

		device_type = "memory";

		/*

		 * The PB11MPCore has 512 MiB memory @ 0x70000000

		 * and the first 256 are also remapped @ 0x00000000