From patchwork Sat Jan 20 17:14:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10176561 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 B50F96055D for ; Sat, 20 Jan 2018 17:35:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D12926E1A for ; Sat, 20 Jan 2018 17:35:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 916E8287F9; Sat, 20 Jan 2018 17:35:17 +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 1B8BA28515 for ; Sat, 20 Jan 2018 17:35:16 +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=Lc65JrdJ6Lt7F2lppWRvSeLe87KMFWEcqKHP06cjHPM=; b=Zad6asq0ArQvBaMmj+7bGYfUih kaWbqCQBaSsM79TfiqkSIFMX8VFENAZOnIXSfufFABjz5mnlFPV1arNfJMf7egH1E4Ll6JTsrw1zr ql/6w/5IjRv0pbadOTDUtKX6GJqwnA1QhkDp37XXe5ldAgtgw08+cEUenFTzvWoU8gBpwzRj2FtKr DhTYju5NZg2YIh19tbD4lHtqlpG1NoWTvfMAVGq+fDgoTJGjir0bD1MdxQtDaB/MBiViNx+113zoU t0o+OE1ugwe3/Oos7lV035GH2zr7mLCGXGLMN7+NBPaTuQWI4OIeK+0b/gvh8VSR+x5ulzQLG1kwm ieNyNaSg==; 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 1ecx2v-00044b-V8; Sat, 20 Jan 2018 17:35:13 +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 1ecx2b-0002Sb-JA for linux-arm-kernel@bombadil.infradead.org; Sat, 20 Jan 2018 17:34:53 +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=kI0VxASUlF4hRpetguv2pvttmBPaLK4orNuCCg0kdF0=; b=JRUqvalwbnruA8TVVOSg54WOV Jtz4lyILraHDS9wa7ZyYFXsRGWX0ZR1apyXt+8GvFVhyevZuld41MAHoR21Crx8Ut3Gj/PQl/RtsK fl2ArOIz70vGQ/8b5bpjlYbdB56zX67RoiSuDu5abI80ljoAyrZPVZqGdNw0T9f0sMtJg+YOfuFDR DjskPzGSKBbPryAnomPZvJDfe68lvER2i4hAOcd3EAROg3lL3gkATsM0QAO1QVPrLW8MMARoAHjzS J2baIibxrwvNInDwamA1Q4/P14d9IQ2FDPczj1eko/omAz9/Db9D99yqywvTLdWUTX8xYmxIRgFcG Ly7iSYBcA==; Received: from vern.gendns.com ([206.190.152.46]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ecwlC-0005OJ-5C for linux-arm-kernel@lists.infradead.org; Sat, 20 Jan 2018 17:16:58 +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=kI0VxASUlF4hRpetguv2pvttmBPaLK4orNuCCg0kdF0=; b=cd7ke8KmW8y31m6JtFwOcGz3w u19p+qC1oaDn5p32JmcsOy0SapVPo5ubOAX3VfPcvw50taG07kvW/LW/TWQ/jFvMfbvqCZLoYb3N1 Bvh19+kIyPTqEDiH65pRd6L+CQNG61CJn4a5gAZimyuObBQosfLZb68a3aGPyz/XhdT+w/fb/q5QH A+ES7d6SNrwuQQtav5aLA3XSf7O/A2vcQwNIkA2Dgo4BzBt2KQXNZVc1nHS9KlxREsnmYxIx9BTnt QDO8zI0r0g+p3IPAJWTeuEDxS5F+qZg/kVgZg7/BmoWlnXZ3rv5b6lXrtChBvzweYcMQLj5PTISqS zDn9NoCuQ==; 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 1ecwjS-00059q-Pw; Sat, 20 Jan 2018 12:15:07 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 21/41] ARM: da850: add new clock init using common clock framework Date: Sat, 20 Jan 2018 11:14:00 -0600 Message-Id: <1516468460-4908-22-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_171654_384736_7B58205D X-CRM114-Status: GOOD ( 15.33 ) 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 the new board-specific clock init in mach-davinci/da850.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 --- v6 changes: - add blank lines between function calls - include da8xx_register_cfgchip() - add async1 and async2 clock domains arch/arm/mach-davinci/da850.c | 79 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 5c86d77..0fdf647 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -11,37 +11,44 @@ * is licensed "as is" without any warranty of any kind, whether express * or implied. */ + +#include +#include +#include #include +#include #include #include -#include -#include -#include #include +#include +#include #include #include -#include #include -#include "psc.h" -#include -#include #include -#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 + #define DA850_PLL1_BASE 0x01e1a000 #define DA850_TIMER64P2_BASE 0x01f0c000 #define DA850_TIMER64P3_BASE 0x01f0d000 #define DA850_REF_FREQ 24000000 +#ifndef CONFIG_COMMON_CLK static int da850_set_armrate(struct clk *clk, unsigned long rate); static int da850_round_armrate(struct clk *clk, unsigned long rate); static int da850_set_pll0rate(struct clk *clk, unsigned long armrate); @@ -581,6 +588,7 @@ static struct clk_lookup da850_clks[] = { CLK("ecap.2", "fck", &ecap2_clk), CLK(NULL, NULL, NULL), }; +#endif /* * Device specific mux setup @@ -1168,6 +1176,7 @@ int da850_register_cpufreq(char *async_clk) return platform_device_register(&da850_cpufreq_device); } +#ifndef CONFIG_COMMON_CLK static int da850_round_armrate(struct clk *clk, unsigned long rate) { int ret = 0, diff; @@ -1230,12 +1239,14 @@ static int da850_set_pll0rate(struct clk *clk, unsigned long rate) return 0; } +#endif /* CONFIG_COMMON_CLK */ #else int __init da850_register_cpufreq(char *async_clk) { return 0; } +#ifndef CONFIG_COMMON_CLK static int da850_set_armrate(struct clk *clk, unsigned long rate) { return -EINVAL; @@ -1250,6 +1261,7 @@ static int da850_round_armrate(struct clk *clk, unsigned long rate) { return clk->rate; } +#endif /* CONFIG_COMMON_CLK */ #endif /* VPIF resource, platform data */ @@ -1381,6 +1393,52 @@ void __init da850_init(void) void __init da850_init_time(void) { +#ifdef CONFIG_COMMON_CLK + void __iomem *pll0, *pll1, *psc0, *psc1; + struct regmap *cfgchip; + struct clk *clk; + struct clk_hw *parent; + + pll0 = ioremap(DA8XX_PLL0_BASE, SZ_4K); + pll1 = ioremap(DA850_PLL1_BASE, SZ_4K); + psc0 = ioremap(DA8XX_PSC0_BASE, SZ_4K); + psc1 = ioremap(DA8XX_PSC1_BASE, SZ_4K); + + cfgchip = da8xx_register_cfgchip(); + if (WARN(IS_ERR(cfgchip), "failed to register CFGCHIP syscon")) + return; + + clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DA850_REF_FREQ); + + da850_pll_clk_init(pll0, pll1); + + da8xx_cfgchip_register_div4p5(cfgchip); + + da8xx_cfgchip_register_async1(cfgchip); + + clk = clk_register_fixed_factor(NULL, "async2", "pll0_auxclk", 0, 1, 1); + clk_register_clkdev(clk, NULL, "i2c_davinci.1"); + clk_register_clkdev(clk, "timer0", NULL); + clk_register_clkdev(clk, NULL, "davinci-wdt"); + + clk = da8xx_cfgchip_register_async3(cfgchip); + + /* pll1_sysclk2 is not affected by CPU scaling, so use it for async3 */ + parent = clk_hw_get_parent_by_index(__clk_get_hw(clk), 1); + if (parent) + clk_set_parent(clk, parent->clk); + else + pr_warn("%s: Failed to find async3 parent clock\n", __func__); + + da850_psc_clk_init(psc0, psc1); + + clk = clk_register_fixed_factor(NULL, "rmii", "pll0_sysclk7", 0, 1, 1); + clk_register_clkdev(clk, "rmii", NULL); + + clk = da8xx_cfgchip_register_tbclk(cfgchip); + clk_register_clkdev(clk, "tbclk", "ehrpwm.0"); + clk_register_clkdev(clk, "tbclk", "ehrpwm.1"); +#else struct regmap *cfgchip; cfgchip = da8xx_register_cfgchip(); @@ -1392,5 +1450,6 @@ void __init da850_init_time(void) regmap_write_bits(cfgchip, CFGCHIP(3), CFGCHIP3_PLL1_MASTER_LOCK, 0); davinci_clk_init(da850_clks); +#endif davinci_timer_init(); }