From abe60a3a7afb4058278864aa18c5faf62094c11a Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 9 Jan 2019 10:26:14 -0600 Subject: ARM: dts: Kill off skeleton{64}.dtsi Remove the usage of skeleton.dtsi in the remaining dts files. It was deprecated since commit 9c0da3cc61f1 ("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: Linus Walleij Reviewed-by: Florian Fainelli Reviewed-by: Matthias Brugger Acked-by: Viresh Kumar Acked-by: Alexandre Belloni Acked-by: Neil Armstrong Acked-by: Antoine Tenart Acked-by: Alexandre TORGUE Acked-by: Robert Jarzmik Acked-by: Vladimir Zapolskiy Tested-by: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Martin Blumenstingl Reviewed-by: Martin Blumenstingl Signed-off-by: Rob Herring Reviewed-by: Gregory CLEMENT Tested-by: Gregory CLEMENT Signed-off-by: Arnd Bergmann --- arch/arm/boot/dts/at91sam9260.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/at91sam9260.dtsi') diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index 7cd9c3bc4dfb..3b58b94b53c9 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi @@ -8,13 +8,14 @@ * Licensed under GPLv2 or later. */ -#include "skeleton.dtsi" #include #include #include #include / { + #address-cells = <1>; + #size-cells = <1>; model = "Atmel AT91SAM9260 family SoC"; compatible = "atmel,at91sam9260"; interrupt-parent = <&aic>; @@ -46,6 +47,7 @@ }; memory { + device_type = "memory"; reg = <0x20000000 0x04000000>; }; -- cgit v1.2.3-59-g8ed1b