From patchwork Fri Mar 16 02:52:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10286231 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 71D98602BD for ; Fri, 16 Mar 2018 03:07:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67A6528AF3 for ; Fri, 16 Mar 2018 03:07:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C0C628B5C; Fri, 16 Mar 2018 03:07:50 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID 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 CD3DB28AF3 for ; Fri, 16 Mar 2018 03:07:49 +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=x62fdH7kzuRkrqQE3ysdmdba3YZ5aEcNBMYHYZFMlZc=; b=KWl9z/ugaxhHQFGY5vys+I1nrP G73LhRqcxfxWgb7atokkhCIEFt3Z20Ztlpm8drR0IULTFeelymTbyrGYlybm4jy8M8yqZvpfSGJmX nFBtzyvYl+DxtVi/+dddCrGrahdF960iee9HTGpF3oiVAhqu7P9ne5Bs2OT1b8OBh5mO5DsBSxvDB PdPYMuj6TPPb1Za2iUEn3SnrcZdbvfVxWiagRciSz/dGWQNeW74rxJfw8ZLLu+JzZ0L8lOIlY/Dtp 3IaPNAAzL7fZJsKbaPdf5Hzd2oUQVsPBrQfl6PS9AGsbQs2SvAHwlii8eCtFhEdjGtBt4tReE9MsK mU2a4BTA==; 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 1ewfiY-0002yw-0Y; Fri, 16 Mar 2018 03:07:42 +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 1ewfWK-0008NV-IU for linux-arm-kernel@bombadil.infradead.org; Fri, 16 Mar 2018 02:55:04 +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=qUnOd2vpd4QYx6gWXKJeDuWyRLY9X0yKYWkgghOmwEk=; b=ntIESpS+3fXNorSKGOw6i5jFS MpTOMzTYTSKz7ykH7U7ksV3M4HGp68YuhlxGUqEqy3DwfOCytniN8f2F0BdQcByTZWOj0J+hRFDZ7 Cc2mUxVD4gC8wXqdH31e3wX1rTz7FAjzTtbOwrJ1sNz+jLuNM+cIJdnNvf2RP6f8eB/bM9PYEC2/u 0OP+bcw/G3dtdI7cRtHU+UekZwmIK8RohsCr892gFxHvsnng8LDyF7qq/S6d0g6lpQO77gB3CIRXh XKawuI6NvV6iNJwibfrBNGz6ruwNFmbx+NnrC5DVm31xcSqdP1KSgebjpdnSzosyDwHSfpxAinAHu ae8GE9IeQ==; Received: from vern.gendns.com ([206.190.152.46]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewfWH-0000lG-40 for linux-arm-kernel@lists.infradead.org; Fri, 16 Mar 2018 02:55:03 +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=qUnOd2vpd4QYx6gWXKJeDuWyRLY9X0yKYWkgghOmwEk=; b=eeQ7TifBJTuuAwat2Kuy9RzH9 AR93SAnZOL5ZeooV4Yy4WV4aCyJidS5CYDILNpvTesUPHdaGhr28srpduYXXSBGM0HQhguIq/O6YW exOiCIrGr3mQjRIs2ir7aFvLtoDLxfz612AY7kiiobZ6cltcdqZWlFZFwXEpEgJL3bAQF4od+fhc0 nRF+bXYFC8dozlGzjwzllIeYesgRyQWE+muFzJSltQhL7hHOCVXWYxt8fagPs0iWeXN0KqYuZBNJ9 pf7es4mCyLqUYIBqtHdQUsBbUY2fG+XjJf6rbNOT+bpg8H23FDC6IJns5B7VHtbz4uB4Ky8jCwvIg vf0qI56sg==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:44986 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89_1) (envelope-from ) id 1ewfTS-002UlD-5z; Thu, 15 Mar 2018 22:52:06 -0400 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 26/42] ARM: davinci: dm646x: add new clock init using common clock framework Date: Thu, 15 Mar 2018 21:52:42 -0500 Message-Id: <1521168778-27236-27-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521168778-27236-1-git-send-email-david@lechnology.com> References: <1521168778-27236-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-20180316_025501_312893_D660E957 X-CRM114-Status: GOOD ( 13.79 ) 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/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 --- v8 changes: - register clkdev lookup for ref_clk and aux_clkin v7 changes: - add clock platform device declarations - register platform devices instead of registering clocks directly - add davinci prefix to commit description v6 changes: - add blank lines between function calls arch/arm/mach-davinci/board-dm646x-evm.c | 2 + arch/arm/mach-davinci/davinci.h | 1 + arch/arm/mach-davinci/dm646x.c | 85 +++++++++++++++++++++++++++++--- 3 files changed, 80 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 2d37f5b..d672804 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -772,6 +772,8 @@ static __init void evm_init(void) int ret; struct davinci_soc_info *soc_info = &davinci_soc_info; + dm646x_register_clocks(); + ret = dm646x_gpio_register(); if (ret) pr_warn("%s: GPIO init failed: %d\n", __func__, ret); diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index 2861a6f..a200977 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -115,6 +115,7 @@ int dm644x_gpio_register(void); /* DM646x function declarations */ void dm646x_init(void); void dm646x_init_time(unsigned long ref_clk_rate, unsigned long aux_clkin_rate); +void dm646x_register_clocks(void); void dm646x_init_mcasp0(struct snd_platform_data *pdata); void dm646x_init_mcasp1(struct snd_platform_data *pdata); int dm646x_init_edma(struct edma_rsv_info *rsv); diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index e1d6e92..553782f 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -8,29 +8,33 @@ * 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 "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 +50,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 +361,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,10 +959,73 @@ void __init dm646x_init(void) void __init dm646x_init_time(unsigned long ref_clk_rate, unsigned long aux_clkin_rate) { +#ifdef CONFIG_COMMON_CLK + struct clk *clk; + + clk = clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, ref_clk_rate); + clk_register_clkdev(clk, "ref_clk", "dm646x-psc"); + davinci_timer_init(clk); + + clk = clk_register_fixed_rate(NULL, "aux_clkin", NULL, 0, aux_clkin_rate); + clk_register_clkdev(clk, "aux_clkin", "dm646x-psc"); +#else ref_clk.rate = ref_clk_rate; aux_clkin.rate = aux_clkin_rate; davinci_clk_init(dm646x_clks); davinci_timer_init(&timer0_clk); +#endif +} + +static struct resource dm646x_pll1_resources[] = { + { + .start = DAVINCI_PLL1_BASE, + .end = DAVINCI_PLL1_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device dm646x_pll1_device = { + .name = "dm646x-pll1", + .id = -1, + .resource = dm646x_pll1_resources, + .num_resources = ARRAY_SIZE(dm646x_pll1_resources), +}; + +static struct resource dm646x_pll2_resources[] = { + { + .start = DAVINCI_PLL2_BASE, + .end = DAVINCI_PLL2_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device dm646x_pll2_device = { + .name = "dm646x-pll2", + .id = -1, + .resource = dm646x_pll2_resources, + .num_resources = ARRAY_SIZE(dm646x_pll2_resources), +}; + +static struct resource dm646x_psc_resources[] = { + { + .start = DAVINCI_PWR_SLEEP_CNTRL_BASE, + .end = DAVINCI_PWR_SLEEP_CNTRL_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device dm646x_psc_device = { + .name = "dm646x-psc", + .id = -1, + .resource = dm646x_psc_resources, + .num_resources = ARRAY_SIZE(dm646x_psc_resources), +}; + +void __init dm646x_register_clocks(void) +{ + platform_device_register(&dm646x_pll1_device); + platform_device_register(&dm646x_pll2_device); + platform_device_register(&dm646x_psc_device); } static int __init dm646x_init_devices(void)