From patchwork Mon Jan 8 02:17:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10148863 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 883D4601BE for ; Mon, 8 Jan 2018 02:53:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7864F284F9 for ; Mon, 8 Jan 2018 02:53:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CF2528610; Mon, 8 Jan 2018 02:53:14 +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 ED426284F9 for ; Mon, 8 Jan 2018 02:53:13 +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=sIqLjc3qy9RqeYCS/5H2lhkchR0xFM9VbeoBcuprBvk=; b=EuXiDTU4Hu0wFlsZHyO0EWlT4J IOxy3Fa0X/fUlUafyZDA5NNnJJvqikkiSACf65KFStRr/YPSdLE7oEMX3YpKVn53HA2OctSx7fFRQ jGaTjkudyT3sPh5TgEBiSHEW/5T7j5MV9cQe0fSD2RbAyOfC+EaYduH4H6eF4w10O6PQ7Nk8PNP7E axIA+sVy6wLCZhH/P9jyvcEoWYFdLFJVWG4H9DEj+PIR6Vft0dgdF6RsPNhIha9Il2fZ/4GPq3+tr Qo8nKXmFhRzET7MOX0lO5FiltWuXEz3eb5HXhHmrH2d8kKm9eoMkoG8uRPI2/PkGkfhI5fM2+lc6/ B8ze5ktw==; 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 1eYNYh-00083A-Ed; Mon, 08 Jan 2018 02:53:07 +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 1eYNOd-0007Y4-Ak for linux-arm-kernel@bombadil.infradead.org; Mon, 08 Jan 2018 02:42:43 +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=W5HUwen728NiV0xCXItJenIDXqWpFGJL9j5JJqV9DHw=; b=dAATBB4LBhnwdC5+L/cLct4/M NDiV9jhwTbRd7XH3zvBmQPMUoRr7Dz3tYWF5Z1j00mMb/tBtCJSW48JZoWuOrMwQoML1phfNjBLrq Ld/HixdK/KP2X1JgIVVgZIQzzG3P+RhM1y3KTgzFCP1HQwoemQiMeuPmpdCHHHSFivMxBBOsa1pU4 5KXtajOVc4UDn/u7O7b49wX0lBIfn9/0VAwh0dD7ivXIRLrIB+Fo4Bfg4SIrPiGHmn90v0h9L++HH 6gltclIThCxNH3VsIY+7OjPnzrrlHqMhYA2YExEy81Dsaz0qlwl2c/OXOq/a00lGodxGf95CCkxsv 2cCDh53VA==; Received: from vern.gendns.com ([206.190.152.46]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYN2i-0006od-3Q for linux-arm-kernel@lists.infradead.org; Mon, 08 Jan 2018 02:20:07 +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=W5HUwen728NiV0xCXItJenIDXqWpFGJL9j5JJqV9DHw=; b=0SqIEJgQqvzeKGV5pwEJECZFs 9sJlenCExi6u3mYzZ5BQPXq1tVWnmXO/20lO/gaNtJwlns3B1nApdnMIwxMMQXLZm6ZQ31Wcd4TjU HL2iihsBPAzGjm4/8ytISs7kPy6NJp/03/oie3uaZsqVCGWHXxOaiVazPenptD/Qr0lrLXYVzSaWD stejvmrOLxpyUBWOo2gU8XscVAQgb8w6ta8CWBW0D1bJ7TacnAJG/cb7yxJnaIPUOrIvLUTxNCSNg uMatPsIJfuK1U1UbX7WOKzonRyVSE5ONPM5UVaomZpJZDExKgxLXaRMQPlw/wTImqJOHm/yuIwoep 2DM0dqHjg==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:53904 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89) (envelope-from ) id 1eYN1U-0009GR-0w; Sun, 07 Jan 2018 21:18:48 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 23/44] ARM: da830: add new clock init using common clock framework Date: Sun, 7 Jan 2018 20:17:22 -0600 Message-Id: <1515377863-20358-24-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515377863-20358-1-git-send-email-david@lechnology.com> References: <1515377863-20358-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_022004_343844_45AFB8DB X-CRM114-Status: GOOD ( 13.16 ) 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 the new board-specfic clock init in mach-davinci/da830.c using the new common clock framework drivers. The #ifdefs are needed to prevent compile errors until the entire ARCH_DAVINCI is converted. Also clean up the #includes since we are adding some here. Signed-off-by: David Lechner --- arch/arm/mach-davinci/da830.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 350d767..cbb351d 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -8,23 +8,29 @@ * is licensed "as is" without any warranty of any kind, whether express * or implied. */ +#include +#include +#include +#include #include #include -#include #include #include -#include "psc.h" -#include -#include #include -#include +#include #include +#include +#include -#include "clock.h" #include "mux.h" +#ifndef CONFIG_COMMON_CLK +#include "clock.h" +#include "psc.h" +#endif + /* Offsets of the 8 compare registers on the da830 */ #define DA830_CMP12_0 0x60 #define DA830_CMP12_1 0x64 @@ -37,6 +43,7 @@ #define DA830_REF_FREQ 24000000 +#ifndef CONFIG_COMMON_CLK static struct pll_data pll0_data = { .num = 1, .phys_base = DA8XX_PLL0_BASE, @@ -432,6 +439,7 @@ static struct clk_lookup da830_clks[] = { CLK(NULL, "rmii", &rmii_clk), CLK(NULL, NULL, NULL), }; +#endif /* * Device specific mux setup @@ -1223,6 +1231,27 @@ void __init da830_init(void) void __init da830_init_time(void) { +#ifdef CONFIG_COMMON_CLK + void __iomem *pll0, *psc0, *psc1; + struct clk *clk; + + pll0 = ioremap(DA8XX_PLL0_BASE, SZ_4K); + psc0 = ioremap(DA8XX_PSC0_BASE, SZ_4K); + psc1 = ioremap(DA8XX_PSC1_BASE, SZ_4K); + + clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DA830_REF_FREQ); + da830_pll_clk_init(pll0); + da830_psc_clk_init(psc0, psc1); + clk = clk_register_fixed_factor(NULL, "i2c0", "pll0_aux_clk", 0, 1, 1); + clk_register_clkdev(clk, NULL, "i2c_davinci.1"); + clk = clk_register_fixed_factor(NULL, "timer0", "pll0_aux_clk", 0, 1, 1); + clk_register_clkdev(clk, "timer0", NULL); + clk = clk_register_fixed_factor(NULL, "timer1", "pll0_aux_clk", 0, 1, 1); + clk_register_clkdev(clk, NULL, "davinci-wdt"); + clk = clk_register_fixed_factor(NULL, "rmii", "pll0_sysclk7", 0, 1, 1); + clk_register_clkdev(clk, "rmii", NULL); +#else davinci_clk_init(da830_clks); +#endif davinci_timer_init(); }