On Tue, 3 Apr 2012 09:27:54 +0200, Nicolas Ferre <[email protected]> wrote: > From: Ludovic Desroches <[email protected]> > > Having a unit-address different from 0 causes bad memory node detection > during early_init_dt_scan_memory.
Should be more detailed about the reason why. The reason is that these .dts files include skeleton.dtsi which names the memory node "memory". The code in this file creates a new memory node and doesn't modify the old one. Otherwise; Acked-by: Grant Likely <[email protected]> > > Signed-off-by: Ludovic Desroches <[email protected]> > Signed-off-by: Nicolas Ferre <[email protected]> > Cc: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> > Cc: [email protected] > --- > arch/arm/boot/dts/at91sam9g20.dtsi | 2 +- > arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- > arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +- > arch/arm/boot/dts/at91sam9x5.dtsi | 2 +- > arch/arm/boot/dts/at91sam9x5cm.dtsi | 2 +- > arch/arm/boot/dts/usb_a9g20.dts | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi > b/arch/arm/boot/dts/at91sam9g20.dtsi > index 92f3662..799ad18 100644 > --- a/arch/arm/boot/dts/at91sam9g20.dtsi > +++ b/arch/arm/boot/dts/at91sam9g20.dtsi > @@ -35,7 +35,7 @@ > }; > }; > > - memory@20000000 { > + memory { > reg = <0x20000000 0x08000000>; > }; > > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi > b/arch/arm/boot/dts/at91sam9g45.dtsi > index 3d0c32f..9e6eb6e 100644 > --- a/arch/arm/boot/dts/at91sam9g45.dtsi > +++ b/arch/arm/boot/dts/at91sam9g45.dtsi > @@ -36,7 +36,7 @@ > }; > }; > > - memory@70000000 { > + memory { > reg = <0x70000000 0x10000000>; > }; > > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts > b/arch/arm/boot/dts/at91sam9m10g45ek.dts > index 6abb571..a3633bd 100644 > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -17,7 +17,7 @@ > bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw > rootfstype=jffs2"; > }; > > - memory@70000000 { > + memory { > reg = <0x70000000 0x4000000>; > }; > > diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi > b/arch/arm/boot/dts/at91sam9x5.dtsi > index 6597177..70ab3a4 100644 > --- a/arch/arm/boot/dts/at91sam9x5.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5.dtsi > @@ -34,7 +34,7 @@ > }; > }; > > - memory@20000000 { > + memory { > reg = <0x20000000 0x10000000>; > }; > > diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi > b/arch/arm/boot/dts/at91sam9x5cm.dtsi > index 67936f8..31e7be2 100644 > --- a/arch/arm/boot/dts/at91sam9x5cm.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi > @@ -8,7 +8,7 @@ > */ > > / { > - memory@20000000 { > + memory { > reg = <0x20000000 0x8000000>; > }; > > diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts > index 3b3c4e0..7c2399c 100644 > --- a/arch/arm/boot/dts/usb_a9g20.dts > +++ b/arch/arm/boot/dts/usb_a9g20.dts > @@ -16,7 +16,7 @@ > bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw > rootfstype=ubifs"; > }; > > - memory@20000000 { > + memory { > reg = <0x20000000 0x4000000>; > }; > > -- > 1.7.9.4 > > _______________________________________________ > devicetree-discuss mailing list > [email protected] > https://lists.ozlabs.org/listinfo/devicetree-discuss -- Grant Likely, B.Sc, P.Eng. Secret Lab Technologies,Ltd. _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
