* [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include
2016-08-30 20:52 [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi Joachim Eastwood
@ 2016-08-30 20:52 ` Joachim Eastwood
2016-08-30 22:14 ` Stefan Agner
` (2 more replies)
2016-08-30 20:52 ` [PATCH 2/3] ARM: dts: lpc18xx: remove skeleton.dtsi include and fix unit address warnings Joachim Eastwood
` (3 subsequent siblings)
4 siblings, 3 replies; 12+ messages in thread
From: Joachim Eastwood @ 2016-08-30 20:52 UTC (permalink / raw)
To: linux-arm-kernel
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.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
---
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(-)
diff --git a/arch/arm/boot/dts/armv7-m.dtsi b/arch/arm/boot/dts/armv7-m.dtsi
index 16331aa..ba332e3 100644
--- a/arch/arm/boot/dts/armv7-m.dtsi
+++ b/arch/arm/boot/dts/armv7-m.dtsi
@@ -1,5 +1,3 @@
-#include "skeleton.dtsi"
-
/ {
nvic: interrupt-controller at e000e100 {
compatible = "arm,armv7m-nvic";
diff --git a/arch/arm/boot/dts/efm32gg.dtsi b/arch/arm/boot/dts/efm32gg.dtsi
index c747983..d9dbf7f 100644
--- a/arch/arm/boot/dts/efm32gg.dtsi
+++ b/arch/arm/boot/dts/efm32gg.dtsi
@@ -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"
diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi
index 1cd39fd..a1ecfe3 100644
--- a/arch/arm/boot/dts/lpc18xx.dtsi
+++ b/arch/arm/boot/dts/lpc18xx.dtsi
@@ -11,6 +11,7 @@
*
*/
+#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include "dt-bindings/clock/lpc18xx-cgu.h"
diff --git a/arch/arm/boot/dts/mps2.dtsi b/arch/arm/boot/dts/mps2.dtsi
index e3fed8d..efb8a03 100644
--- a/arch/arm/boot/dts/mps2.dtsi
+++ b/arch/arm/boot/dts/mps2.dtsi
@@ -42,6 +42,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "skeleton.dtsi"
#include "armv7-m.dtsi"
/ {
diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 35df462..8e69328 100644
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -45,6 +45,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi
index 9ffe2eb..9f2c731 100644
--- a/arch/arm/boot/dts/vf610m4.dtsi
+++ b/arch/arm/boot/dts/vf610m4.dtsi
@@ -42,6 +42,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include "vfxxx.dtsi"
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include
2016-08-30 20:52 ` [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include Joachim Eastwood
@ 2016-08-30 22:14 ` Stefan Agner
2016-09-06 7:29 ` Alexandre Torgue
2016-09-05 19:01 ` Fwd: " Joachim Eastwood
2016-09-06 5:31 ` Uwe Kleine-König
2 siblings, 1 reply; 12+ messages in thread
From: Stefan Agner @ 2016-08-30 22:14 UTC (permalink / raw)
To: linux-arm-kernel
On 2016-08-30 13:52, Joachim Eastwood wrote:
> 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.
>
> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
> ---
> 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 <stefan@agner.ch>
> 6 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/armv7-m.dtsi b/arch/arm/boot/dts/armv7-m.dtsi
> index 16331aa..ba332e3 100644
> --- a/arch/arm/boot/dts/armv7-m.dtsi
> +++ b/arch/arm/boot/dts/armv7-m.dtsi
> @@ -1,5 +1,3 @@
> -#include "skeleton.dtsi"
> -
> / {
> nvic: interrupt-controller at e000e100 {
> compatible = "arm,armv7m-nvic";
> diff --git a/arch/arm/boot/dts/efm32gg.dtsi b/arch/arm/boot/dts/efm32gg.dtsi
> index c747983..d9dbf7f 100644
> --- a/arch/arm/boot/dts/efm32gg.dtsi
> +++ b/arch/arm/boot/dts/efm32gg.dtsi
> @@ -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"
>
> diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi
> index 1cd39fd..a1ecfe3 100644
> --- a/arch/arm/boot/dts/lpc18xx.dtsi
> +++ b/arch/arm/boot/dts/lpc18xx.dtsi
> @@ -11,6 +11,7 @@
> *
> */
>
> +#include "skeleton.dtsi"
> #include "armv7-m.dtsi"
>
> #include "dt-bindings/clock/lpc18xx-cgu.h"
> diff --git a/arch/arm/boot/dts/mps2.dtsi b/arch/arm/boot/dts/mps2.dtsi
> index e3fed8d..efb8a03 100644
> --- a/arch/arm/boot/dts/mps2.dtsi
> +++ b/arch/arm/boot/dts/mps2.dtsi
> @@ -42,6 +42,7 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> +#include "skeleton.dtsi"
> #include "armv7-m.dtsi"
>
> / {
> diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
> index 35df462..8e69328 100644
> --- a/arch/arm/boot/dts/stm32f429.dtsi
> +++ b/arch/arm/boot/dts/stm32f429.dtsi
> @@ -45,6 +45,7 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> +#include "skeleton.dtsi"
> #include "armv7-m.dtsi"
> #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
>
> diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi
> index 9ffe2eb..9f2c731 100644
> --- a/arch/arm/boot/dts/vf610m4.dtsi
> +++ b/arch/arm/boot/dts/vf610m4.dtsi
> @@ -42,6 +42,7 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> +#include "skeleton.dtsi"
> #include "armv7-m.dtsi"
> #include "vfxxx.dtsi"
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include
2016-08-30 22:14 ` Stefan Agner
@ 2016-09-06 7:29 ` Alexandre Torgue
0 siblings, 0 replies; 12+ messages in thread
From: Alexandre Torgue @ 2016-09-06 7:29 UTC (permalink / raw)
To: linux-arm-kernel
Hi Joachim,
On 08/31/2016 12:14 AM, Stefan Agner wrote:
> On 2016-08-30 13:52, Joachim Eastwood wrote:
>> 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.
>>
>> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
>> ---
>> 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 <stefan@agner.ch>
>
>> 6 files changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/armv7-m.dtsi b/arch/arm/boot/dts/armv7-m.dtsi
>> index 16331aa..ba332e3 100644
>> --- a/arch/arm/boot/dts/armv7-m.dtsi
>> +++ b/arch/arm/boot/dts/armv7-m.dtsi
>> @@ -1,5 +1,3 @@
>> -#include "skeleton.dtsi"
>> -
>> / {
>> nvic: interrupt-controller at e000e100 {
>> compatible = "arm,armv7m-nvic";
>> diff --git a/arch/arm/boot/dts/efm32gg.dtsi b/arch/arm/boot/dts/efm32gg.dtsi
>> index c747983..d9dbf7f 100644
>> --- a/arch/arm/boot/dts/efm32gg.dtsi
>> +++ b/arch/arm/boot/dts/efm32gg.dtsi
>> @@ -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"
>>
>> diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi
>> index 1cd39fd..a1ecfe3 100644
>> --- a/arch/arm/boot/dts/lpc18xx.dtsi
>> +++ b/arch/arm/boot/dts/lpc18xx.dtsi
>> @@ -11,6 +11,7 @@
>> *
>> */
>>
>> +#include "skeleton.dtsi"
>> #include "armv7-m.dtsi"
>>
>> #include "dt-bindings/clock/lpc18xx-cgu.h"
>> diff --git a/arch/arm/boot/dts/mps2.dtsi b/arch/arm/boot/dts/mps2.dtsi
>> index e3fed8d..efb8a03 100644
>> --- a/arch/arm/boot/dts/mps2.dtsi
>> +++ b/arch/arm/boot/dts/mps2.dtsi
>> @@ -42,6 +42,7 @@
>> * OTHER DEALINGS IN THE SOFTWARE.
>> */
>>
>> +#include "skeleton.dtsi"
>> #include "armv7-m.dtsi"
>>
>> / {
>> diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
>> index 35df462..8e69328 100644
>> --- a/arch/arm/boot/dts/stm32f429.dtsi
>> +++ b/arch/arm/boot/dts/stm32f429.dtsi
>> @@ -45,6 +45,7 @@
>> * OTHER DEALINGS IN THE SOFTWARE.
>> */
>>
>> +#include "skeleton.dtsi"
>> #include "armv7-m.dtsi"
>> #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
>>
For stm32f429 platform:
Acked-by: Alexandre TORGUE <alexandre.torgue@st.com>
Regards
Alex
>> diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi
>> index 9ffe2eb..9f2c731 100644
>> --- a/arch/arm/boot/dts/vf610m4.dtsi
>> +++ b/arch/arm/boot/dts/vf610m4.dtsi
>> @@ -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
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Fwd: [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include
2016-08-30 20:52 ` [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include Joachim Eastwood
2016-08-30 22:14 ` Stefan Agner
@ 2016-09-05 19:01 ` Joachim Eastwood
2016-09-06 5:31 ` Uwe Kleine-König
2 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood @ 2016-09-05 19:01 UTC (permalink / raw)
To: linux-arm-kernel
Hi 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 <manabian@gmail.com>
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 <manabian@gmail.com>,
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.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
---
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(-)
diff --git a/arch/arm/boot/dts/armv7-m.dtsi b/arch/arm/boot/dts/armv7-m.dtsi
index 16331aa..ba332e3 100644
--- a/arch/arm/boot/dts/armv7-m.dtsi
+++ b/arch/arm/boot/dts/armv7-m.dtsi
@@ -1,5 +1,3 @@
-#include "skeleton.dtsi"
-
/ {
nvic: interrupt-controller at e000e100 {
compatible = "arm,armv7m-nvic";
diff --git a/arch/arm/boot/dts/efm32gg.dtsi b/arch/arm/boot/dts/efm32gg.dtsi
index c747983..d9dbf7f 100644
--- a/arch/arm/boot/dts/efm32gg.dtsi
+++ b/arch/arm/boot/dts/efm32gg.dtsi
@@ -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"
diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi
index 1cd39fd..a1ecfe3 100644
--- a/arch/arm/boot/dts/lpc18xx.dtsi
+++ b/arch/arm/boot/dts/lpc18xx.dtsi
@@ -11,6 +11,7 @@
*
*/
+#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include "dt-bindings/clock/lpc18xx-cgu.h"
diff --git a/arch/arm/boot/dts/mps2.dtsi b/arch/arm/boot/dts/mps2.dtsi
index e3fed8d..efb8a03 100644
--- a/arch/arm/boot/dts/mps2.dtsi
+++ b/arch/arm/boot/dts/mps2.dtsi
@@ -42,6 +42,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "skeleton.dtsi"
#include "armv7-m.dtsi"
/ {
diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 35df462..8e69328 100644
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -45,6 +45,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi
index 9ffe2eb..9f2c731 100644
--- a/arch/arm/boot/dts/vf610m4.dtsi
+++ b/arch/arm/boot/dts/vf610m4.dtsi
@@ -42,6 +42,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include "vfxxx.dtsi"
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include
2016-08-30 20:52 ` [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include Joachim Eastwood
2016-08-30 22:14 ` Stefan Agner
2016-09-05 19:01 ` Fwd: " Joachim Eastwood
@ 2016-09-06 5:31 ` Uwe Kleine-König
2 siblings, 0 replies; 12+ messages in thread
From: Uwe Kleine-König @ 2016-09-06 5:31 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 30, 2016 at 10:52:48PM +0200, Joachim Eastwood wrote:
> 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.
>
> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: dts: lpc18xx: remove skeleton.dtsi include and fix unit address warnings
2016-08-30 20:52 [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi Joachim Eastwood
2016-08-30 20:52 ` [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include Joachim Eastwood
@ 2016-08-30 20:52 ` Joachim Eastwood
2016-08-30 20:52 ` [PATCH 3/3] ARM: dts: efm32: " Joachim Eastwood
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood @ 2016-08-30 20:52 UTC (permalink / raw)
To: linux-arm-kernel
Removale 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.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
---
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(-)
diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi
index a1ecfe3..860ffa8 100644
--- a/arch/arm/boot/dts/lpc18xx.dtsi
+++ b/arch/arm/boot/dts/lpc18xx.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/lpc4337-ciaa.dts b/arch/arm/boot/dts/lpc4337-ciaa.dts
index 5cfadb0..7c16d63 100644
--- a/arch/arm/boot/dts/lpc4337-ciaa.dts
+++ b/arch/arm/boot/dts/lpc4337-ciaa.dts
@@ -30,7 +30,7 @@
stdout-path = &uart2;
};
- memory {
+ memory at 28000000 {
device_type = "memory";
reg = <0x28000000 0x0800000>; /* 8 MB */
};
diff --git a/arch/arm/boot/dts/lpc4350-hitex-eval.dts b/arch/arm/boot/dts/lpc4350-hitex-eval.dts
index d37779e..bc89702 100644
--- a/arch/arm/boot/dts/lpc4350-hitex-eval.dts
+++ b/arch/arm/boot/dts/lpc4350-hitex-eval.dts
@@ -34,7 +34,7 @@
stdout-path = &uart0;
};
- memory {
+ memory at 28000000 {
device_type = "memory";
reg = <0x28000000 0x800000>; /* 8 MB */
};
diff --git a/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts b/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
index 37bbcb6..5ca5eb5 100644
--- a/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
+++ b/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
@@ -35,7 +35,7 @@
stdout-path = &uart0;
};
- memory {
+ memory at 28000000 {
device_type = "memory";
reg = <0x28000000 0x2000000>; /* 32 MB */
};
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/3] ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
2016-08-30 20:52 [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi Joachim Eastwood
2016-08-30 20:52 ` [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include Joachim Eastwood
2016-08-30 20:52 ` [PATCH 2/3] ARM: dts: lpc18xx: remove skeleton.dtsi include and fix unit address warnings Joachim Eastwood
@ 2016-08-30 20:52 ` Joachim Eastwood
2016-09-05 7:56 ` Uwe Kleine-König
2016-08-30 22:14 ` [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi Rob Herring
2016-08-31 8:19 ` Vladimir Murzin
4 siblings, 1 reply; 12+ messages in thread
From: Joachim Eastwood @ 2016-08-30 20:52 UTC (permalink / raw)
To: linux-arm-kernel
Removale 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.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
---
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(-)
diff --git a/arch/arm/boot/dts/efm32gg-dk3750.dts b/arch/arm/boot/dts/efm32gg-dk3750.dts
index 504cf45..98fc667 100644
--- a/arch/arm/boot/dts/efm32gg-dk3750.dts
+++ b/arch/arm/boot/dts/efm32gg-dk3750.dts
@@ -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>;
diff --git a/arch/arm/boot/dts/efm32gg.dtsi b/arch/arm/boot/dts/efm32gg.dtsi
index d9dbf7f..b78c57e 100644
--- a/arch/arm/boot/dts/efm32gg.dtsi
+++ b/arch/arm/boot/dts/efm32gg.dtsi
@@ -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;
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/3] ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
2016-08-30 20:52 ` [PATCH 3/3] ARM: dts: efm32: " Joachim Eastwood
@ 2016-09-05 7:56 ` Uwe Kleine-König
2016-09-05 18:56 ` Joachim Eastwood
0 siblings, 1 reply; 12+ messages in thread
From: Uwe Kleine-König @ 2016-09-05 7:56 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 30, 2016 at 10:52:50PM +0200, Joachim Eastwood wrote:
> Removale 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.
>
> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
> ---
> 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.
Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/3] ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
2016-09-05 7:56 ` Uwe Kleine-König
@ 2016-09-05 18:56 ` Joachim Eastwood
0 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood @ 2016-09-05 18:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi Uwe,
On 5 September 2016 at 09:56, Uwe Kleine-K?nig
<u.kleine-koenig@pengutronix.de> wrote:
> On Tue, Aug 30, 2016 at 10:52:50PM +0200, Joachim Eastwood wrote:
>> Removale 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.
>>
>> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
>> ---
>> 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.
>
> Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi
2016-08-30 20:52 [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi Joachim Eastwood
` (2 preceding siblings ...)
2016-08-30 20:52 ` [PATCH 3/3] ARM: dts: efm32: " Joachim Eastwood
@ 2016-08-30 22:14 ` Rob Herring
2016-08-31 8:19 ` Vladimir Murzin
4 siblings, 0 replies; 12+ messages in thread
From: Rob Herring @ 2016-08-30 22:14 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 30, 2016 at 3:52 PM, Joachim Eastwood <manabian@gmail.com> wrote:
> 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
For the series,
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi
2016-08-30 20:52 [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi Joachim Eastwood
` (3 preceding siblings ...)
2016-08-30 22:14 ` [PATCH 0/3] remove skeleton.dtsi from armv7-m.dtsi Rob Herring
@ 2016-08-31 8:19 ` Vladimir Murzin
4 siblings, 0 replies; 12+ messages in thread
From: Vladimir Murzin @ 2016-08-31 8:19 UTC (permalink / raw)
To: linux-arm-kernel
On 30/08/16 21:52, Joachim Eastwood wrote:
> 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(-)
>
For MPS2:
Acked-by: Vladimir Murzin <vladimir.murzin@arm.com>
^ permalink raw reply [flat|nested] 12+ messages in thread