From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH 1/2] ARM: vexpress: add basic DT platform matching support Date: Thu, 14 Apr 2011 14:54:48 -0600 Message-ID: <20110414205448.GB5255@ponder.secretlab.ca> References: <1302717741-18753-1-git-send-email-lorenzo.pieralisi@arm.com> <1302717741-18753-2-git-send-email-lorenzo.pieralisi@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1302717741-18753-2-git-send-email-lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: Lorenzo Pieralisi Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org List-Id: devicetree@vger.kernel.org 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 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 > >