diff mbox

arm/dt: Fix babbage.dts memory node

Message ID 1303453526-27523-1-git-send-email-shawn.guo@linaro.org
State New
Headers show

Commit Message

Shawn Guo April 22, 2011, 6:25 a.m. UTC
Without device_type property set as memory for the node, the generated
dtb can still work when it gets passed to kernel by u-boot, since
u-boot will fix it up.  But kernel will not boot due to that it fails
to parse the memory node, when the dtb is appended to kernel image as
it is.

The patch adds a property device_type="memory" for memory node to fix
the problem.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
It applies on branch devicetree/test.

 arch/arm/boot/dts/babbage.dts |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Zach Pfeffer April 23, 2011, 9:39 p.m. UTC | #1
On 22 April 2011 01:25, Shawn Guo <shawn.guo@linaro.org> wrote:
> Without device_type property set as memory for the node, the generated
> dtb can still work when it gets passed to kernel by u-boot, since
> u-boot will fix it up.  But kernel will not boot due to that it fails
> to parse the memory node, when the dtb is appended to kernel image as
> it is.

I'm a little confused. The first part of the statement implies that
the kernel will boot without the device_type property, but the second
part of the statement says that the kernel won't boot.

> The patch adds a property device_type="memory" for memory node to fix
> the problem.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> It applies on branch devicetree/test.
>
>  arch/arm/boot/dts/babbage.dts |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/babbage.dts b/arch/arm/boot/dts/babbage.dts
> index 8f9b47c..4805168 100644
> --- a/arch/arm/boot/dts/babbage.dts
> +++ b/arch/arm/boot/dts/babbage.dts
> @@ -21,6 +21,7 @@
>        interrupt-parent = <&tzic>;
>
>        memory {
> +               device_type = "memory";
>                reg = <0x90000000 0x20000000>;
>        };
>
> --
> 1.7.4.1
>
>
> _______________________________________________
> linaro-kernel mailing list
> linaro-kernel@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/linaro-kernel
>
Shawn Guo April 24, 2011, 12:28 a.m. UTC | #2
On Sat, Apr 23, 2011 at 04:39:15PM -0500, Zach Pfeffer wrote:
> On 22 April 2011 01:25, Shawn Guo <shawn.guo@linaro.org> wrote:
> > Without device_type property set as memory for the node, the generated
> > dtb can still work when it gets passed to kernel by u-boot, since
> > u-boot will fix it up.  But kernel will not boot due to that it fails
> > to parse the memory node, when the dtb is appended to kernel image as
> > it is.
> 
> I'm a little confused. The first part of the statement implies that
> the kernel will boot without the device_type property, but the second
> part of the statement says that the kernel won't boot.
> 
The second part is talking about using John Bonesio's patch to append
dtb to zImage like: 'cat zImage babbage.dtb > zImage_w_dtb'.
Shawn Guo April 24, 2011, 12:48 p.m. UTC | #3
Hi Grant,

Let me know if you prefer to get babbage.dts deprecated by merging it
into mx51-babbage.dts.
Shawn Guo May 5, 2011, 3:23 p.m. UTC | #4
On Fri, Apr 22, 2011 at 02:25:26PM +0800, Shawn Guo wrote:
> Without device_type property set as memory for the node, the generated
> dtb can still work when it gets passed to kernel by u-boot, since
> u-boot will fix it up.  But kernel will not boot due to that it fails
> to parse the memory node, when the dtb is appended to kernel image as
> it is.
> 
> The patch adds a property device_type="memory" for memory node to fix
> the problem.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> It applies on branch devicetree/test.
> 
>  arch/arm/boot/dts/babbage.dts |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/babbage.dts b/arch/arm/boot/dts/babbage.dts
> index 8f9b47c..4805168 100644
> --- a/arch/arm/boot/dts/babbage.dts
> +++ b/arch/arm/boot/dts/babbage.dts
> @@ -21,6 +21,7 @@
>  	interrupt-parent = <&tzic>;
>  
>  	memory {
> +		device_type = "memory";
>  		reg = <0x90000000 0x20000000>;
>  	};
>  
> -- 
Hi Grant, comments?
diff mbox

Patch

diff --git a/arch/arm/boot/dts/babbage.dts b/arch/arm/boot/dts/babbage.dts
index 8f9b47c..4805168 100644
--- a/arch/arm/boot/dts/babbage.dts
+++ b/arch/arm/boot/dts/babbage.dts
@@ -21,6 +21,7 @@ 
 	interrupt-parent = <&tzic>;
 
 	memory {
+		device_type = "memory";
 		reg = <0x90000000 0x20000000>;
 	};