mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] MIPS: dts: drop skeleton.dtsi
@ 2018-06-19 17:14 Antony Pavlov
  2018-06-19 17:46 ` Oleksij Rempel
  2018-06-20 15:00 ` Antony Pavlov
  0 siblings, 2 replies; 5+ messages in thread
From: Antony Pavlov @ 2018-06-19 17:14 UTC (permalink / raw)
  To: barebox

Based on feedback from Sascha:

    http://lists.infradead.org/pipermail/barebox/2018-April/032694.html
    "
    skeleton.dtsi should no longer be used
    "

Several reasons to remove skeleton.dtsi ares explained in
the linux commit 3ebee5a2e141 ("arm64: dts: kill skeleton.dtsi").

Unit number is added to the /memory nodes to fix this dtc warning:

  Warning (unit_address_vs_reg): /memory: node has a reg or ranges
  property, but no unit name

Also this commit adds #address-cells and #size-cells definitions
to board and SoC dts file to avoid dtc warning, e.g.

  Warning (avoid_default_addr_size): /memory@0: Relying on default
  #address-cells value

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/dts/dlink-dir-320.dts |  7 ++++---
 arch/mips/dts/img-ci20.dts      |  2 +-
 arch/mips/dts/jz4755.dtsi       |  5 +++--
 arch/mips/dts/jz4780.dtsi       |  5 +++--
 arch/mips/dts/loongson-ls1b.dts |  2 +-
 arch/mips/dts/ls1b.dtsi         |  5 +++--
 arch/mips/dts/qemu-malta.dts    |  7 ++++---
 arch/mips/dts/rzx50.dts         |  2 +-
 arch/mips/dts/skeleton.dtsi     | 13 -------------
 9 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/arch/mips/dts/dlink-dir-320.dts b/arch/mips/dts/dlink-dir-320.dts
index b961c9dca3..e21700637f 100644
--- a/arch/mips/dts/dlink-dir-320.dts
+++ b/arch/mips/dts/dlink-dir-320.dts
@@ -1,12 +1,13 @@
 /dts-v1/;
 
-#include "skeleton.dtsi"
-
 / {
 	model = "D-Link DIR-320";
 	compatible = "dlink,dir320";
 
-	memory {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	memory@0 {
 		reg = <0x00000000 0x2000000>;
 	};
 
diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts
index da2a5bf625..d985666020 100644
--- a/arch/mips/dts/img-ci20.dts
+++ b/arch/mips/dts/img-ci20.dts
@@ -24,7 +24,7 @@
 	model = "MIPS Creator CI20";
 	compatible = "img,ci20";
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x10000000>;
 	};
diff --git a/arch/mips/dts/jz4755.dtsi b/arch/mips/dts/jz4755.dtsi
index 137156df7e..5d929c5d83 100644
--- a/arch/mips/dts/jz4755.dtsi
+++ b/arch/mips/dts/jz4755.dtsi
@@ -1,6 +1,7 @@
-#include "skeleton.dtsi"
-
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	soc {
 		compatible = "simple-bus";
 		model = "Ingenic JZ4755";
diff --git a/arch/mips/dts/jz4780.dtsi b/arch/mips/dts/jz4780.dtsi
index 9f0de5d1ae..fbffe814bb 100644
--- a/arch/mips/dts/jz4780.dtsi
+++ b/arch/mips/dts/jz4780.dtsi
@@ -1,6 +1,7 @@
-#include "skeleton.dtsi"
-
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	soc {
 		model = "Ingenic JZ4780";
 		#address-cells = <1>;
diff --git a/arch/mips/dts/loongson-ls1b.dts b/arch/mips/dts/loongson-ls1b.dts
index b81a951dc7..39e44eba35 100644
--- a/arch/mips/dts/loongson-ls1b.dts
+++ b/arch/mips/dts/loongson-ls1b.dts
@@ -6,7 +6,7 @@
 	model = "Loongson Tech LS1B Demo Board";
 	compatible = "loongson,ls1b";
 
-	memory {
+	memory@0 {
 		reg = <0x00000000 0x4000000>;
 	};
 };
diff --git a/arch/mips/dts/ls1b.dtsi b/arch/mips/dts/ls1b.dtsi
index af7119f1d0..cb85814af4 100644
--- a/arch/mips/dts/ls1b.dtsi
+++ b/arch/mips/dts/ls1b.dtsi
@@ -1,6 +1,7 @@
-#include "skeleton.dtsi"
-
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
index 9b0c594e87..0311baed41 100644
--- a/arch/mips/dts/qemu-malta.dts
+++ b/arch/mips/dts/qemu-malta.dts
@@ -1,11 +1,12 @@
 /dts-v1/;
 
-/include/ "skeleton.dtsi"
-
 / {
 	model = "qemu malta";
 	compatible = "qemu,malta";
 
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	chosen {
 		environment@0 {
 			compatible = "barebox,environment";
@@ -13,7 +14,7 @@
 		};
 	};
 
-	memory {
+	memory@0 {
 		reg = <0x00000000 0x10000000>;
 	};
 
diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
index 7ec3352666..8d4f92c98a 100644
--- a/arch/mips/dts/rzx50.dts
+++ b/arch/mips/dts/rzx50.dts
@@ -6,7 +6,7 @@
 	model = "Ritmix RZX-50";
 	compatible = "ritmix,rzx50";
 
-	memory {
+	memory@0 {
 		reg = <0x00000000 0x4000000>;
 	};
 
diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi
deleted file mode 100644
index b41d241de2..0000000000
--- a/arch/mips/dts/skeleton.dtsi
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Skeleton device tree; the bare minimum needed to boot; just include and
- * add a compatible value.  The bootloader will typically populate the memory
- * node.
- */
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	chosen { };
-	aliases { };
-	memory { device_type = "memory"; reg = <0 0>; };
-};
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: dts: drop skeleton.dtsi
  2018-06-19 17:14 [PATCH] MIPS: dts: drop skeleton.dtsi Antony Pavlov
@ 2018-06-19 17:46 ` Oleksij Rempel
  2018-06-20 13:18   ` Antony Pavlov
  2018-06-20 15:00 ` Antony Pavlov
  1 sibling, 1 reply; 5+ messages in thread
From: Oleksij Rempel @ 2018-06-19 17:46 UTC (permalink / raw)
  To: barebox


[-- Attachment #1.1.1: Type: text/plain, Size: 5256 bytes --]

Tested-by Oleksij Rempel <linux@rempel-privat.de>

on dpt board.

Am 19.06.2018 um 19:14 schrieb Antony Pavlov:
> Based on feedback from Sascha:
> 
>     http://lists.infradead.org/pipermail/barebox/2018-April/032694.html
>     "
>     skeleton.dtsi should no longer be used
>     "
> 
> Several reasons to remove skeleton.dtsi ares explained in
> the linux commit 3ebee5a2e141 ("arm64: dts: kill skeleton.dtsi").
> 
> Unit number is added to the /memory nodes to fix this dtc warning:
> 
>   Warning (unit_address_vs_reg): /memory: node has a reg or ranges
>   property, but no unit name
> 
> Also this commit adds #address-cells and #size-cells definitions
> to board and SoC dts file to avoid dtc warning, e.g.
> 
>   Warning (avoid_default_addr_size): /memory@0: Relying on default
>   #address-cells value
> 
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> ---
>  arch/mips/dts/dlink-dir-320.dts |  7 ++++---
>  arch/mips/dts/img-ci20.dts      |  2 +-
>  arch/mips/dts/jz4755.dtsi       |  5 +++--
>  arch/mips/dts/jz4780.dtsi       |  5 +++--
>  arch/mips/dts/loongson-ls1b.dts |  2 +-
>  arch/mips/dts/ls1b.dtsi         |  5 +++--
>  arch/mips/dts/qemu-malta.dts    |  7 ++++---
>  arch/mips/dts/rzx50.dts         |  2 +-
>  arch/mips/dts/skeleton.dtsi     | 13 -------------
>  9 files changed, 20 insertions(+), 28 deletions(-)
> 
> diff --git a/arch/mips/dts/dlink-dir-320.dts b/arch/mips/dts/dlink-dir-320.dts
> index b961c9dca3..e21700637f 100644
> --- a/arch/mips/dts/dlink-dir-320.dts
> +++ b/arch/mips/dts/dlink-dir-320.dts
> @@ -1,12 +1,13 @@
>  /dts-v1/;
>  
> -#include "skeleton.dtsi"
> -
>  / {
>  	model = "D-Link DIR-320";
>  	compatible = "dlink,dir320";
>  
> -	memory {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
> +	memory@0 {
>  		reg = <0x00000000 0x2000000>;
>  	};
>  
> diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts
> index da2a5bf625..d985666020 100644
> --- a/arch/mips/dts/img-ci20.dts
> +++ b/arch/mips/dts/img-ci20.dts
> @@ -24,7 +24,7 @@
>  	model = "MIPS Creator CI20";
>  	compatible = "img,ci20";
>  
> -	memory {
> +	memory@0 {
>  		device_type = "memory";
>  		reg = <0x0 0x10000000>;
>  	};
> diff --git a/arch/mips/dts/jz4755.dtsi b/arch/mips/dts/jz4755.dtsi
> index 137156df7e..5d929c5d83 100644
> --- a/arch/mips/dts/jz4755.dtsi
> +++ b/arch/mips/dts/jz4755.dtsi
> @@ -1,6 +1,7 @@
> -#include "skeleton.dtsi"
> -
>  / {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>  	soc {
>  		compatible = "simple-bus";
>  		model = "Ingenic JZ4755";
> diff --git a/arch/mips/dts/jz4780.dtsi b/arch/mips/dts/jz4780.dtsi
> index 9f0de5d1ae..fbffe814bb 100644
> --- a/arch/mips/dts/jz4780.dtsi
> +++ b/arch/mips/dts/jz4780.dtsi
> @@ -1,6 +1,7 @@
> -#include "skeleton.dtsi"
> -
>  / {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>  	soc {
>  		model = "Ingenic JZ4780";
>  		#address-cells = <1>;
> diff --git a/arch/mips/dts/loongson-ls1b.dts b/arch/mips/dts/loongson-ls1b.dts
> index b81a951dc7..39e44eba35 100644
> --- a/arch/mips/dts/loongson-ls1b.dts
> +++ b/arch/mips/dts/loongson-ls1b.dts
> @@ -6,7 +6,7 @@
>  	model = "Loongson Tech LS1B Demo Board";
>  	compatible = "loongson,ls1b";
>  
> -	memory {
> +	memory@0 {
>  		reg = <0x00000000 0x4000000>;
>  	};
>  };
> diff --git a/arch/mips/dts/ls1b.dtsi b/arch/mips/dts/ls1b.dtsi
> index af7119f1d0..cb85814af4 100644
> --- a/arch/mips/dts/ls1b.dtsi
> +++ b/arch/mips/dts/ls1b.dtsi
> @@ -1,6 +1,7 @@
> -#include "skeleton.dtsi"
> -
>  / {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>  	soc {
>  		#address-cells = <1>;
>  		#size-cells = <1>;
> diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
> index 9b0c594e87..0311baed41 100644
> --- a/arch/mips/dts/qemu-malta.dts
> +++ b/arch/mips/dts/qemu-malta.dts
> @@ -1,11 +1,12 @@
>  /dts-v1/;
>  
> -/include/ "skeleton.dtsi"
> -
>  / {
>  	model = "qemu malta";
>  	compatible = "qemu,malta";
>  
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>  	chosen {
>  		environment@0 {
>  			compatible = "barebox,environment";
> @@ -13,7 +14,7 @@
>  		};
>  	};
>  
> -	memory {
> +	memory@0 {
>  		reg = <0x00000000 0x10000000>;
>  	};
>  
> diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
> index 7ec3352666..8d4f92c98a 100644
> --- a/arch/mips/dts/rzx50.dts
> +++ b/arch/mips/dts/rzx50.dts
> @@ -6,7 +6,7 @@
>  	model = "Ritmix RZX-50";
>  	compatible = "ritmix,rzx50";
>  
> -	memory {
> +	memory@0 {
>  		reg = <0x00000000 0x4000000>;
>  	};
>  
> diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi
> deleted file mode 100644
> index b41d241de2..0000000000
> --- a/arch/mips/dts/skeleton.dtsi
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -/*
> - * Skeleton device tree; the bare minimum needed to boot; just include and
> - * add a compatible value.  The bootloader will typically populate the memory
> - * node.
> - */
> -
> -/ {
> -	#address-cells = <1>;
> -	#size-cells = <1>;
> -	chosen { };
> -	aliases { };
> -	memory { device_type = "memory"; reg = <0 0>; };
> -};
> 


-- 
Regards,
Oleksij


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: dts: drop skeleton.dtsi
  2018-06-19 17:46 ` Oleksij Rempel
@ 2018-06-20 13:18   ` Antony Pavlov
  2018-06-20 14:57     ` Oleksij Rempel
  0 siblings, 1 reply; 5+ messages in thread
From: Antony Pavlov @ 2018-06-20 13:18 UTC (permalink / raw)
  To: Oleksij Rempel; +Cc: barebox

On Tue, 19 Jun 2018 19:46:38 +0200
Oleksij Rempel <linux@rempel-privat.de> wrote:

> Tested-by Oleksij Rempel <linux@rempel-privat.de>
> 
> on dpt board.

Have you tried to boot linux?


> 
> Am 19.06.2018 um 19:14 schrieb Antony Pavlov:
> > Based on feedback from Sascha:
> > 
> >     http://lists.infradead.org/pipermail/barebox/2018-April/032694.html
> >     "
> >     skeleton.dtsi should no longer be used
> >     "
> > 
> > Several reasons to remove skeleton.dtsi ares explained in
> > the linux commit 3ebee5a2e141 ("arm64: dts: kill skeleton.dtsi").
> > 
> > Unit number is added to the /memory nodes to fix this dtc warning:
> > 
> >   Warning (unit_address_vs_reg): /memory: node has a reg or ranges
> >   property, but no unit name
> > 
> > Also this commit adds #address-cells and #size-cells definitions
> > to board and SoC dts file to avoid dtc warning, e.g.
> > 
> >   Warning (avoid_default_addr_size): /memory@0: Relying on default
> >   #address-cells value
> > 
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > ---
> >  arch/mips/dts/dlink-dir-320.dts |  7 ++++---
> >  arch/mips/dts/img-ci20.dts      |  2 +-
> >  arch/mips/dts/jz4755.dtsi       |  5 +++--
> >  arch/mips/dts/jz4780.dtsi       |  5 +++--
> >  arch/mips/dts/loongson-ls1b.dts |  2 +-
> >  arch/mips/dts/ls1b.dtsi         |  5 +++--
> >  arch/mips/dts/qemu-malta.dts    |  7 ++++---
> >  arch/mips/dts/rzx50.dts         |  2 +-
> >  arch/mips/dts/skeleton.dtsi     | 13 -------------
> >  9 files changed, 20 insertions(+), 28 deletions(-)
> > 
> > diff --git a/arch/mips/dts/dlink-dir-320.dts b/arch/mips/dts/dlink-dir-320.dts
> > index b961c9dca3..e21700637f 100644
> > --- a/arch/mips/dts/dlink-dir-320.dts
> > +++ b/arch/mips/dts/dlink-dir-320.dts
> > @@ -1,12 +1,13 @@
> >  /dts-v1/;
> >  
> > -#include "skeleton.dtsi"
> > -
> >  / {
> >  	model = "D-Link DIR-320";
> >  	compatible = "dlink,dir320";
> >  
> > -	memory {
> > +	#address-cells = <1>;
> > +	#size-cells = <1>;
> > +
> > +	memory@0 {
> >  		reg = <0x00000000 0x2000000>;
> >  	};
> >  
> > diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts
> > index da2a5bf625..d985666020 100644
> > --- a/arch/mips/dts/img-ci20.dts
> > +++ b/arch/mips/dts/img-ci20.dts
> > @@ -24,7 +24,7 @@
> >  	model = "MIPS Creator CI20";
> >  	compatible = "img,ci20";
> >  
> > -	memory {
> > +	memory@0 {
> >  		device_type = "memory";
> >  		reg = <0x0 0x10000000>;
> >  	};
> > diff --git a/arch/mips/dts/jz4755.dtsi b/arch/mips/dts/jz4755.dtsi
> > index 137156df7e..5d929c5d83 100644
> > --- a/arch/mips/dts/jz4755.dtsi
> > +++ b/arch/mips/dts/jz4755.dtsi
> > @@ -1,6 +1,7 @@
> > -#include "skeleton.dtsi"
> > -
> >  / {
> > +	#address-cells = <1>;
> > +	#size-cells = <1>;
> > +
> >  	soc {
> >  		compatible = "simple-bus";
> >  		model = "Ingenic JZ4755";
> > diff --git a/arch/mips/dts/jz4780.dtsi b/arch/mips/dts/jz4780.dtsi
> > index 9f0de5d1ae..fbffe814bb 100644
> > --- a/arch/mips/dts/jz4780.dtsi
> > +++ b/arch/mips/dts/jz4780.dtsi
> > @@ -1,6 +1,7 @@
> > -#include "skeleton.dtsi"
> > -
> >  / {
> > +	#address-cells = <1>;
> > +	#size-cells = <1>;
> > +
> >  	soc {
> >  		model = "Ingenic JZ4780";
> >  		#address-cells = <1>;
> > diff --git a/arch/mips/dts/loongson-ls1b.dts b/arch/mips/dts/loongson-ls1b.dts
> > index b81a951dc7..39e44eba35 100644
> > --- a/arch/mips/dts/loongson-ls1b.dts
> > +++ b/arch/mips/dts/loongson-ls1b.dts
> > @@ -6,7 +6,7 @@
> >  	model = "Loongson Tech LS1B Demo Board";
> >  	compatible = "loongson,ls1b";
> >  
> > -	memory {
> > +	memory@0 {
> >  		reg = <0x00000000 0x4000000>;
> >  	};
> >  };
> > diff --git a/arch/mips/dts/ls1b.dtsi b/arch/mips/dts/ls1b.dtsi
> > index af7119f1d0..cb85814af4 100644
> > --- a/arch/mips/dts/ls1b.dtsi
> > +++ b/arch/mips/dts/ls1b.dtsi
> > @@ -1,6 +1,7 @@
> > -#include "skeleton.dtsi"
> > -
> >  / {
> > +	#address-cells = <1>;
> > +	#size-cells = <1>;
> > +
> >  	soc {
> >  		#address-cells = <1>;
> >  		#size-cells = <1>;
> > diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
> > index 9b0c594e87..0311baed41 100644
> > --- a/arch/mips/dts/qemu-malta.dts
> > +++ b/arch/mips/dts/qemu-malta.dts
> > @@ -1,11 +1,12 @@
> >  /dts-v1/;
> >  
> > -/include/ "skeleton.dtsi"
> > -
> >  / {
> >  	model = "qemu malta";
> >  	compatible = "qemu,malta";
> >  
> > +	#address-cells = <1>;
> > +	#size-cells = <1>;
> > +
> >  	chosen {
> >  		environment@0 {
> >  			compatible = "barebox,environment";
> > @@ -13,7 +14,7 @@
> >  		};
> >  	};
> >  
> > -	memory {
> > +	memory@0 {
> >  		reg = <0x00000000 0x10000000>;
> >  	};
> >  
> > diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
> > index 7ec3352666..8d4f92c98a 100644
> > --- a/arch/mips/dts/rzx50.dts
> > +++ b/arch/mips/dts/rzx50.dts
> > @@ -6,7 +6,7 @@
> >  	model = "Ritmix RZX-50";
> >  	compatible = "ritmix,rzx50";
> >  
> > -	memory {
> > +	memory@0 {
> >  		reg = <0x00000000 0x4000000>;
> >  	};
> >  
> > diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi
> > deleted file mode 100644
> > index b41d241de2..0000000000
> > --- a/arch/mips/dts/skeleton.dtsi
> > +++ /dev/null
> > @@ -1,13 +0,0 @@
> > -/*
> > - * Skeleton device tree; the bare minimum needed to boot; just include and
> > - * add a compatible value.  The bootloader will typically populate the memory
> > - * node.
> > - */
> > -
> > -/ {
> > -	#address-cells = <1>;
> > -	#size-cells = <1>;
> > -	chosen { };
> > -	aliases { };
> > -	memory { device_type = "memory"; reg = <0 0>; };
> > -};
> > 
> 
> 
> -- 
> Regards,
> Oleksij
> 


-- 
Best regards,
  Antony Pavlov

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: dts: drop skeleton.dtsi
  2018-06-20 13:18   ` Antony Pavlov
@ 2018-06-20 14:57     ` Oleksij Rempel
  0 siblings, 0 replies; 5+ messages in thread
From: Oleksij Rempel @ 2018-06-20 14:57 UTC (permalink / raw)
  To: Antony Pavlov; +Cc: barebox


[-- Attachment #1.1.1: Type: text/plain, Size: 157 bytes --]

Am 20.06.2018 um 15:18 schrieb Antony Pavlov:
> Have you tried to boot linux?

yes, seems to be without notable regressions.

-- 
Regards,
Oleksij


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: dts: drop skeleton.dtsi
  2018-06-19 17:14 [PATCH] MIPS: dts: drop skeleton.dtsi Antony Pavlov
  2018-06-19 17:46 ` Oleksij Rempel
@ 2018-06-20 15:00 ` Antony Pavlov
  1 sibling, 0 replies; 5+ messages in thread
From: Antony Pavlov @ 2018-06-20 15:00 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On Tue, 19 Jun 2018 20:14:33 +0300
Antony Pavlov <antonynpavlov@gmail.com> wrote:

Hi, Sascha!

Please ignore this patch.

I have to add `device_type = "memory";` to memory nodes.

Also I'm planning to move #address-cells and #size-cells definitions to a separate patch.

> Based on feedback from Sascha:
> 
>     http://lists.infradead.org/pipermail/barebox/2018-April/032694.html
>     "
>     skeleton.dtsi should no longer be used
>     "
> 
> Several reasons to remove skeleton.dtsi ares explained in
> the linux commit 3ebee5a2e141 ("arm64: dts: kill skeleton.dtsi").
> 
> Unit number is added to the /memory nodes to fix this dtc warning:
> 
>   Warning (unit_address_vs_reg): /memory: node has a reg or ranges
>   property, but no unit name
> 
> Also this commit adds #address-cells and #size-cells definitions
> to board and SoC dts file to avoid dtc warning, e.g.
> 
>   Warning (avoid_default_addr_size): /memory@0: Relying on default
>   #address-cells value
> 
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> ---
>  arch/mips/dts/dlink-dir-320.dts |  7 ++++---
>  arch/mips/dts/img-ci20.dts      |  2 +-
>  arch/mips/dts/jz4755.dtsi       |  5 +++--
>  arch/mips/dts/jz4780.dtsi       |  5 +++--
>  arch/mips/dts/loongson-ls1b.dts |  2 +-
>  arch/mips/dts/ls1b.dtsi         |  5 +++--
>  arch/mips/dts/qemu-malta.dts    |  7 ++++---
>  arch/mips/dts/rzx50.dts         |  2 +-
>  arch/mips/dts/skeleton.dtsi     | 13 -------------
>  9 files changed, 20 insertions(+), 28 deletions(-)
> 
> diff --git a/arch/mips/dts/dlink-dir-320.dts b/arch/mips/dts/dlink-dir-320.dts
> index b961c9dca3..e21700637f 100644
> --- a/arch/mips/dts/dlink-dir-320.dts
> +++ b/arch/mips/dts/dlink-dir-320.dts
> @@ -1,12 +1,13 @@
>  /dts-v1/;
>  
> -#include "skeleton.dtsi"
> -
>  / {
>  	model = "D-Link DIR-320";
>  	compatible = "dlink,dir320";
>  
> -	memory {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
> +	memory@0 {
>  		reg = <0x00000000 0x2000000>;
>  	};
>  
> diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts
> index da2a5bf625..d985666020 100644
> --- a/arch/mips/dts/img-ci20.dts
> +++ b/arch/mips/dts/img-ci20.dts
> @@ -24,7 +24,7 @@
>  	model = "MIPS Creator CI20";
>  	compatible = "img,ci20";
>  
> -	memory {
> +	memory@0 {
>  		device_type = "memory";
>  		reg = <0x0 0x10000000>;
>  	};
> diff --git a/arch/mips/dts/jz4755.dtsi b/arch/mips/dts/jz4755.dtsi
> index 137156df7e..5d929c5d83 100644
> --- a/arch/mips/dts/jz4755.dtsi
> +++ b/arch/mips/dts/jz4755.dtsi
> @@ -1,6 +1,7 @@
> -#include "skeleton.dtsi"
> -
>  / {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>  	soc {
>  		compatible = "simple-bus";
>  		model = "Ingenic JZ4755";
> diff --git a/arch/mips/dts/jz4780.dtsi b/arch/mips/dts/jz4780.dtsi
> index 9f0de5d1ae..fbffe814bb 100644
> --- a/arch/mips/dts/jz4780.dtsi
> +++ b/arch/mips/dts/jz4780.dtsi
> @@ -1,6 +1,7 @@
> -#include "skeleton.dtsi"
> -
>  / {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>  	soc {
>  		model = "Ingenic JZ4780";
>  		#address-cells = <1>;
> diff --git a/arch/mips/dts/loongson-ls1b.dts b/arch/mips/dts/loongson-ls1b.dts
> index b81a951dc7..39e44eba35 100644
> --- a/arch/mips/dts/loongson-ls1b.dts
> +++ b/arch/mips/dts/loongson-ls1b.dts
> @@ -6,7 +6,7 @@
>  	model = "Loongson Tech LS1B Demo Board";
>  	compatible = "loongson,ls1b";
>  
> -	memory {
> +	memory@0 {
>  		reg = <0x00000000 0x4000000>;
>  	};
>  };
> diff --git a/arch/mips/dts/ls1b.dtsi b/arch/mips/dts/ls1b.dtsi
> index af7119f1d0..cb85814af4 100644
> --- a/arch/mips/dts/ls1b.dtsi
> +++ b/arch/mips/dts/ls1b.dtsi
> @@ -1,6 +1,7 @@
> -#include "skeleton.dtsi"
> -
>  / {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>  	soc {
>  		#address-cells = <1>;
>  		#size-cells = <1>;
> diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
> index 9b0c594e87..0311baed41 100644
> --- a/arch/mips/dts/qemu-malta.dts
> +++ b/arch/mips/dts/qemu-malta.dts
> @@ -1,11 +1,12 @@
>  /dts-v1/;
>  
> -/include/ "skeleton.dtsi"
> -
>  / {
>  	model = "qemu malta";
>  	compatible = "qemu,malta";
>  
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>  	chosen {
>  		environment@0 {
>  			compatible = "barebox,environment";
> @@ -13,7 +14,7 @@
>  		};
>  	};
>  
> -	memory {
> +	memory@0 {
>  		reg = <0x00000000 0x10000000>;
>  	};
>  
> diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
> index 7ec3352666..8d4f92c98a 100644
> --- a/arch/mips/dts/rzx50.dts
> +++ b/arch/mips/dts/rzx50.dts
> @@ -6,7 +6,7 @@
>  	model = "Ritmix RZX-50";
>  	compatible = "ritmix,rzx50";
>  
> -	memory {
> +	memory@0 {
>  		reg = <0x00000000 0x4000000>;
>  	};
>  
> diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi
> deleted file mode 100644
> index b41d241de2..0000000000
> --- a/arch/mips/dts/skeleton.dtsi
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -/*
> - * Skeleton device tree; the bare minimum needed to boot; just include and
> - * add a compatible value.  The bootloader will typically populate the memory
> - * node.
> - */
> -
> -/ {
> -	#address-cells = <1>;
> -	#size-cells = <1>;
> -	chosen { };
> -	aliases { };
> -	memory { device_type = "memory"; reg = <0 0>; };
> -};
> -- 
> 2.17.0
> 


-- 
Best regards,
  Antony Pavlov

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-06-20 14:59 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-19 17:14 [PATCH] MIPS: dts: drop skeleton.dtsi Antony Pavlov
2018-06-19 17:46 ` Oleksij Rempel
2018-06-20 13:18   ` Antony Pavlov
2018-06-20 14:57     ` Oleksij Rempel
2018-06-20 15:00 ` Antony Pavlov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox