From patchwork Mon Jan 8 02:17:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10148861 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 20FAC601BE for ; Mon, 8 Jan 2018 02:52:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1260A284F9 for ; Mon, 8 Jan 2018 02:52:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0724928610; Mon, 8 Jan 2018 02:52:43 +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 03271284F9 for ; Mon, 8 Jan 2018 02:52:42 +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=NRhqAvUsNLOia8yPlDy7MP5YJRFDLfvPyvMlMymCuqA=; b=KlrF+OBcp7/WNj656u/fh0CLK8 p70Mz+dATKn0exEVBwO6yh3uMYIeFp2m//LqCbLdWlR5AhKKWCyZ9JnfHd/8065LgLujqsRpjq4hH fJlnxirlhHbtPh/EnWP+Wfm5e1EtjyEyJzlHnzl1iR5C5xcm718RZBauPioZ5kNyMrLqBTOJSMWT/ rq27IDBiMJ0s9vOvBQUUm8FPG0L6Lfd9vzmhnxZgXSIy7Pfk4x0lulbBqlmZaLGBKDKDB6Jz5+7J8 RAkQnQBtBtJwEh6vfmWxTmzx4jqscAOXbe3z4mmGE1xYU9SDiuwOjLlQBuU/dGL/Mt7CzDgAxtUX6 1JofRKdw==; 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 1eYNYC-0007Zw-SX; Mon, 08 Jan 2018 02:52:36 +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-0007cq-IH 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=k8EXqdx5tK1dM2dUX3cNJAakvZRmsaz5FDXBl3GTHjk=; b=NLDKNRJWxUCmeOTVqi0YBUBzK l7jYQMq4bShOdmWXJIQM+uS1eHfQFDXGrGbKH6HenE1WneIt6Jia9DeECDygAbscrw515VE0RiiDS qlkWjqrh/7vU7fWklLAlQ6Qb9OWepH8GeoCj6zjOFdgpW08A2IcUUsC8PPCAOYwSKnkY+7DgM/REf 2ZmQELwPj5joPEG2uTILHnRSoiHkHuCkVjnLhGSSrBLmFpfdUa1RVXPA8xv6vh4ZQBa3E99g+1YOh YmqLAZamhW/4a7a6yr7aiEnEELQHnG29chROAUb8B8bgb7JyV0SnvHFvSwD8QZhijGjPwOTMlzmaM MQpoH4W4w==; Received: from vern.gendns.com ([206.190.152.46]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYN2i-0006ok-3O for linux-arm-kernel@lists.infradead.org; Mon, 08 Jan 2018 02:20:06 +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=k8EXqdx5tK1dM2dUX3cNJAakvZRmsaz5FDXBl3GTHjk=; b=WxchC+NzYliK+RhnnL6B+/mcU NhFm5SWFa2cSRa6LMS045m/nvJAPkEgjBKrIR0EEL/XpILICCggZxCzT7tryPWroYzI8dJvjVN61w 26Nte2IooOadkB9wBXPJaeE06PTlICSQU9rv3Brqi6LSnvkCsFWX5fm2jyZf8vZes1wnACjqPFmsG znpX7ezzfhEYiZIoKr3ikz6sRq0YIMCXUyutD3sPLUJ+NaJ24juwWCQzcPCDnCqm2GJ6UYJBFV8b5 GFGh/uavhpefs7YN7c1EsR5IjFFPhrFAZ7Xh3M4Kf6+hGGC2os+bk7mU8Iq3AdmZHS2pH83zxNx/r WLLjGnBpA==; 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 1eYN1b-0009GR-LO; Sun, 07 Jan 2018 21:18:55 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 28/44] ARM: dm646x: add new clock init using common clock framework Date: Sun, 7 Jan 2018 20:17:27 -0600 Message-Id: <1515377863-20358-29-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_316571_DA3BF269 X-CRM114-Status: GOOD ( 12.20 ) 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/dm646x.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/dm646x.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index d4d7658..bdaf769 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -8,29 +8,35 @@ * 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 -#include "psc.h" #include -#include #include -#include +#include +#include "asp.h" #include "davinci.h" -#include "clock.h" #include "mux.h" -#include "asp.h" + +#ifndef CONFIG_COMMON_CLK +#include "clock.h" +#include "psc.h" +#endif #define DAVINCI_VPIF_BASE (0x01C12000) @@ -46,6 +52,7 @@ #define DM646X_EMAC_CNTRL_RAM_OFFSET 0x2000 #define DM646X_EMAC_CNTRL_RAM_SIZE 0x2000 +#ifndef CONFIG_COMMON_CLK static struct pll_data pll1_data = { .num = 1, .phys_base = DAVINCI_PLL1_BASE, @@ -356,6 +363,7 @@ static struct clk_lookup dm646x_clks[] = { CLK(NULL, "vpif1", &vpif1_clk), CLK(NULL, NULL, NULL), }; +#endif static struct emac_platform_data dm646x_emac_pdata = { .ctrl_reg_offset = DM646X_EMAC_CNTRL_OFFSET, @@ -953,9 +961,26 @@ void __init dm646x_init(void) void __init dm646x_init_time(unsigned long ref_clk_rate, unsigned long aux_clkin_rate) { +#ifdef CONFIG_COMMON_CLK + void __iomem *pll1, *pll2, *psc; + struct clk *clk; + + pll1 = ioremap(DAVINCI_PLL1_BASE, SZ_4K); + pll2 = ioremap(DAVINCI_PLL2_BASE, SZ_4K); + psc = ioremap(DAVINCI_PWR_SLEEP_CNTRL_BASE, SZ_4K); + + clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, ref_clk_rate); + clk_register_fixed_rate(NULL, "aux_clkin", NULL, 0, aux_clkin_rate); + dm646x_pll_clk_init(pll1, pll2); + dm646x_psc_clk_init(psc); + /* no LPSC, always enabled; c.f. spruep9a */ + clk = clk_register_fixed_factor(NULL, "timer2", "pll1_sysclk3", 0, 1, 1); + clk_register_clkdev(clk, NULL, "davinci-wdt"); +#else ref_clk.rate = ref_clk_rate; aux_clkin.rate = aux_clkin_rate; davinci_clk_init(dm646x_clks); +#endif davinci_timer_init(); }