From: Maxime Ripard <maxime.ripard@bootlin.com>
Date: Wed, 21 Nov 2018 08:39:24 +0000 (+0100)
Subject: ARM: dts: sun6i: Remove skeleton and memory to avoid warnings
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~5611^2~2^2~62
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=86f085c58b984a6cb25a74db5a21ec1997b5ace4;p=linux.git

ARM: dts: sun6i: Remove skeleton and memory to avoid warnings

Using skeleton.dtsi will create a memory node that will generate a warning
in DTC. However, that node will be created by the bootloader, so we can
just remove it entirely in order to remove that warning.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
---

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 1eaa60cd3218..b60aaacbab5e 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -42,8 +42,6 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
-
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/thermal/thermal.h>
 
@@ -52,6 +50,8 @@
 
 / {
 	interrupt-parent = <&gic>;
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	aliases {
 		ethernet0 = &gmac;
@@ -199,10 +199,6 @@
 		};
 	};
 
-	memory {
-		reg = <0x40000000 0x80000000>;
-	};
-
 	pmu {
 		compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu";
 		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,