remove skeleton.dtsi from armv7-m.dtsi
Subsystems (4)
cover remove skeleton.dtsi from armv7-m.dtsi
Hi
This patch set removes skeleton.dtsi from the common ARM Cortex-M dtsi. This will allow us to remove skeleton.dtsi on a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes.
See 3ebee5a2e141 ("arm64: dts: kill skeleton.dtsi") for additional reasons not to use the skeleton.dtsi.
I plan to take atleast the first two patches through the lpc18xx tree. Please ack if you are okey with the change to your platform dtsi file.
Joachim Eastwood (3):
ARM: dts: armv7-m: remove skeleton.dtsi include
ARM: dts: lpc18xx: remove skeleton.dtsi include and fix unit address warnings
ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
arch/arm/boot/dts/armv7-m.dtsi | 2 -- arch/arm/boot/dts/efm32gg-dk3750.dts | 5 +++-- arch/arm/boot/dts/efm32gg.dtsi | 4 ++++ arch/arm/boot/dts/lpc18xx.dtsi | 3 +++ arch/arm/boot/dts/lpc4337-ciaa.dts | 2 +- arch/arm/boot/dts/lpc4350-hitex-eval.dts | 2 +- arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 2 +- arch/arm/boot/dts/mps2.dtsi | 1 + arch/arm/boot/dts/stm32f429.dtsi | 1 + arch/arm/boot/dts/vf610m4.dtsi | 1 + 10 files changed, 16 insertions(+), 7 deletions(-)
Signature · 1 line
2.9.3
PATCH 1/3 ARM: dts: armv7-m: remove skeleton.dtsi include
Remove skeleton.dtsi from the common ARM Cortex-M dtsi. This will allow us to remove skeleton.dtsi on a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes.
See 3ebee5a2e141 ("arm64: dts: kill skeleton.dtsi") for additional reasons not to use the skeleton.dtsi.
--- arch/arm/boot/dts/armv7-m.dtsi | 2 -- arch/arm/boot/dts/efm32gg.dtsi | 2 ++ arch/arm/boot/dts/lpc18xx.dtsi | 1 + arch/arm/boot/dts/mps2.dtsi | 1 + arch/arm/boot/dts/stm32f429.dtsi | 1 + arch/arm/boot/dts/vf610m4.dtsi | 1 + 6 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/armv7-m.dtsi +0 -2
@@ -1,5 +1,3 @@ -#include "skeleton.dtsi" - / { nvic: interrupt-controller at e000e100 { compatible = "arm,armv7m-nvic";
arch/arm/boot/dts/efm32gg.dtsi +2 -0
@@ -4,6 +4,8 @@ * Documentation available from * http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf */ + +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/efm32-cmu.h"
arch/arm/boot/dts/lpc18xx.dtsi +1 -0
@@ -11,6 +11,7 @@ * */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/lpc18xx-cgu.h"
arch/arm/boot/dts/mps2.dtsi +1 -0
@@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" / {
arch/arm/boot/dts/stm32f429.dtsi +1 -0
@@ -45,6 +45,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
arch/arm/boot/dts/vf610m4.dtsi +1 -0
@@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "vfxxx.dtsi"
Signature · 1 line
2.9.3
PATCH 1/3 ARM: dts: armv7-m: remove skeleton.dtsi include
Quoted 8 lines · Joachim Eastwood
Remove
skeleton.dtsifrom the common ARM Cortex-M dtsi. This will allow us to removeskeleton.dtsion a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes.See
3ebee5a2e141("arm64: dts: killskeleton.dtsi") for additional reasons not to use theskeleton.dtsi.
Quoted 8 lines
Signed-off-by Joachim Eastwood <[email protected]>--- arch/arm/boot/dts/armv7-m.dtsi | 2 -- arch/arm/boot/dts/efm32gg.dtsi | 2 ++ arch/arm/boot/dts/lpc18xx.dtsi | 1 + arch/arm/boot/dts/mps2.dtsi | 1 + arch/arm/boot/dts/stm32f429.dtsi | 1 + arch/arm/boot/dts/vf610m4.dtsi | 1 +
For VF610:
Quoted 72 lines
6 files changed, 6 insertions(+), 2 deletions(-)arch/arm/boot/dts/armv7-m.dtsi +0
-2@@ -1,5 +1,3 @@ -#include "skeleton.dtsi" - / { nvic: interrupt-controller at e000e100 { compatible = "arm,armv7m-nvic";arch/arm/boot/dts/efm32gg.dtsi +2
-0@@ -4,6 +4,8 @@ * Documentation available from * http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf */ + +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/efm32-cmu.h"arch/arm/boot/dts/lpc18xx.dtsi +1
-0@@ -11,6 +11,7 @@ * */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/lpc18xx-cgu.h"arch/arm/boot/dts/mps2.dtsi +1
-0@@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" / {arch/arm/boot/dts/stm32f429.dtsi +1
-0@@ -45,6 +45,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>arch/arm/boot/dts/vf610m4.dtsi +1
-0@@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "vfxxx.dtsi"
PATCH 1/3 ARM: dts: armv7-m: remove skeleton.dtsi include
Hi Joachim,
Quoted 79 lines · Stefan Agner
Quoted 8 lines · Joachim Eastwood
Remove
skeleton.dtsifrom the common ARM Cortex-M dtsi. This will allow us to removeskeleton.dtsion a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes.See
3ebee5a2e141("arm64: dts: killskeleton.dtsi") for additional reasons not to use theskeleton.dtsi.Quoted 8 lines
Signed-off-by Joachim Eastwood <[email protected]>--- arch/arm/boot/dts/armv7-m.dtsi | 2 -- arch/arm/boot/dts/efm32gg.dtsi | 2 ++ arch/arm/boot/dts/lpc18xx.dtsi | 1 + arch/arm/boot/dts/mps2.dtsi | 1 + arch/arm/boot/dts/stm32f429.dtsi | 1 + arch/arm/boot/dts/vf610m4.dtsi | 1 +For VF610:
Acked-by Stefan Agner <[email protected]>Quoted 57 lines
6 files changed, 6 insertions(+), 2 deletions(-)arch/arm/boot/dts/armv7-m.dtsi +0
-2@@ -1,5 +1,3 @@ -#include "skeleton.dtsi" - / { nvic: interrupt-controller at e000e100 { compatible = "arm,armv7m-nvic";arch/arm/boot/dts/efm32gg.dtsi +2
-0@@ -4,6 +4,8 @@ * Documentation available from * http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf */ + +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/efm32-cmu.h"arch/arm/boot/dts/lpc18xx.dtsi +1
-0@@ -11,6 +11,7 @@ * */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/lpc18xx-cgu.h"arch/arm/boot/dts/mps2.dtsi +1
-0@@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" / {arch/arm/boot/dts/stm32f429.dtsi +0
-0@@ -45,6 +45,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */
Quoted 4 lines
arch/arm/boot/dts/stm32f429.dtsi line 51
Quoted 4 lines
arch/arm/boot/dts/stm32f429.dtsi +1
-0+#include "skeleton.dtsi" #include "armv7-m.dtsi" #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
For stm32f429 platform:
Regards
Alex
Quoted 17 lines
arch/arm/boot/dts/vf610m4.dtsi line 47
Quoted 11 lines
arch/arm/boot/dts/vf610m4.dtsi +1
-0@@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "vfxxx.dtsi"_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/3 ARM: dts: armv7-m: remove skeleton.dtsi include
In reply to Joachim EastwoodHi Alexandre,
Just noticed that you were listed as a co-maintainer for stm32. Could you take a look and ack the patch below?
You can find the cover letter for the series here:
http://www.spinics.net/lists/arm-kernel/msg527580.html
regards,
Joachim Eastwood
---------- Forwarded message ----------
From: Joachim Eastwood <[email protected]>
Date: 30 August 2016 at 22:52
Subject: [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include
To: stefan at agner.ch, mcoquelin.stm32 at gmail.com, vladimir.murzin at arm.com, u.kleine-koenig at pengutronix.de
Cc: Joachim Eastwood <[email protected]>, linux-arm-kernel at lists.infradead.org, robh+dt at kernel.org
Remove skeleton.dtsi from the common ARM Cortex-M dtsi. This will allow us to remove skeleton.dtsi on a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes.
See 3ebee5a2e141 ("arm64: dts: kill skeleton.dtsi") for additional reasons not to use the skeleton.dtsi.
--- arch/arm/boot/dts/armv7-m.dtsi | 2 -- arch/arm/boot/dts/efm32gg.dtsi | 2 ++ arch/arm/boot/dts/lpc18xx.dtsi | 1 + arch/arm/boot/dts/mps2.dtsi | 1 + arch/arm/boot/dts/stm32f429.dtsi | 1 + arch/arm/boot/dts/vf610m4.dtsi | 1 + 6 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/armv7-m.dtsi +0 -2
@@ -1,5 +1,3 @@ -#include "skeleton.dtsi" - / { nvic: interrupt-controller at e000e100 { compatible = "arm,armv7m-nvic";
arch/arm/boot/dts/efm32gg.dtsi +2 -0
@@ -4,6 +4,8 @@ * Documentation available from * http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf */ + +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/efm32-cmu.h"
arch/arm/boot/dts/lpc18xx.dtsi +1 -0
@@ -11,6 +11,7 @@ * */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/lpc18xx-cgu.h"
arch/arm/boot/dts/mps2.dtsi +1 -0
@@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" / {
arch/arm/boot/dts/stm32f429.dtsi +1 -0
@@ -45,6 +45,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
arch/arm/boot/dts/vf610m4.dtsi +1 -0
@@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "vfxxx.dtsi"
--
2.9.3
PATCH 1/3 ARM: dts: armv7-m: remove skeleton.dtsi include
In reply to Joachim EastwoodQuoted 9 lines · Joachim Eastwood
Remove
skeleton.dtsifrom the common ARM Cortex-M dtsi. This will allow us to removeskeleton.dtsion a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes.See
3ebee5a2e141("arm64: dts: killskeleton.dtsi") for additional reasons not to use theskeleton.dtsi.Signed-off-by Joachim Eastwood <[email protected]>
Thanks
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 2/3 ARM: dts: lpc18xx: remove skeleton.dtsi include and fix unit address warnings
In reply to Joachim EastwoodRemovale of skeleton.dtsi allows us also to fix the following
warning from the dts compiler:
Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
by adding proper unit addresses to the memory nodes.
--- arch/arm/boot/dts/lpc18xx.dtsi | 4 +++- arch/arm/boot/dts/lpc4337-ciaa.dts | 2 +- arch/arm/boot/dts/lpc4350-hitex-eval.dts | 2 +- arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-)
arch/arm/boot/dts/lpc18xx.dtsi +3 -1
@@ -11,7 +11,6 @@ * */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/lpc18xx-cgu.h"
@@ -21,6 +20,9 @@ #define LPC_GPIO(port, pin) (port * 32 + pin) / { + #address-cells = <1>; + #size-cells = <1>; + cpus { #address-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/lpc4337-ciaa.dts +1 -1
@@ -30,7 +30,7 @@ stdout-path = &uart2; }; - memory { + memory at 28000000 { device_type = "memory"; reg = <0x28000000 0x0800000>; /* 8 MB */ };
arch/arm/boot/dts/lpc4350-hitex-eval.dts +1 -1
@@ -34,7 +34,7 @@ stdout-path = &uart0; }; - memory { + memory at 28000000 { device_type = "memory"; reg = <0x28000000 0x800000>; /* 8 MB */ };
arch/arm/boot/dts/lpc4357-ea4357-devkit.dts +1 -1
@@ -35,7 +35,7 @@ stdout-path = &uart0; }; - memory { + memory at 28000000 { device_type = "memory"; reg = <0x28000000 0x2000000>; /* 32 MB */ };
Signature · 1 line
2.9.3
PATCH 3/3 ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
In reply to Joachim EastwoodRemovale of skeleton.dtsi allows us also to fix the following
warning from the dts compiler:
Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
by adding proper unit addresses to the memory nodes. Also add missing device_type to the memory node while at it.
---
Hi Uwe,
If you want I can take this through the lpc18xx tree. There doesn't seem too be many patches for efm32 lately (last one dates from 2014).
arch/arm/boot/dts/efm32gg-dk3750.dts | 5 +++-- arch/arm/boot/dts/efm32gg.dtsi | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-)
arch/arm/boot/dts/efm32gg-dk3750.dts +3 -2
@@ -16,7 +16,8 @@ bootargs = "console=ttyefm4,115200 init=/linuxrc ignore_loglevel ihash_entries=64 dhash_entries=64 earlyprintk uclinux.physaddr=0x8c400000 root=/dev/mtdblock0"; }; - memory { + memory at 88000000 { + device_type = "memory"; reg = <0x88000000 0x400000>; };
@@ -74,7 +75,7 @@ status = "ok"; }; - boardfpga: boardfpga { + boardfpga: boardfpga at 80000000 { compatible = "efm32board"; reg = <0x80000000 0x400>; irq-gpios = <&gpio 64 1>;
arch/arm/boot/dts/efm32gg.dtsi +3 -1
@@ -5,11 +5,13 @@ * http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/efm32-cmu.h" / { + #address-cells = <1>; + #size-cells = <1>; + aliases { i2c0 = &i2c0; i2c1 = &i2c1;
Signature · 1 line
2.9.3
PATCH 3/3 ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
Quoted 7 lines · Joachim Eastwood
Removale of
skeleton.dtsiallows us also to fix the following
warning from the dts compiler:
Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit nameby adding proper unit addresses to the memory nodes. Also add missing
device_typeto the memory node while at it.
Quoted 6 lines
Signed-off-by Joachim Eastwood <[email protected]>---
Hi Uwe,If you want I can take this through the lpc18xx tree. There doesn't seem too be many patches for efm32 lately (last one dates from 2014).
That's fine for me.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 3/3 ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
Hi Uwe,
Quoted 12 lines · Uwe Kleine-K?nig
Quoted 11 lines · Joachim Eastwood
Removale of
skeleton.dtsiallows us also to fix the following
warning from the dts compiler:
Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit nameby adding proper unit addresses to the memory nodes. Also add missing
device_typeto the memory node while at it.Signed-off-by Joachim Eastwood <[email protected]>---
Hi Uwe,
Quoted 6 lines
Quoted 2 lines
If you want I can take this through the lpc18xx tree. There doesn't seem too be many patches for efm32 lately (last one dates from 2014).
That's fine for me.
Acked-by Uwe Kleine-K?nig <[email protected]>
Thanks.
Could you also ack patch number 1 that touches armv7-m.dtsi? I would like to have your ack since you are the originale author of that file and it touches efm32 as well.
regards,
Joachim Eastwood
cover remove skeleton.dtsi from armv7-m.dtsi
In reply to Joachim EastwoodQuoted 10 lines · Joachim Eastwood
Hi
This patch set removes
skeleton.dtsifrom the common ARM Cortex-M dtsi. This will allow us to removeskeleton.dtsion a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes.See
3ebee5a2e141("arm64: dts: killskeleton.dtsi") for additional reasons not to use theskeleton.dtsi.
Quoted 8 lines
I plan to take atleast the first two patches through the lpc18xx tree. Please ack if you are okey with the change to your platform dtsi file.
Joachim Eastwood (3):
ARM: dts: armv7-m: removeskeleton.dtsiinclude
ARM: dts: lpc18xx: removeskeleton.dtsiinclude and fix unit address warnings
ARM: dts: efm32: removeskeleton.dtsiinclude and fix unit address warnings
For the series,
cover remove skeleton.dtsi from armv7-m.dtsi
In reply to Joachim EastwoodQuoted 19 lines · Joachim Eastwood
Hi
This patch set removes
skeleton.dtsifrom the common ARM Cortex-M dtsi. This will allow us to removeskeleton.dtsion a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes.See
3ebee5a2e141("arm64: dts: killskeleton.dtsi") for additional reasons not to use theskeleton.dtsi.I plan to take atleast the first two patches through the lpc18xx tree. Please ack if you are okey with the change to your platform dtsi file.
Joachim Eastwood (3):
ARM: dts: armv7-m: removeskeleton.dtsiinclude
ARM: dts: lpc18xx: removeskeleton.dtsiinclude and fix unit address warnings
ARM: dts: efm32: removeskeleton.dtsiinclude and fix unit address warnings
Quoted 12 lines
arch/arm/boot/dts/armv7-m.dtsi | 2 -- arch/arm/boot/dts/efm32gg-dk3750.dts | 5 +++-- arch/arm/boot/dts/efm32gg.dtsi | 4 ++++ arch/arm/boot/dts/lpc18xx.dtsi | 3 +++ arch/arm/boot/dts/lpc4337-ciaa.dts | 2 +- arch/arm/boot/dts/lpc4350-hitex-eval.dts | 2 +- arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 2 +- arch/arm/boot/dts/mps2.dtsi | 1 + arch/arm/boot/dts/stm32f429.dtsi | 1 + arch/arm/boot/dts/vf610m4.dtsi | 1 + 10 files changed, 16 insertions(+), 7 deletions(-)
For MPS2: