diff mbox series

[07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings

Message ID b1acecf3049f3bc96266f2db22149bf0b18e7a30.1507198895.git-series.maxime.ripard@free-electrons.com
State New
Headers show
Series sunxi: Cleanup DT warnings for the A10 and A80 | expand

Commit Message

Maxime Ripard Oct. 5, 2017, 10:49 a.m. UTC
Using skeleton.dtsi will create a memory node that will generate a warning
in DTC. However, that node will be created by the bootloader, so we can
just remove it entirely in order to remove that warning.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

---
 arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

-- 
git-series 0.9.1

Comments

Chen-Yu Tsai Oct. 5, 2017, 3:43 p.m. UTC | #1
On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Using skeleton.dtsi will create a memory node that will generate a warning

> in DTC. However, that node will be created by the bootloader, so we can

> just remove it entirely in order to remove that warning.

>

> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

> ---

>  arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++------

>  1 file changed, 2 insertions(+), 6 deletions(-)

>

> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi

> index 1876abb62ec7..f64544f615ea 100644

> --- a/arch/arm/boot/dts/sun4i-a10.dtsi

> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi

> @@ -41,14 +41,14 @@

>   *     OTHER DEALINGS IN THE SOFTWARE.

>   */

>

> -#include "skeleton.dtsi"

> -

>  #include <dt-bindings/thermal/thermal.h>

>  #include <dt-bindings/dma/sun4i-a10.h>

>  #include <dt-bindings/clock/sun4i-a10-ccu.h>

>  #include <dt-bindings/reset/sun4i-a10-ccu.h>

>

>  / {

> +       #address-cells = <1>;

> +       #size-cells = <1>;

>         interrupt-parent = <&intc>;

>

>         aliases {

> @@ -160,10 +160,6 @@

>                 };

>         };

>

> -       memory {

> -               reg = <0x40000000 0x80000000>;

> -       };

> -


My only concern (I'm not sure if it's valid or not) is U-boot not being
able to add nodes or properties due to lack of space within the DT
blob. It seemed like a possibility in older versions.

Otherwise,

Acked-by: Chen-Yu Tsai <wens@csie.org>
Maxime Ripard Oct. 6, 2017, 8:47 a.m. UTC | #2
On Thu, Oct 05, 2017 at 03:43:53PM +0000, Chen-Yu Tsai wrote:
> On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard

> <maxime.ripard@free-electrons.com> wrote:

> > Using skeleton.dtsi will create a memory node that will generate a warning

> > in DTC. However, that node will be created by the bootloader, so we can

> > just remove it entirely in order to remove that warning.

> >

> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

> > ---

> >  arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++------

> >  1 file changed, 2 insertions(+), 6 deletions(-)

> >

> > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi

> > index 1876abb62ec7..f64544f615ea 100644

> > --- a/arch/arm/boot/dts/sun4i-a10.dtsi

> > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi

> > @@ -41,14 +41,14 @@

> >   *     OTHER DEALINGS IN THE SOFTWARE.

> >   */

> >

> > -#include "skeleton.dtsi"

> > -

> >  #include <dt-bindings/thermal/thermal.h>

> >  #include <dt-bindings/dma/sun4i-a10.h>

> >  #include <dt-bindings/clock/sun4i-a10-ccu.h>

> >  #include <dt-bindings/reset/sun4i-a10-ccu.h>

> >

> >  / {

> > +       #address-cells = <1>;

> > +       #size-cells = <1>;

> >         interrupt-parent = <&intc>;

> >

> >         aliases {

> > @@ -160,10 +160,6 @@

> >                 };

> >         };

> >

> > -       memory {

> > -               reg = <0x40000000 0x80000000>;

> > -       };

> > -

> 

> My only concern (I'm not sure if it's valid or not) is U-boot not being

> able to add nodes or properties due to lack of space within the DT

> blob. It seemed like a possibility in older versions.

> 

> Otherwise,

> 

> Acked-by: Chen-Yu Tsai <wens@csie.org>


I don't think we really have to worry about it. We've had a bunch of
nodes (like the PSCI nodes) created in the same way for quite some
time already without causing any issues.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Chen-Yu Tsai Oct. 6, 2017, 10:59 a.m. UTC | #3
On Fri, Oct 6, 2017 at 4:47 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Thu, Oct 05, 2017 at 03:43:53PM +0000, Chen-Yu Tsai wrote:

>> On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard

>> <maxime.ripard@free-electrons.com> wrote:

>> > Using skeleton.dtsi will create a memory node that will generate a warning

>> > in DTC. However, that node will be created by the bootloader, so we can

>> > just remove it entirely in order to remove that warning.

>> >

>> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

>> > ---

>> >  arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++------

>> >  1 file changed, 2 insertions(+), 6 deletions(-)

>> >

>> > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi

>> > index 1876abb62ec7..f64544f615ea 100644

>> > --- a/arch/arm/boot/dts/sun4i-a10.dtsi

>> > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi

>> > @@ -41,14 +41,14 @@

>> >   *     OTHER DEALINGS IN THE SOFTWARE.

>> >   */

>> >

>> > -#include "skeleton.dtsi"

>> > -

>> >  #include <dt-bindings/thermal/thermal.h>

>> >  #include <dt-bindings/dma/sun4i-a10.h>

>> >  #include <dt-bindings/clock/sun4i-a10-ccu.h>

>> >  #include <dt-bindings/reset/sun4i-a10-ccu.h>

>> >

>> >  / {

>> > +       #address-cells = <1>;

>> > +       #size-cells = <1>;

>> >         interrupt-parent = <&intc>;

>> >

>> >         aliases {

>> > @@ -160,10 +160,6 @@

>> >                 };

>> >         };

>> >

>> > -       memory {

>> > -               reg = <0x40000000 0x80000000>;

>> > -       };

>> > -

>>

>> My only concern (I'm not sure if it's valid or not) is U-boot not being

>> able to add nodes or properties due to lack of space within the DT

>> blob. It seemed like a possibility in older versions.

>>

>> Otherwise,

>>

>> Acked-by: Chen-Yu Tsai <wens@csie.org>

>

> I don't think we really have to worry about it. We've had a bunch of

> nodes (like the PSCI nodes) created in the same way for quite some

> time already without causing any issues.


Indeed. Ack it is then.

ChenYu
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 1876abb62ec7..f64544f615ea 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -41,14 +41,14 @@ 
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
-
 #include <dt-bindings/thermal/thermal.h>
 #include <dt-bindings/dma/sun4i-a10.h>
 #include <dt-bindings/clock/sun4i-a10-ccu.h>
 #include <dt-bindings/reset/sun4i-a10-ccu.h>
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
 	interrupt-parent = <&intc>;
 
 	aliases {
@@ -160,10 +160,6 @@ 
 		};
 	};
 
-	memory {
-		reg = <0x40000000 0x80000000>;
-	};
-
 	clocks {
 		#address-cells = <1>;
 		#size-cells = <1>;