From patchwork Fri Apr 27 00:17:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10367241 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 55E79601D3 for ; Fri, 27 Apr 2018 00:47:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47A53292B3 for ; Fri, 27 Apr 2018 00:47:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A5F5292B5; Fri, 27 Apr 2018 00:47:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BDF43292B3 for ; Fri, 27 Apr 2018 00:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=uoq8jjHmJZLpEgoK564TVrsTjDEYI9xVMON5Zrutcdk=; b=T2lk5RfGwm2Syzr8pvKbd+mfxe p12QLI9JavKP8k6isCnIcY4tCqkdhbU90v23u0Kf3o9FcnhiEKePtmmIWv9Oux/fn41zJ8qEtd/5R J4CUQRW8CxgYI+cqulh1Y+kC23xaj8AUnY1G++ux2HPaFj+j0GdwK5Rm6UqcMDp31ZXQF+q5DpKVw QlB2mhEPeoLvA78QPVFy+yeA6H4vHLeb/pf5VVoalNQ7k43mhgvGSw2RIyVK5K9xxg0NKt51MQ/ne rr5ZoExrzIOcEXZpwThXu9JU2Hep2hzP0XhVr9I1Si2+xLb4Txt6Nr/FbzAjVVxQHd77QYr9GOp1I olM60YjA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBrXJ-0002cv-PF; Fri, 27 Apr 2018 00:46:53 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBr7C-0001lB-Gn for linux-arm-kernel@bombadil.infradead.org; Fri, 27 Apr 2018 00:19:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8OpGC5WcFl9K3oAAoSjNTi0o4IW5cMn7qSwuPkiynI8=; b=UlGO74TJCB/VQKMlgL8TJRj1e /ED1p1Zx3ti0sDaAzWHlCOC/AnaTJiKmqs0FqNQEIyaWxwhDnE0tuji+JTMhK/w5vfzf95ZZk55qA yNHIsvHo80zi2UcTkeTl3zajc9Xtq5TOOmTAeVXEO/EhdL8e8rvp+1DP2LMsB8nvhWjy2pFHOwJu7 22+X4N1yBt9jG18Bcj3QD1QLcrR8pQ4ZOw+NDCRWtNNxEfM8ab6dLvoNmreOyVPsWqUdcZ4e5KUPo nb1bLV8cP2jTC+RKt5POoosLv0ixS4y523yjjAkeXrEYeWlDJ7OfiRn7btwBvLdOPo6BpXnVOonyf /TozO1CJw==; Received: from vern.gendns.com ([206.190.152.46]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBr79-0005mr-F7 for linux-arm-kernel@lists.infradead.org; Fri, 27 Apr 2018 00:19:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8OpGC5WcFl9K3oAAoSjNTi0o4IW5cMn7qSwuPkiynI8=; b=W6uDml5qNIuWs5IByoCGhoWZe uYKeCL/Yg6wTPvPV8ZCmdAbiW+hLAx2MeeM/cggcmu2SdBQz6aVNpj3yiaFxdbNqQPjk0MbmS3oDH aIwKaqbUhfKTa5QnMQ1r2AXf0Q/iWS7/KWHAFAL9lBKi23Qy8T9qYcSsC6cMNblzXUXm8Nb4MHlJJ xvfxMKriOKjSuGB++/+7h6SBcL2eSQJLWuhM6E/QbFxDb7yFSK5kFf6cxJ8z+sUvGb3JF6xWc+JLN IDiDVJB/U/U1pdGErVEAxo96CZFWtlhu4ACvujRdplJxsU/HCvfM6sHHSKi/6CO1/M8sj+A/TZqWn CbCwD07Pw==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:39016 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89_1) (envelope-from ) id 1fBr6J-000iph-Kc; Thu, 26 Apr 2018 20:18:59 -0400 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 25/27] ARM: davinci: add device tree support to timer Date: Thu, 26 Apr 2018 19:17:43 -0500 Message-Id: <20180427001745.4116-26-david@lechnology.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427001745.4116-1-david@lechnology.com> References: <20180427001745.4116-1-david@lechnology.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - lists.infradead.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180426_201951_618351_B4A12797 X-CRM114-Status: GOOD ( 16.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , David Lechner , Kevin Hilman , Stephen Boyd , Michael Turquette , Sekhar Nori , linux-kernel@vger.kernel.org, Bartosz Golaszewski , Rob Herring , Adam Ford MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This adds device tree support to the davinci timer so that when clocks are moved to device tree, the timer will still work. Signed-off-by: David Lechner --- v9 changes: - none (there were supposed to be changed, but apparently they got squashed into the next commit - will fix on the next round) v8 changes: - none v7 changes: - rebased - add davinci prefix to commit message v6 changes: - rebased arch/arm/mach-davinci/Kconfig | 1 + arch/arm/mach-davinci/time.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index ba9912b4dfab..da8a039d65f9 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -59,6 +59,7 @@ config MACH_DA8XX_DT default y depends on ARCH_DAVINCI_DA850 select PINCTRL + select TIMER_OF help Say y here to include support for TI DaVinci DA850 based using Flattened Device Tree. More information at Documentation/devicetree diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 7ea3db0ff062..7a8c6fada644 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -397,3 +398,33 @@ void __init davinci_timer_init(struct clk *timer_clk) for (i=0; i< ARRAY_SIZE(timers); i++) timer32_config(&timers[i]); } + +static int __init of_davinci_timer_init(struct device_node *np) +{ + struct clk *clk; + + clk = of_clk_get(np, 0); + if (IS_ERR(clk)) { + struct of_phandle_args clkspec; + + /* + * Fall back to using ref_clk if the actual clock is not + * available. This currently always happens because platform + * clocks (i.e PLLs and PSCs) are registered as platform + * devices and therefore are not available at this point in + * the boot process. + */ + clkspec.np = of_find_node_by_name(NULL, "ref_clk"); + if (IS_ERR(clkspec.np)) { + pr_err("%s: No clock available for timer!\n", __func__); + return PTR_ERR(clkspec.np); + } + clk = of_clk_get_from_provider(&clkspec); + of_node_put(clkspec.np); + } + + davinci_timer_init(clk); + + return 0; +} +TIMER_OF_DECLARE(davinci_timer, "ti,davinci-timer", of_davinci_timer_init);