ARM: dts: sun8i: a23/a33: 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/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index c16ffcc4db7da0831dc16a84e4c2fcb093c90987..a198894a33fd14eb79104588ce5e34f7607c56b7 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -42,8 +42,6 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
-
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 #include <dt-bindings/clock/sun8i-a23-a33-ccu.h>
@@ -51,6 +49,8 @@
 
 / {
        interrupt-parent = <&gic>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        chosen {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
index 58e6585b504bab464c3845b2f4a16cb6769f6f26..7751c43fc806b756ad56133b247d3570d60826bb 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -45,10 +45,6 @@
 #include "sun8i-a23-a33.dtsi"
 
 / {
-       memory {
-               reg = <0x40000000 0x40000000>;
-       };
-
        soc@1c00000 {
                codec: codec@1c22c00 {
                        #sound-dai-cells = <0>;

diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 1c4f7e1930d857e93b6837dfc1a0fe3787cac7ca..163c3ff7f6704f116114810ad2a5ba676b4ad924 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -186,10 +186,6 @@
                };
        };
 
-       memory {
-               reg = <0x40000000 0x80000000>;
-       };
-
        reserved-memory {
                #address-cells = <1>;
                #size-cells = <1>;