From patchwork Thu Mar 21 14:06:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 2313731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id BF127DF264 for ; Thu, 21 Mar 2013 14:09:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIg8j-0006lN-5j; Thu, 21 Mar 2013 14:06:45 +0000 Received: from mail-ob0-x235.google.com ([2607:f8b0:4003:c01::235]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIg8T-0006ho-J4 for linux-arm-kernel@lists.infradead.org; Thu, 21 Mar 2013 14:06:30 +0000 Received: by mail-ob0-f181.google.com with SMTP id ni5so2879473obc.12 for ; Thu, 21 Mar 2013 07:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=zEbe47TQCXxvn0hWldlCjjttubitzfhDtpQHl2CnveE=; b=xikIAhxOKZMDbkC3MjBloOwTK6X+10Brp5IXrdi5f0hHB6+wdZzapAjzjqojWM1+QG L8repn2P/6rsXFiClrLsncykEMvW7R6Wp97KqEVFPPJcmKLis368O/KJHDf/Ke8LjNsA bqq8gUhqzIagw24IYi9ZEV61aXZtkoIro7zDNywFRKceVxz01uKxJOKVa3bgdmOb7M3T TTd4vH/xpvavd2Mp5Dk8NxmNaPSEBF/veIPTfIkj13FEUTIRaNZwe1u9Xx/zeCzMGLFB //geaEXDn/Z5A5MtIxrg7tM7xKMhjl4q6llOczqfNG9gbEWchyWfz1xBUAo+aakJNOJd yBzQ== X-Received: by 10.182.161.39 with SMTP id xp7mr6977475obb.71.1363874788327; Thu, 21 Mar 2013 07:06:28 -0700 (PDT) Received: from [192.168.1.103] (65-36-73-129.dyn.grandenetworks.net. [65.36.73.129]) by mx.google.com with ESMTPS id 4sm6876185obj.7.2013.03.21.07.06.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 07:06:27 -0700 (PDT) Message-ID: <514B13E2.2050201@gmail.com> Date: Thu, 21 Mar 2013 09:06:26 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130221 Thunderbird/17.0.3 MIME-Version: 1.0 To: Arnd Bergmann Subject: Re: [PATCH 00/11] sp804 and integrator timer CLKSRC_OF support References: <1363820051-24428-1-git-send-email-robherring2@gmail.com> <201303211324.37654.arnd@arndb.de> In-Reply-To: <201303211324.37654.arnd@arndb.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130321_100629_710865_BE11C697 X-CRM114-Status: GOOD ( 15.72 ) X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Russell King , pawel.moll@arm.com, "devicetree-discuss@lists.ozlabs.org" , linux-kernel@vger.kernel.org, Rob Herring , john.stultz@linaro.org, haojian.zhuang@linaro.org, tglx@linutronix.de, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On 03/21/2013 08:24 AM, Arnd Bergmann wrote: > On Wednesday 20 March 2013, Rob Herring wrote: >> This series is dependent on my CLKSRC_OF clean-up in arm-soc, my >> sched_clock selection series[1], and Arnd's default machine descriptor >> patch (for default clocksource_of_init call). The full series is >> available here: > > All your patches look good to me, but I'd suggest you don't depend on > my default machine descriptor patch yet, that just makes the dependencies > harder to track, and we can easily remove all the calls once they > are obsoletely. > I really only need the hunk that calls clocksource_of_init which is really somewhat unrelated to a default machine desc. So what if I just pull out this hunk to a separate patch: } diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 955d92d..abff4e9 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -115,6 +116,10 @@ int __init register_persistent_clock(clock_access_fn read_boot, void __init time_init(void) { - machine_desc->init_time(); + if (machine_desc->init_time) + machine_desc->init_time(); + else + clocksource_of_init(); + sched_clock_postinit();