Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1473277 > unrolled thread

[PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"

Started byJavier Martinez Canillas <javier@osg.samsung.com>
First post2016-08-31 12:40 +0200
Last post2016-09-01 10:50 +0200
Articles 12 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning" Javier Martinez Canillas <javier@osg.samsung.com> - 2016-08-31 12:40 +0200
    [PATCH 06/23] ARM: dts: omap5: Remove skeleton.dtsi usage Javier Martinez Canillas <javier@osg.samsung.com> - 2016-08-31 12:40 +0200
    [PATCH 14/23] ARM: dts: omap4: Add missing unit name to memory nodes Javier Martinez Canillas <javier@osg.samsung.com> - 2016-08-31 12:40 +0200
    [PATCH 13/23] ARM: dts: omap3: Add missing unit name to memory nodes Javier Martinez Canillas <javier@osg.samsung.com> - 2016-08-31 12:40 +0200
    [PATCH 01/23] ARM: am335x: Add missing memory node in sl50 board Javier Martinez Canillas <javier@osg.samsung.com> - 2016-08-31 12:40 +0200
      Re: [PATCH 01/23] ARM: am335x: Add missing memory node in sl50 board Enric Balletbo Serra <eballetbo@gmail.com> - 2016-08-31 15:10 +0200
    [PATCH 02/23] ARM: omap3: Add missing memory node in overo and torpedo boards Javier Martinez Canillas <javier@osg.samsung.com> - 2016-08-31 12:50 +0200
    [PATCH 03/23] ARM: dts: omap2: Remove skeleton.dtsi usage Javier Martinez Canillas <javier@osg.samsung.com> - 2016-08-31 12:50 +0200
    [PATCH 04/23] ARM: dts: omap3: Remove skeleton.dtsi usage Javier Martinez Canillas <javier@osg.samsung.com> - 2016-08-31 12:50 +0200
    Re: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix  memory node DTC warning" Tony Lindgren <tony@atomide.com> - 2016-08-31 16:30 +0200
      Re: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix  memory node DTC warning" Tony Lindgren <tony@atomide.com> - 2016-08-31 20:00 +0200
        Re: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix  memory node DTC warning" Javier Martinez Canillas <javier@osg.samsung.com> - 2016-09-01 10:50 +0200

#1473277 — [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-08-31 12:40 +0200
Subject[PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"
Message-ID<scb61-1h3-3@gated-at.bofh.it>
Hello Tony,

This series removes the usage of the skeleton.dtsi in all the OMAP dts,
which allows to get rid of the DTC warnings about a mismatch between the
memory nodes unit names and reg properties.

Patches are pretty trivial and shouldn't cause functional changes AFAIK,
but have been only built tested.

Best regards,
Javier


Javier Martinez Canillas (23):
  ARM: am335x: Add missing memory node in sl50 board
  ARM: omap3: Add missing memory node in overo and torpedo boards
  ARM: dts: omap2: Remove skeleton.dtsi usage
  ARM: dts: omap3: Remove skeleton.dtsi usage
  ARM: dts: omap4: Remove skeleton.dtsi usage
  ARM: dts: omap5: Remove skeleton.dtsi usage
  ARM: dts: am33xx: Remove skeleton.dtsi usage
  ARM: dts: dm814x: Remove skeleton.dtsi usage
  ARM: dts: dm816x: Remove skeleton.dtsi usage
  ARM: dts: dra7: Remove skeleton.dtsi usage
  ARM: dts: am4372: Remove skeleton.dtsi usage
  ARM: dts: omap2: Add missing unit name to memory nodes
  ARM: dts: omap3: Add missing unit name to memory nodes
  ARM: dts: omap4: Add missing unit name to memory nodes
  ARM: dts: omap5: Add missing unit name to memory nodes
  ARM: dts: am335x: Add missing unit name to memory nodes
  ARM: dts: am3517: Add missing unit name to memory nodes
  ARM: dts: am4372: Add missing unit name to memory nodes
  ARM: dts: am572x: Add missing unit name to memory nodes
  ARM: dts: dm8148: Add missing unit name to memory nodes
  ARM: dts: dm8168: Add missing unit name to memory nodes
  ARM: dts: dra62x: Add missing unit name to memory nodes
  ARM: dts: dra7: Add missing unit name to memory nodes

 arch/arm/boot/dts/am335x-baltos.dtsi           | 2 +-
 arch/arm/boot/dts/am335x-bone-common.dtsi      | 2 +-
 arch/arm/boot/dts/am335x-chilisom.dtsi         | 2 +-
 arch/arm/boot/dts/am335x-cm-t335.dts           | 2 +-
 arch/arm/boot/dts/am335x-evm.dts               | 2 +-
 arch/arm/boot/dts/am335x-evmsk.dts             | 2 +-
 arch/arm/boot/dts/am335x-icev2.dts             | 2 +-
 arch/arm/boot/dts/am335x-igep0033.dtsi         | 2 +-
 arch/arm/boot/dts/am335x-lxm.dts               | 2 +-
 arch/arm/boot/dts/am335x-nano.dts              | 2 +-
 arch/arm/boot/dts/am335x-pepper.dts            | 2 +-
 arch/arm/boot/dts/am335x-phycore-som.dtsi      | 2 +-
 arch/arm/boot/dts/am335x-shc.dts               | 2 +-
 arch/arm/boot/dts/am335x-sl50.dts              | 5 +++++
 arch/arm/boot/dts/am33xx.dtsi                  | 4 ++--
 arch/arm/boot/dts/am3517-craneboard.dts        | 2 +-
 arch/arm/boot/dts/am3517-evm.dts               | 2 +-
 arch/arm/boot/dts/am3517_mt_ventoux.dts        | 2 +-
 arch/arm/boot/dts/am4372.dtsi                  | 8 ++++++--
 arch/arm/boot/dts/am572x-idk.dts               | 2 +-
 arch/arm/boot/dts/am57xx-beagle-x15.dts        | 2 +-
 arch/arm/boot/dts/am57xx-cl-som-am57x.dts      | 2 +-
 arch/arm/boot/dts/dm8148-evm.dts               | 2 +-
 arch/arm/boot/dts/dm8148-t410.dts              | 2 +-
 arch/arm/boot/dts/dm814x.dtsi                  | 4 ++--
 arch/arm/boot/dts/dm8168-evm.dts               | 2 +-
 arch/arm/boot/dts/dm816x.dtsi                  | 4 ++--
 arch/arm/boot/dts/dra62x-j5eco-evm.dts         | 2 +-
 arch/arm/boot/dts/dra7-evm.dts                 | 2 +-
 arch/arm/boot/dts/dra7.dtsi                    | 2 --
 arch/arm/boot/dts/dra72-evm-revc.dts           | 2 +-
 arch/arm/boot/dts/dra72-evm.dts                | 2 +-
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi     | 5 +++++
 arch/arm/boot/dts/omap2.dtsi                   | 4 ++--
 arch/arm/boot/dts/omap2420-h4.dts              | 2 +-
 arch/arm/boot/dts/omap2420-n8x0-common.dtsi    | 2 +-
 arch/arm/boot/dts/omap2430-sdp.dts             | 2 +-
 arch/arm/boot/dts/omap3-beagle-xm.dts          | 2 +-
 arch/arm/boot/dts/omap3-beagle.dts             | 2 +-
 arch/arm/boot/dts/omap3-cm-t3x.dtsi            | 2 +-
 arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
 arch/arm/boot/dts/omap3-evm-37xx.dts           | 2 +-
 arch/arm/boot/dts/omap3-evm.dts                | 2 +-
 arch/arm/boot/dts/omap3-gta04.dtsi             | 2 +-
 arch/arm/boot/dts/omap3-igep.dtsi              | 2 +-
 arch/arm/boot/dts/omap3-ldp.dts                | 2 +-
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi        | 2 +-
 arch/arm/boot/dts/omap3-n900.dts               | 2 +-
 arch/arm/boot/dts/omap3-n950-n9.dtsi           | 2 +-
 arch/arm/boot/dts/omap3-overo-base.dtsi        | 6 ++++++
 arch/arm/boot/dts/omap3-pandora-common.dtsi    | 2 +-
 arch/arm/boot/dts/omap3-sniper.dts             | 2 +-
 arch/arm/boot/dts/omap3-tao3530.dtsi           | 2 +-
 arch/arm/boot/dts/omap3-zoom3.dts              | 2 +-
 arch/arm/boot/dts/omap3.dtsi                   | 4 ++--
 arch/arm/boot/dts/omap3430-sdp.dts             | 2 +-
 arch/arm/boot/dts/omap4-duovero.dtsi           | 2 +-
 arch/arm/boot/dts/omap4-kc1.dts                | 2 +-
 arch/arm/boot/dts/omap4-panda-common.dtsi      | 2 +-
 arch/arm/boot/dts/omap4-sdp.dts                | 2 +-
 arch/arm/boot/dts/omap4-var-som-om44.dtsi      | 2 +-
 arch/arm/boot/dts/omap4.dtsi                   | 4 ++--
 arch/arm/boot/dts/omap5-cm-t54.dts             | 2 +-
 arch/arm/boot/dts/omap5-igep0050.dts           | 2 +-
 arch/arm/boot/dts/omap5-uevm.dts               | 2 +-
 arch/arm/boot/dts/omap5.dtsi                   | 2 --
 66 files changed, 88 insertions(+), 72 deletions(-)

-- 
2.7.4

[toc] | [next] | [standalone]

#1473278 — [PATCH 06/23] ARM: dts: omap5: Remove skeleton.dtsi usage

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-08-31 12:40 +0200
Subject[PATCH 06/23] ARM: dts: omap5: Remove skeleton.dtsi usage
Message-ID<scb62-1h3-41@gated-at.bofh.it>
In reply to#1473277
The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

The disassembled DTB are almost the same besides an empty chosen
node being removed and nodes reordered, so it should not have
functional changes.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/omap5.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 84c10195e79b..71a8f5492c8b 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -11,8 +11,6 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1473279 — [PATCH 14/23] ARM: dts: omap4: Add missing unit name to memory nodes

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-08-31 12:40 +0200
Subject[PATCH 14/23] ARM: dts: omap4: Add missing unit name to memory nodes
Message-ID<scb62-1h3-61@gated-at.bofh.it>
In reply to#1473277
This patch fixes the following DTC warnings:

"Node /memory has a reg or ranges property, but no unit name"

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/omap4-duovero.dtsi      | 2 +-
 arch/arm/boot/dts/omap4-kc1.dts           | 2 +-
 arch/arm/boot/dts/omap4-panda-common.dtsi | 2 +-
 arch/arm/boot/dts/omap4-sdp.dts           | 2 +-
 arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-duovero.dtsi b/arch/arm/boot/dts/omap4-duovero.dtsi
index a90b582e4c3f..ec0bd9779e1a 100644
--- a/arch/arm/boot/dts/omap4-duovero.dtsi
+++ b/arch/arm/boot/dts/omap4-duovero.dtsi
@@ -12,7 +12,7 @@
 	model = "Gumstix Duovero";
 	compatible = "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
diff --git a/arch/arm/boot/dts/omap4-kc1.dts b/arch/arm/boot/dts/omap4-kc1.dts
index 2251bd54e4e6..e3763ac75719 100644
--- a/arch/arm/boot/dts/omap4-kc1.dts
+++ b/arch/arm/boot/dts/omap4-kc1.dts
@@ -13,7 +13,7 @@
 	model = "Amazon Kindle Fire (first generation)";
 	compatible = "amazon,omap4-kc1", "ti,omap4430", "ti,omap4";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512 MB */
 	};
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index f8f13952cfeb..d48e45bd4b3d 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -8,7 +8,7 @@
 #include "elpida_ecb240abacn.dtsi"
 
 / {
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 10d73a784050..d728ec963111 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -14,7 +14,7 @@
 	model = "TI OMAP4 SDP board";
 	compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
diff --git a/arch/arm/boot/dts/omap4-var-som-om44.dtsi b/arch/arm/boot/dts/omap4-var-som-om44.dtsi
index 873cfc87260c..758b6eb7ae43 100644
--- a/arch/arm/boot/dts/omap4-var-som-om44.dtsi
+++ b/arch/arm/boot/dts/omap4-var-som-om44.dtsi
@@ -12,7 +12,7 @@
 	model = "Variscite VAR-SOM-OM44";
 	compatible = "variscite,var-som-om44", "ti,omap4460", "ti,omap4";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1473281 — [PATCH 13/23] ARM: dts: omap3: Add missing unit name to memory nodes

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-08-31 12:40 +0200
Subject[PATCH 13/23] ARM: dts: omap3: Add missing unit name to memory nodes
Message-ID<scb62-1h3-51@gated-at.bofh.it>
In reply to#1473277
This patch fixes the following DTC warnings:

"Node /memory has a reg or ranges property, but no unit name"

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/logicpd-torpedo-som.dtsi     | 2 +-
 arch/arm/boot/dts/omap3-beagle-xm.dts          | 2 +-
 arch/arm/boot/dts/omap3-beagle.dts             | 2 +-
 arch/arm/boot/dts/omap3-cm-t3x.dtsi            | 2 +-
 arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
 arch/arm/boot/dts/omap3-evm-37xx.dts           | 2 +-
 arch/arm/boot/dts/omap3-evm.dts                | 2 +-
 arch/arm/boot/dts/omap3-gta04.dtsi             | 2 +-
 arch/arm/boot/dts/omap3-igep.dtsi              | 2 +-
 arch/arm/boot/dts/omap3-ldp.dts                | 2 +-
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi        | 2 +-
 arch/arm/boot/dts/omap3-n900.dts               | 2 +-
 arch/arm/boot/dts/omap3-n950-n9.dtsi           | 2 +-
 arch/arm/boot/dts/omap3-overo-base.dtsi        | 2 +-
 arch/arm/boot/dts/omap3-pandora-common.dtsi    | 2 +-
 arch/arm/boot/dts/omap3-sniper.dts             | 2 +-
 arch/arm/boot/dts/omap3-tao3530.dtsi           | 2 +-
 arch/arm/boot/dts/omap3-zoom3.dts              | 2 +-
 arch/arm/boot/dts/omap3430-sdp.dts             | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 5a63a8d8e177..731ec37aed5b 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -13,7 +13,7 @@
 		};
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0 0>;
 	};
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 8ffde06281ad..85e297ed0ea1 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -19,7 +19,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index a19d907d4850..4be85ce59dd1 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -19,7 +19,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 6a0df13fa0f3..57b9a028a49a 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -4,7 +4,7 @@
 
 / {
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index 586010179752..f330c69cc683 100644
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -10,7 +10,7 @@
 
 #include "omap34xx.dtsi"
 / {
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>;	/* 256 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-evm-37xx.dts b/arch/arm/boot/dts/omap3-evm-37xx.dts
index ed449827c3d3..4f9a76544602 100644
--- a/arch/arm/boot/dts/omap3-evm-37xx.dts
+++ b/arch/arm/boot/dts/omap3-evm-37xx.dts
@@ -15,7 +15,7 @@
 	model = "TI OMAP37XX EVM (TMDSEVM3730)";
 	compatible = "ti,omap3-evm-37xx", "ti,omap3630", "ti,omap3";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts
index e10dcd0fa539..99b2bfcd1059 100644
--- a/arch/arm/boot/dts/omap3-evm.dts
+++ b/arch/arm/boot/dts/omap3-evm.dts
@@ -14,7 +14,7 @@
 	model = "TI OMAP35XX EVM (TMDSEVM3530)";
 	compatible = "ti,omap3-evm", "ti,omap3";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index c09a0574af90..5563e2533ebd 100644
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -21,7 +21,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index f4f2ce46d681..54c4c07bbe4a 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -13,7 +13,7 @@
 #include "omap36xx.dtsi"
 
 / {
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-ldp.dts b/arch/arm/boot/dts/omap3-ldp.dts
index 2f353dadfa40..e28fe13cb007 100644
--- a/arch/arm/boot/dts/omap3-ldp.dts
+++ b/arch/arm/boot/dts/omap3-ldp.dts
@@ -15,7 +15,7 @@
 	model = "TI OMAP3430 LDP (Zoom1 Labrador)";
 	compatible = "ti,omap3-ldp", "ti,omap3";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x8000000>; /* 128 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index eff816e0bc0a..fa611a5e4850 100644
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -17,7 +17,7 @@
 			bootargs = "console=ttyO0,115200n8 vt.global_cursor_default=0 consoleblank=0";
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x8000000>;   /* 128 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 2a6078a8422c..87ca50b53002 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -54,7 +54,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index 284849008fc5..5d8c4b4a4205 100644
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -24,7 +24,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
index 91b2e423c7c0..401fae838fe9 100644
--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -12,7 +12,7 @@
 
 / {
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0 0>;
 	};
diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index af30d4d99307..53e007abdc71 100644
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -18,7 +18,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-sniper.dts b/arch/arm/boot/dts/omap3-sniper.dts
index 78a1184cb312..bc4498e77bc9 100644
--- a/arch/arm/boot/dts/omap3-sniper.dts
+++ b/arch/arm/boot/dts/omap3-sniper.dts
@@ -20,7 +20,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi
index 644d3c8ea66a..dc80886b5329 100644
--- a/arch/arm/boot/dts/omap3-tao3530.dtsi
+++ b/arch/arm/boot/dts/omap3-tao3530.dtsi
@@ -26,7 +26,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts
index c29b41dc7b95..45e2ce0803de 100644
--- a/arch/arm/boot/dts/omap3-zoom3.dts
+++ b/arch/arm/boot/dts/omap3-zoom3.dts
@@ -20,7 +20,7 @@
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512 MB */
 	};
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index a0dc8d854142..abd6921143be 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -13,7 +13,7 @@
 	model = "TI OMAP3430 SDP";
 	compatible = "ti,omap3430-sdp", "ti,omap3";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1473282 — [PATCH 01/23] ARM: am335x: Add missing memory node in sl50 board

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-08-31 12:40 +0200
Subject[PATCH 01/23] ARM: am335x: Add missing memory node in sl50 board
Message-ID<scb62-1h3-67@gated-at.bofh.it>
In reply to#1473277
The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

But the sl50 board doesn't have a, so removing the  skeleton.dtsi
inclusion from am33xx.dtsi will cause a change in the compiled DTB.

The board has 512 MiB of RAM and its starting address is 0x80000000,
so add a proper memory device node in the DTS.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

 arch/arm/boot/dts/am335x-sl50.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index f802adb23ff9..e3be7a6bf8f1 100644
--- a/arch/arm/boot/dts/am335x-sl50.dts
+++ b/arch/arm/boot/dts/am335x-sl50.dts
@@ -19,6 +19,11 @@
 		};
 	};
 
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x20000000>; /* 512 MB */
+	};
+
 	chosen {
 		stdout-path = &uart0;
 	};
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1473444 — Re: [PATCH 01/23] ARM: am335x: Add missing memory node in sl50 board

FromEnric Balletbo Serra <eballetbo@gmail.com>
Date2016-08-31 15:10 +0200
SubjectRe: [PATCH 01/23] ARM: am335x: Add missing memory node in sl50 board
Message-ID<scdrb-2O7-11@gated-at.bofh.it>
In reply to#1473282
2016-08-31 12:35 GMT+02:00 Javier Martinez Canillas <javier@osg.samsung.com>:
> The skeleton.dtsi file was removed in ARM64 for different reasons as
> explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").
>
> These also applies to ARM and it will also allow to get rid of the
> following DTC warnings in the future:
>
> "Node /memory has a reg or ranges property, but no unit name"
>
> But the sl50 board doesn't have a, so removing the  skeleton.dtsi
> inclusion from am33xx.dtsi will cause a change in the compiled DTB.
>
> The board has 512 MiB of RAM and its starting address is 0x80000000,
> so add a proper memory device node in the DTS.
>
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
>
> ---
>
>  arch/arm/boot/dts/am335x-sl50.dts | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
> index f802adb23ff9..e3be7a6bf8f1 100644
> --- a/arch/arm/boot/dts/am335x-sl50.dts
> +++ b/arch/arm/boot/dts/am335x-sl50.dts
> @@ -19,6 +19,11 @@
>                 };
>         };
>
> +       memory {
> +               device_type = "memory";
> +               reg = <0x80000000 0x20000000>; /* 512 MB */
> +       };
> +
>         chosen {
>                 stdout-path = &uart0;
>         };
> --
> 2.7.4
>

Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

Thanks,
 Enric

[toc] | [prev] | [next] | [standalone]

#1473284 — [PATCH 02/23] ARM: omap3: Add missing memory node in overo and torpedo boards

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-08-31 12:50 +0200
Subject[PATCH 02/23] ARM: omap3: Add missing memory node in overo and torpedo boards
Message-ID<scbfH-1kx-1@gated-at.bofh.it>
In reply to#1473277
The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

But these boards don't have a memory node defined, so removing the
skeleton.dtsi inclusion from omap3.dtsi will cause a change in the
compiled DTB. Add a dummy memory node so the compiled DTB doesn't
change if the skeleton.dtsi is removed from omap3.dtsi.

Eventually the correct starting addresses and sizes should be used
but I didn't find that information.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 5 +++++
 arch/arm/boot/dts/omap3-overo-base.dtsi    | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 1c2c74655416..5a63a8d8e177 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -13,6 +13,11 @@
 		};
 	};
 
+	memory {
+		device_type = "memory";
+		reg = <0 0>;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 		user0 {
diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
index 3e946cac55f3..91b2e423c7c0 100644
--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -11,6 +11,12 @@
  */
 
 / {
+
+	memory {
+		device_type = "memory";
+		reg = <0 0>;
+	};
+
 	pwmleds {
 		compatible = "pwm-leds";
 
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1473289 — [PATCH 03/23] ARM: dts: omap2: Remove skeleton.dtsi usage

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-08-31 12:50 +0200
Subject[PATCH 03/23] ARM: dts: omap2: Remove skeleton.dtsi usage
Message-ID<scbfH-1kx-17@gated-at.bofh.it>
In reply to#1473277
The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

The disassembled DTB are almost the same besides an empty chosen
node being removed and nodes reordered, so it should not have
functional changes.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/omap2.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 578fa2a54dce..4f793a025a72 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -12,11 +12,11 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
 	compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
 	interrupt-parent = <&intc>;
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	aliases {
 		serial0 = &uart1;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1473300 — [PATCH 04/23] ARM: dts: omap3: Remove skeleton.dtsi usage

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-08-31 12:50 +0200
Subject[PATCH 04/23] ARM: dts: omap3: Remove skeleton.dtsi usage
Message-ID<scbfI-1kx-33@gated-at.bofh.it>
In reply to#1473277
The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

The disassembled DTB are almost the same besides an empty chosen
node being removed and nodes reordered, so it should not have
functional changes.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/omap3.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 16cf2fdfec75..353d818ce5a6 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -12,11 +12,11 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
 	compatible = "ti,omap3430", "ti,omap3";
 	interrupt-parent = <&intc>;
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	aliases {
 		i2c0 = &i2c1;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1473541 — Re: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"

FromTony Lindgren <tony@atomide.com>
Date2016-08-31 16:30 +0200
SubjectRe: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"
Message-ID<sceGC-3xO-41@gated-at.bofh.it>
In reply to#1473277
* Javier Martinez Canillas <javier@osg.samsung.com> [160831 03:36]:
> Hello Tony,
> 
> This series removes the usage of the skeleton.dtsi in all the OMAP dts,
> which allows to get rid of the DTC warnings about a mismatch between the
> memory nodes unit names and reg properties.
> 
> Patches are pretty trivial and shouldn't cause functional changes AFAIK,
> but have been only built tested.

OK will take a look today and make sure things stay working.

Good to hear the solution is to remove the include of skeleton.dtsi,
I was wondering what we're going to do about those warnings.

Regards,

Tony

[toc] | [prev] | [next] | [standalone]

#1473767 — Re: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"

FromTony Lindgren <tony@atomide.com>
Date2016-08-31 20:00 +0200
SubjectRe: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"
Message-ID<schXQ-5q6-21@gated-at.bofh.it>
In reply to#1473541
* Tony Lindgren <tony@atomide.com> [160831 07:26]:
> * Javier Martinez Canillas <javier@osg.samsung.com> [160831 03:36]:
> > Hello Tony,
> > 
> > This series removes the usage of the skeleton.dtsi in all the OMAP dts,
> > which allows to get rid of the DTC warnings about a mismatch between the
> > memory nodes unit names and reg properties.
> > 
> > Patches are pretty trivial and shouldn't cause functional changes AFAIK,
> > but have been only built tested.
> 
> OK will take a look today and make sure things stay working.
> 
> Good to hear the solution is to remove the include of skeleton.dtsi,
> I was wondering what we're going to do about those warnings.

Seems to boot just fine for me on various omap variants so
applying all into omap-for-v4.9/dt thanks.

Tony

[toc] | [prev] | [next] | [standalone]

#1474180 — Re: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2016-09-01 10:50 +0200
SubjectRe: [PATCH 00/23] ARM: dts: omap: Remove skeleton.dtsi usage and fix memory node DTC warning"
Message-ID<scvR8-7fO-19@gated-at.bofh.it>
In reply to#1473767
Hello Tony,

On 08/31/2016 07:54 PM, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [160831 07:26]:
>> * Javier Martinez Canillas <javier@osg.samsung.com> [160831 03:36]:
>>> Hello Tony,
>>>
>>> This series removes the usage of the skeleton.dtsi in all the OMAP dts,
>>> which allows to get rid of the DTC warnings about a mismatch between the
>>> memory nodes unit names and reg properties.
>>>
>>> Patches are pretty trivial and shouldn't cause functional changes AFAIK,
>>> but have been only built tested.
>>
>> OK will take a look today and make sure things stay working.
>>
>> Good to hear the solution is to remove the include of skeleton.dtsi,
>> I was wondering what we're going to do about those warnings.
> 
> Seems to boot just fine for me on various omap variants so
> applying all into omap-for-v4.9/dt thanks.
>

Great, thanks a lot for the help.
 
> Tony
> 

Best regards,
---
Javier Martinez Canillas
Open Source Group
Samsung Research America

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web