[PATCH 0/2] ARM: vexpress: DT enablement

[PATCH 0/2] ARM: vexpress: DT enablement

[Lorenzo Pieralisi]

This patchset enables basic Versatile Express DT support in the Linaro kernel.

It applies to:

git://git.linaro.org/kernel/linux-linaro-2.6.38.git master

	commit 7c4bc9c2662c6d9840afed0e29eb01314af9bb78

It defines the required match table and adds a simple dts file where the memory 
node by default declares the full 1GB memory space.

Tested on a Versatile Express board with u-boot compiled with DT support.

Lorenzo Pieralisi (2):
  ARM: vexpress: add basic DT platform matching support
  ARM: vexpress: add basic dts DT source

 arch/arm/boot/dts/vexpress.dts |   18 ++++++++++++++++++
 arch/arm/mach-vexpress/v2m.c   |    6 ++++++
 2 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/vexpress.dts

-- 
1.7.4.4

[PATCH 1/2] ARM: vexpress: add basic DT platform matching support

[Lorenzo Pieralisi]

This patch adds a DT match table to the Versatile Express machine
description in order to enable basic device tree support.

Tested on a Versatile Express board where the device tree blob is
passed to the kernel by u-boot.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>
---
 arch/arm/mach-vexpress/v2m.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index ba46e8e..e318df3 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -437,6 +437,11 @@ static void __init v2m_init(void)
 	ct_desc->init_tile();
 }
 
+static const char *vexpress_dt_match[] __initdata = {
+	"arm,vexpress",
+	NULL,
+};
+
 MACHINE_START(VEXPRESS, "ARM-Versatile Express")
 	.boot_params	= PLAT_PHYS_OFFSET + 0x00000100,
 	.map_io		= v2m_map_io,
@@ -444,4 +449,5 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express")
 	.init_irq	= v2m_init_irq,
 	.timer		= &v2m_timer,
 	.init_machine	= v2m_init,
+	.dt_compat	= vexpress_dt_match,
 MACHINE_END
-- 
1.7.4.4

Re: [PATCH 1/2] ARM: vexpress: add basic DT platform matching support

[Grant Likely]

On Wed, Apr 13, 2011 at 07:02:20PM +0100, Lorenzo Pieralisi wrote:
> This patch adds a DT match table to the Versatile Express machine
> description in order to enable basic device tree support.
> 
> Tested on a Versatile Express board where the device tree blob is
> passed to the kernel by u-boot.
> 
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>

Merged into devicetree/test & devicetree/arm.  I squashed this with
the second patch while I was at it.  I see that Nicolas has already
picked it up into the Linaro tree, so I don't need to worry about
pushing it to him.  :-)

g.


> ---
>  arch/arm/mach-vexpress/v2m.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
> index ba46e8e..e318df3 100644
> --- a/arch/arm/mach-vexpress/v2m.c
> +++ b/arch/arm/mach-vexpress/v2m.c
> @@ -437,6 +437,11 @@ static void __init v2m_init(void)
>  	ct_desc->init_tile();
>  }
>  
> +static const char *vexpress_dt_match[] __initdata = {
> +	"arm,vexpress",
> +	NULL,
> +};
> +
>  MACHINE_START(VEXPRESS, "ARM-Versatile Express")
>  	.boot_params	= PLAT_PHYS_OFFSET + 0x00000100,
>  	.map_io		= v2m_map_io,
> @@ -444,4 +449,5 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express")
>  	.init_irq	= v2m_init_irq,
>  	.timer		= &v2m_timer,
>  	.init_machine	= v2m_init,
> +	.dt_compat	= vexpress_dt_match,
>  MACHINE_END
> -- 
> 1.7.4.4
> 
> 

Re: [PATCH 1/2] ARM: vexpress: add basic DT platform matching support

[Lorenzo Pieralisi]

Hi Grant, Nicolas,

On Thu, 2011-04-14 at 14:54 -0600, Grant Likely wrote:
> On Wed, Apr 13, 2011 at 07:02:20PM +0100, Lorenzo Pieralisi wrote:
> > This patch adds a DT match table to the Versatile Express machine
> > description in order to enable basic device tree support.
> > 
> > Tested on a Versatile Express board where the device tree blob is
> > passed to the kernel by u-boot.
> > 
> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>
> 
> Merged into devicetree/test & devicetree/arm.  I squashed this with
> the second patch while I was at it.  I see that Nicolas has already
> picked it up into the Linaro tree, so I don't need to worry about
> pushing it to him.  :-)
> 
> g.
> 

Thank you very much.

Lorenzo

[PATCH 2/2] ARM: vexpress: add basic dts DT source

[Lorenzo Pieralisi]

This patch provides a simple device tree source for the Versatile
Express board. It just defines memory layout and assigns a compatible string
to the board.

Compiled blob tested on Versatile Express, passed to the kernel
through u-boot. 'chosen' node defined within u-boot to avoid cluttering
the default dts configuration.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>
---
 arch/arm/boot/dts/vexpress.dts |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/vexpress.dts

diff --git a/arch/arm/boot/dts/vexpress.dts b/arch/arm/boot/dts/vexpress.dts
new file mode 100644
index 0000000..bea2a18
--- /dev/null
+++ b/arch/arm/boot/dts/vexpress.dts
@@ -0,0 +1,18 @@
+/dts-v1/;
+
+/ {
+	model = "ARM Versatile Express";
+	compatible = "arm,vexpress";
+
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	aliases { };
+
+	chosen { };
+
+	memory {
+		device_type = "memory";
+		reg = <0x60000000 0x40000000>;
+	};
+};
-- 
1.7.4.4