From patchwork Fri Sep 20 19:16:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 2920301 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C1F29BFF05 for ; Fri, 20 Sep 2013 19:16:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA9322010A for ; Fri, 20 Sep 2013 19:16:50 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E935200E9 for ; Fri, 20 Sep 2013 19:16:49 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VN6C6-0001fi-Ci; Fri, 20 Sep 2013 19:16:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VN6C3-0002iH-BH; Fri, 20 Sep 2013 19:16:43 +0000 Received: from mail-yh0-x230.google.com ([2607:f8b0:4002:c01::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VN6C0-0002hB-85; Fri, 20 Sep 2013 19:16:41 +0000 Received: by mail-yh0-f48.google.com with SMTP id f10so341437yha.21 for ; Fri, 20 Sep 2013 12:16:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=XgNeSohT+8Vo9r4mI07uRediCrd44oz6aipKqDb/O5Q=; b=GiP6h38WQRvyApicjzcidZ1ANtL1JeDlNyoLYdkGaUW2Jv6HuSyrAYWzVPP5VcVsnQ hvZmLrVejw+WDjUDP9qUCJqx0BrezbSWkhw632fL8kmhwvyVqXUrpjolsFIKcv/BK2eX jkFFItpie460ESj0tBhMSRGfi2rEYjiIWwX0SZ55kes0PQxWkph44BhW6OJxxnDo75rw 4v1dFOxkFp9l/8nj+01X+ogd1UCIcezAqeJsc0uS7ui8QMyGlFdXr6T0hXovZ4Y6CraY oFx1F+P9fSPxfrTzmavxdt7N7fPdsMvJ2Z+KDgBJ6h3ErTVX10MCEWH/SLEadrokTZcX 2obw== X-Received: by 10.236.149.162 with SMTP id x22mr2451639yhj.65.1379704578238; Fri, 20 Sep 2013 12:16:18 -0700 (PDT) Received: from ohporter.com (cpe-98-27-254-98.neo.res.rr.com. [98.27.254.98]) by mx.google.com with ESMTPSA id u52sm20114177yhg.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 20 Sep 2013 12:16:17 -0700 (PDT) Date: Fri, 20 Sep 2013 15:16:14 -0400 From: Matt Porter To: Sebastian Hesselbarth Subject: Re: [PATCH 00/26] ARM: provide common arch init for DT clocks Message-ID: <20130920191613.GA25191@ohporter.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1379526839-14798-1-git-send-email-sebastian.hesselbarth@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130920_151640_331396_793FBC15 X-CRM114-Status: GOOD ( 25.79 ) X-Spam-Score: 3.1 (+++) Cc: linux-samsung-soc@vger.kernel.org, Russell King , kernel@stlinux.com, Arnd Bergmann , Christian Daudt , Linux Kernel Mailing List , linux-tegra@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Olof Johansson , STEricsson , 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 X-Spam-Status: No, score=0.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, FAKE_REPLY_C, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Sep 18, 2013 at 07:53:33PM +0200, Sebastian Hesselbarth wrote: > This is a patch set based on an RFC [1][2] sent earlier to provide a common > arch/arm init for DT clock providers. Currently, the call to of_clk_init(NULL) > to initialize DT clock providers is spread among several mach-dirs. Since most > machs require DT clocks initialized before timers, no initcall can be used. > > By adding of_clk_init(NULL) to arch/arm time_init(), we can remove all > mach-specific .init_time hooks that basically called of_clk_init and > clocksource_of_init. > > In contrast to the RFC version, of_clk_init(NULL) is now only called if no > custom .init_time callback is set. This allows some machs to still call clock > init themselves, as not all can be converted now. Therefore, this patch sets > drops conversion of mach-mvebu and mach-zynq. New machs that were introduced > with v3.12-rc1 are also converted, except mach-u300 that requires clocks > before irqs. > > The patch set is based on v3.12-rc1 and further depends on a topic branch > created by Stephen Warren for mach-tegra [3]. It is now split into preparation > and removal patches to not break bisectability. I added all Acked-by/Tested-by's > where applicable or dropped them, if the patch was separated into two. > It has been compile tested for all machs involved with the following defconfigs > (multi_v7, bcm2835, dove, exynos, kirkwood, mxs, nhk8815) and nspire selected > on multi_v4_v5. > > Patches 1-8 comprise preparation patches that convert machs nomadik, prima2, > socfpga, sunxi, tegra, and vt8500 to usual .init_time callbacks calling only > of_clk_init and clocksource_of_init. > > Patch 9 then introduces of_clk_init(NULL) to the arch-wide default .init_time > callback. > > Patches 10-26 finally remove custom .init_time callbacks from the machs involved. Hi Sebastian, Could you pick up the following patch for mach-bcm/ into this series? Thanks, Matt From f65d048b3453447bb3e693cb21701c4d0c6375ed Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Fri, 20 Sep 2013 13:41:06 -0400 Subject: [PATCH] ARM: bcm: Remove custom .time_init hook With arch/arm calling of_clk_init(NULL) and clocksource_of_init() this is no longer needed. The former is useful because we can make use of dummy fixed clocks for drivers until the bcm281xx common clock driver is ready. Signed-off-by: Matt Porter Reviewed-by: Markus Mayer Reviewed-by: Christian Daudt Acked-by: Christian Daudt --- arch/arm/mach-bcm/board_bcm281xx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c index 8d9f931..26b2390 100644 --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c @@ -68,7 +68,6 @@ static void __init board_init(void) static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, }; DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") - .init_time = clocksource_of_init, .init_machine = board_init, .restart = bcm_kona_restart, .dt_compat = bcm11351_dt_compat,