From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753880AbbHCQqC (ORCPT ); Mon, 3 Aug 2015 12:46:02 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:35704 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbbHCQqA (ORCPT ); Mon, 3 Aug 2015 12:46:00 -0400 Message-ID: <55BF9AC4.40208@linaro.org> Date: Mon, 03 Aug 2015 18:45:56 +0200 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Sudeep Holla , linux-kernel@vger.kernel.org CC: Rob Herring , Thomas Gleixner Subject: Re: [PATCH] clocksource/OF: remove invalid DT warnings when booting using ACPI References: <1437672666-4121-1-git-send-email-sudeep.holla@arm.com> In-Reply-To: <1437672666-4121-1-git-send-email-sudeep.holla@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/23/2015 07:31 PM, Sudeep Holla wrote: > Since both CONFIG_ACPI and CONFIG_CLKSRC_OF can be enabled on ARM64, > we get this device tree warnings even when booting using ACPI which is > not valid. We can use of_have_populated_dt to check if the device tree > is populated or not and avoid spurious warning. > > This patch uses of_have_populated_dt to remove this non legitimate device > tree warning when booting using ACPI tables. > > Signed-off-by: Sudeep Holla > Cc: Rob Herring > Cc: Daniel Lezcano > Cc: Thomas Gleixner > --- > drivers/clocksource/clksrc-of.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c > index 0093a8e49e14..47823a2d7220 100644 > --- a/drivers/clocksource/clksrc-of.c > +++ b/drivers/clocksource/clksrc-of.c > @@ -38,6 +38,6 @@ void __init clocksource_of_init(void) > init_func(np); > clocksources++; > } > - if (!clocksources) > + if (of_have_populated_dt() && !clocksources) > pr_crit("%s: no matching clocksources found\n", __func__); > } Hmm, even if the fix looks correct, it doesn't make sense to put it there. Why not: diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index 42f9195..0b8933f 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -69,7 +69,9 @@ void __init time_init(void) u32 arch_timer_rate; of_clk_init(NULL); - clocksource_of_init(); + + if (of_have_populated_dt()) + clocksource_of_init(); tick_setup_hrtimer_broadcast(); -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog