From patchwork Wed May 9 17:26:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10390517 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 BDB6A60318 for ; Wed, 9 May 2018 17:52:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87DE22852C for ; Wed, 9 May 2018 17:52:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C524285DC; Wed, 9 May 2018 17:52:04 +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 072522852C for ; Wed, 9 May 2018 17:52:03 +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=tYgOSB4T5An5f/p3w5Y/1ABkOk6Js6qqcXja/BQ0h0g=; b=gIpBH4ZjSSzy7hXN1GWNlBqA1r GdxRxq/EaGiIGUEoMvKjVjLmknnPIGG03GeZMXbRwuafRNYx9mhC1wgbjbHFSud6vwFceZyCvonlv 0/klQX1WUVbIxA7siQvkNAttsCoSLYjcXyt64EqqgWc4BYS8HUHmi7jtZzAOglz4/+FIgIkUfP/bB XDHnBsHB6JK+9XMT/QnQaWQmOk63NxcMGceJQRD0trbeqkwPFG4l+N7zrNpm0Z0wcVEhinYMIdl51 tzB3nzyObPHCHXAxhzMKofnn0H9Hk31ii82DI1T1QoC4ht8eFUgrl5IwUreM8eCsvDTM+vvEJuphg nzko13yQ==; 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 1fGTFn-0006ow-S5; Wed, 09 May 2018 17:51:51 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGT8j-0000Uq-Cu for linux-arm-kernel@bombadil.infradead.org; Wed, 09 May 2018 17:44:33 +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=ZnJGBFWBW0rdefOa1WpRqg+0L5T31BY2/eRPvdgoC1M=; b=qdTot6EK0xrun1dMTN6uX0+yL Th+Sld5PvPTOoTXohnCSl+ttEqhnGQdNnmsSZyLQ8t81/Bpzb4HwEjWMn2BujYdyILZktBNULkxm7 9hfVbjkLtfJAYjJOxWK3grylLdv+yfXEtRLe8J6TM9oueQjwiQe8qtl/nARe5uJyZZJAPUwd54faL 1KXAJbSr2u79ElRc47aw/Dyd+pIwRlwCHflPFjHu5FeoXndqSNHNiqzF/9/71dZT8WOqpSdz/l5KI wxJeXJa2vSrZ0BKrH9CGE5RklTrBYhvit6y4dQbmDg2Nb7mKfPHVX97FUjZLVrwfl9h4T+TOJ2MUW g5T15ozpw==; Received: from vern.gendns.com ([206.190.152.46]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGSsz-0006Xq-QQ for linux-arm-kernel@lists.infradead.org; Wed, 09 May 2018 17:28:19 +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=ZnJGBFWBW0rdefOa1WpRqg+0L5T31BY2/eRPvdgoC1M=; b=V00N/TMMUkVVxPPn+7t8RhhP4 VVUSpMdCjHY755m5SjwDQlx2fTurgf55eskjuG6krxQ4KrgQ2q4isKjEetaG6J1KdLUfmHaWKHFio oSF6xo8y6QfnObZlQp4mM+i5T5VNph1qhunvd1ay2xR3/K9gnWegA4HS9ai/gYmhnvl4XpAz6ShXA qZ5SxEF+pQ2xcQ4tB2QyYMLOZO37fB7UbIo8D+Wfq+GnXVZtj110o/Gfsx01n3r0IqHn4jVSpdQeU 9eXU9alddHzf+AoYqf+4guWJUjIdYzXVyYpAG9osC0XXYDjkBVPS0XfApKpZTRVKjX35mPWwOQ5IV S2/+EiBsw==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:58616 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 1fGSs0-00EzgW-I4; Wed, 09 May 2018 13:27:16 -0400 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 25/27] ARM: davinci: add device tree support to timer Date: Wed, 9 May 2018 12:26:04 -0500 Message-Id: <20180509172606.29387-26-david@lechnology.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509172606.29387-1-david@lechnology.com> References: <20180509172606.29387-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-20180509_182818_023283_6AE6BAD8 X-CRM114-Status: GOOD ( 16.50 ) 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 --- v10 changes: - change compatible to "ti,da830-timer" - remove comment clocks as platform devices 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 | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 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..184e72922cc1 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,34 @@ 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. There will be problems later if the real clock + * source is disabled. + */ + + pr_warn("%s: falling back to ref_clk\n", __func__); + + 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,da830-timer", of_davinci_timer_init);