[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 at arm.com>

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
> 
>