From patchwork Mon Jan 8 02:25:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10148815 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 D575E60247 for ; Mon, 8 Jan 2018 02:45:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C39BA283AD for ; Mon, 8 Jan 2018 02:45:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B635B287FF; Mon, 8 Jan 2018 02:45:07 +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 3BF49283AD for ; Mon, 8 Jan 2018 02:45:07 +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=xn1y9yC+JWjML3UXDsz5YMf65tCWSSxLnec/2uS1U8A=; b=FR7zPLPNgWSxD3g/EedztIdcja 6nwNqZlbdqWgUyohMyR/mGYCvc+adjeOhfv7A+rQ83Kdo1kLfeVbYDuvtbIHjmLx7w3YJLwknGeiq PdEHn8i88lBh7v3/XEC1RfMCcsT+sUyU21T8TVYgjm1Fz/EonilDZ6Td1wSxYLP5TwQUhh0vOzbnh CHLEwSuwprNwuAoyeONVM+HdLGGr7Glhp61Xv8nyradH5nEgf6a9yWl64WWagmLry7mJJaGI8SnHy gxRrPvO6tjxA2BNRD1eVzbZJVXV3nZwxlA2P1tQMNVZ3ZFWL2NlK3We2pSmv5wQNnCfk2YtNmyX5p x1LTn41Q==; 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 1eYNQr-0000xr-Ax; Mon, 08 Jan 2018 02:45:01 +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 1eYNOH-0007Y4-BZ for linux-arm-kernel@bombadil.infradead.org; Mon, 08 Jan 2018 02:42:21 +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=6vvNY5DfOKGV16kK6xz1J+rh5guKU0GI5uso5AHqq/w=; b=UDfzmGD3CPi8oW1oDA2QAad3d qtGQN2N4CEOx8afTBiUqsh/JeDPomMclMYIqblF0I3ODSrHIm4iDEseqGv0M36i4o1oPcl4vUjrxa 6fmR9puOU++GIBWuFij76j1etmx3Z5MXPYlkHmKpwgOQU3i7mtrGJn/q0W4N/y12ciEuh8BLnkEX9 YTGvAGKnMb3959diSoHFb6NNUDRr2iVhy7IsRDI/Zbs7VlQlTake4YOEZ/Nj4ntwTammP9WqiNUQl ej6ACjr4yCLVkOAUJwHNwkIKvE/Sk45BkCYox7bcQjBpRrVUZyUYCyXa9jjsbeBTVwN5cC+KeQFbA 2NN4KkzQA==; Received: from vern.gendns.com ([206.190.152.46]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYN84-00077w-K0 for linux-arm-kernel@lists.infradead.org; Mon, 08 Jan 2018 02:25:39 +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=6vvNY5DfOKGV16kK6xz1J+rh5guKU0GI5uso5AHqq/w=; b=cxb6sgRfdjIVE1Us0InE9qG1R oQLN5KQZmk9W/kNrB7SIf83wsyhLbIH2LLUNqiYsjDymWAAYyxgr5U1G42dZArL5YDSEp6wH9wWH9 zjHgXvZ6yYygGdyJeAz491YiDsjdSmvNjsy1WnPm9p1af/CZtpKvg/FcgKpQXtNrE4+OMHp+n9yS3 Aofcgk3jYGDNhiNj6L1hy25n9Wv7NQWereSunm7m5phHd4D0LmyPiNjscJ0ItzYyFiEDw2H2+2sJi Fvc31WrAZKbHC/YvFXqakeazy9n4OfFDNxdTLxEwIGUk6giQ/t+bLy58GKEWCoB69AW70rahdDwHy q3xwmPyjQ==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:54056 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89) (envelope-from ) id 1eYN7n-000AXP-K4; Sun, 07 Jan 2018 21:25:19 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 42/44] ARM: davinci: add device tree support to timer Date: Sun, 7 Jan 2018 20:25:05 -0600 Message-Id: <1515378307-23718-3-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515378307-23718-1-git-send-email-david@lechnology.com> References: <1515378307-23718-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-20180108_022536_830362_90119417 X-CRM114-Status: GOOD ( 13.46 ) 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, 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 --- 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); }