From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758836AbbBGWcF (ORCPT ); Sat, 7 Feb 2015 17:32:05 -0500 Received: from svenfoo.org ([82.94.215.22]:43790 "EHLO mail.zonque.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756069AbbBGWcD (ORCPT ); Sat, 7 Feb 2015 17:32:03 -0500 Message-ID: <54D69260.3020204@zonque.org> Date: Sat, 07 Feb 2015 23:32:00 +0100 From: Daniel Mack User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Robert Jarzmik , Haojian Zhuang CC: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: pxa: pxa27x skip default device initialization with DT References: <1423343914-32342-1-git-send-email-robert.jarzmik@free.fr> In-Reply-To: <1423343914-32342-1-git-send-email-robert.jarzmik@free.fr> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/07/2015 10:18 PM, Robert Jarzmik wrote: > When booting via DT, the default PXA devices must not have been probed > before, otherwise the augmented information from the device tree is > ignored. > > This is the twin commit of commit 82ce44d104dc ("ARM: pxa3xx: skip > default device initialization when booting via DT"). > > Signed-off-by: Robert Jarzmik Looks good to me - thanks! Acked-by: Daniel Mack > --- > arch/arm/mach-pxa/pxa27x.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c > index 0485248..b5abdeb 100644 > --- a/arch/arm/mach-pxa/pxa27x.c > +++ b/arch/arm/mach-pxa/pxa27x.c > @@ -307,8 +307,12 @@ static int __init pxa27x_init(void) > register_syscore_ops(&pxa_irq_syscore_ops); > register_syscore_ops(&pxa2xx_mfp_syscore_ops); > > - pxa_register_device(&pxa27x_device_gpio, &pxa27x_gpio_info); > - ret = platform_add_devices(devices, ARRAY_SIZE(devices)); > + if (!of_have_populated_dt()) { > + pxa_register_device(&pxa27x_device_gpio, > + &pxa27x_gpio_info); > + ret = platform_add_devices(devices, > + ARRAY_SIZE(devices)); > + } > } > > return ret; >