diff mbox

[14/14,ARM] i.MX25: Fix DTS tree for real hardware.

Message ID 1367918943-4276-1-git-send-email-jcd@tribudubois.net
State New
Headers show

Commit Message

Jean-Christophe Dubois May 7, 2013, 9:29 a.m. UTC
i.MX25 PDK only has 64 MB DDR

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 arch/arm/board/imx25/dts/3dstack/3dstack.dtsi            | 3 ++-
 arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

Comments

Jean-Christophe Dubois May 7, 2013, 9:30 a.m. UTC | #1
Sorry for the 14/14 in the subject.

JC

On 05/07/2013 11:29 AM, Jean-Christophe DUBOIS wrote:
> i.MX25 PDK only has 64 MB DDR
>
> Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
> ---
>   arch/arm/board/imx25/dts/3dstack/3dstack.dtsi            | 3 ++-
>   arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts | 5 +----
>   2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/board/imx25/dts/3dstack/3dstack.dtsi b/arch/arm/board/imx25/dts/3dstack/3dstack.dtsi
> index 29ff746..9c59d93 100644
> --- a/arch/arm/board/imx25/dts/3dstack/3dstack.dtsi
> +++ b/arch/arm/board/imx25/dts/3dstack/3dstack.dtsi
> @@ -27,9 +27,10 @@
>   			 * unless specified by "-m" option. If you have
>   			 * X MB then we will be able to access only first
>   			 * X MB starting at physical_addr.
> +                         * Note: the 3Dstack board only has 64 MB DDR.
>   			 */
>   			physical_addr = <0x80000000>;
> -			physical_size = <0x08000000>; /* 128 MB */
> +			physical_size = <0x04000000>; /* 64 MB */
>   		};
>   
>   		soc {
> diff --git a/arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts b/arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts
> index e6ec7ea..7d5e2d6 100644
> --- a/arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts
> +++ b/arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts
> @@ -10,10 +10,7 @@
>   
>   			  /* Update guest0 memory regions */
>   			  "devtree attr set /guests/guest0/aspace/mem0 host_physical_addr physaddr 0x82000000",
> -			  "devtree attr set /guests/guest0/aspace/mem0 physical_size physsize 0x06000000",
> -
> -			  /* Connect guest0/virtio-net0 netport to netbridge0 */
> -			  "devtree attr set /guests/guest0/aspace/virtio-net0 switch string netbridge0",
> +			  "devtree attr set /guests/guest0/aspace/mem0 physical_size physsize 0x02000000",
>   
>   			  /* Update guest0 flash region */
>   			  "devtree attr set /guests/guest0/aspace/nor_flash host_physical_addr physaddr 0x81000000",
diff mbox

Patch

diff --git a/arch/arm/board/imx25/dts/3dstack/3dstack.dtsi b/arch/arm/board/imx25/dts/3dstack/3dstack.dtsi
index 29ff746..9c59d93 100644
--- a/arch/arm/board/imx25/dts/3dstack/3dstack.dtsi
+++ b/arch/arm/board/imx25/dts/3dstack/3dstack.dtsi
@@ -27,9 +27,10 @@ 
 			 * unless specified by "-m" option. If you have
 			 * X MB then we will be able to access only first
 			 * X MB starting at physical_addr.
+                         * Note: the 3Dstack board only has 64 MB DDR.
 			 */
 			physical_addr = <0x80000000>;
-			physical_size = <0x08000000>; /* 128 MB */
+			physical_size = <0x04000000>; /* 64 MB */
 		};
 
 		soc {
diff --git a/arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts b/arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts
index e6ec7ea..7d5e2d6 100644
--- a/arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts
+++ b/arch/arm/board/imx25/dts/3dstack/one_guest_versatile.dts
@@ -10,10 +10,7 @@ 
 
 			  /* Update guest0 memory regions */
 			  "devtree attr set /guests/guest0/aspace/mem0 host_physical_addr physaddr 0x82000000",
-			  "devtree attr set /guests/guest0/aspace/mem0 physical_size physsize 0x06000000",
-
-			  /* Connect guest0/virtio-net0 netport to netbridge0 */
-			  "devtree attr set /guests/guest0/aspace/virtio-net0 switch string netbridge0",
+			  "devtree attr set /guests/guest0/aspace/mem0 physical_size physsize 0x02000000",
 
 			  /* Update guest0 flash region */
 			  "devtree attr set /guests/guest0/aspace/nor_flash host_physical_addr physaddr 0x81000000",