From patchwork Sat Jan 20 17:14:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10176617 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 67A3260386 for ; Sat, 20 Jan 2018 17:51:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 568EA1FF60 for ; Sat, 20 Jan 2018 17:51:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B12E1FF81; Sat, 20 Jan 2018 17:51:45 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 EF8221FF60 for ; Sat, 20 Jan 2018 17:51:44 +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=RkUOjTGA2KgQCKxPnMu2hyGrObCAfp5ZQTrTy4HNPyA=; b=EZL0Z1BaHrGNbOrCydXrL/HFPg PbNwWs+H1NjqO5ZVLPo+xef5RszNjz/2/vGGEPxyab/azWo2xTQQfWYgioNGid9cLN6keOiwzS6Dv kwfT3w6px8YjgSly2bgEU6Paod6rck/e2V/OA2nGHDQ7DJJA+VaOTo1O9AWXQsUAUTS+L01BH8l2d w+mWb/GqEF7UY81fBWNfuqvVH9iVxCrgI7OMIPOR4vLZL+HwM5N+d11PZR5yr1vits4Uk/oNTB+fk mzWnUayCb0LWJnabACkKNUvosl/HFsmW6KHJc2p5+8ifC6PRfPF8bYgIgLGSKJ2ujyAjA9X3l5BO1 KrVW3tOQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ecxIr-0004fm-MQ; Sat, 20 Jan 2018 17:51:41 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ecxIh-0004NQ-TG for linux-arm-kernel@bombadil.infradead.org; Sat, 20 Jan 2018 17:51:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=BCHZgdIs3FDvwlsHjHtWidBk2kiLHrumZu3TFazAv3o=; b=sLTA7hNdqne4VVB/SJaBoyHiT XRxIweSv2fntw4Li6KYuhNZXcKD3s9G9cKbI14fa+oSiyBVQS50TtdCgqcKT6J7ttgnIYlO+HVWQZ SGBBBY0jhUmQ42B1OF9l9RKLhBAaniKdopC52WGFsqPgyRwRba9HPniXhp7eKkDWxh3ykWXI0SiGQ maNA20TW3nktAiZK4L9KRg4BVOno5wjr2GXe2dfcQkC24jjAf7Tc3VGcUFl0UKdT8FZcB+T3ruNop bhzOUk4vKDMvA8jMGgNA0Ds4/GBbipv4zmyUA9P6HgRDBNF8Uh1z8G2d2oXpoJabqr5GDIjSS4KuQ GP5A/uUjQ==; Received: from vern.gendns.com ([206.190.152.46]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ecx62-00067W-JA for linux-arm-kernel@lists.infradead.org; Sat, 20 Jan 2018 17:38:28 +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=BCHZgdIs3FDvwlsHjHtWidBk2kiLHrumZu3TFazAv3o=; b=zqG+JBRbptXEkrW4gspCWdkSP +8NX2qpmGrUiInotaQ2uoIf7DEiZm7fR9agDrT24kmBJPIxFF9ulRFzkqgQQcJgyruTEuO/0i9SRm AvOzgf6BHK+MJD9BgV3I+LPP/jDiTitbPZ5w+L3BPeZh9MM/u9cwGq0laEw0lZuFKnYq7Pztb61d+ N5jjgAFgzdhDKHY5l+pg1VmO3eC/FwtQAq9pIhADIcm/nqLrkJdCYy1+krlBZfIcILcqNVFx23kM/ 20jQGp21CiXPiayBkNBA3oToQgW7qlCrKSMs1zq2lX5lFG8ip/xFa+oTUNvKLoHgBvs9uBe/XmZtN uQbaHYqUg==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:53590 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89_1) (envelope-from ) id 1ecwjy-00059q-Qq; Sat, 20 Jan 2018 12:15:39 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 39/41] ARM: davinci: add device tree support to timer Date: Sat, 20 Jan 2018 11:14:18 -0600 Message-Id: <1516468460-4908-40-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516468460-4908-1-git-send-email-david@lechnology.com> References: <1516468460-4908-1-git-send-email-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-20180120_173826_756057_719FE313 X-CRM114-Status: GOOD ( 13.06 ) 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 --- v6 changes: - none arch/arm/mach-davinci/Kconfig | 1 + arch/arm/mach-davinci/time.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index ba9912b..da8a039 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 bd0c80e..44470e9 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c @@ -333,9 +333,9 @@ static struct clock_event_device clockevent_davinci = { }; -void __init davinci_timer_init(void) +static int __init of_davinci_timer_init(struct device_node *node) { - struct clk *timer_clk; + struct clk *timer_clk = NULL; struct davinci_soc_info *soc_info = &davinci_soc_info; unsigned int clockevent_id; unsigned int clocksource_id; @@ -371,7 +371,10 @@ void __init davinci_timer_init(void) } } - timer_clk = clk_get(NULL, "timer0"); + if (node) + timer_clk = of_clk_get(node, 0); + if (IS_ERR_OR_NULL(timer_clk)) + timer_clk = clk_get(NULL, "timer0"); BUG_ON(IS_ERR(timer_clk)); clk_prepare_enable(timer_clk); @@ -399,4 +402,12 @@ void __init davinci_timer_init(void) for (i=0; i< ARRAY_SIZE(timers); i++) timer32_config(&timers[i]); + + return 0; +} +TIMER_OF_DECLARE(davinci_timer, "ti,davinci-timer", of_davinci_timer_init); + +void __init davinci_timer_init(void) +{ + of_davinci_timer_init(NULL); }