From patchwork Sat Jan 20 17:14:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10176565 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 B5B5B6055D for ; Sat, 20 Jan 2018 17:35:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63C3B26E1A for ; Sat, 20 Jan 2018 17:35:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54543287F9; Sat, 20 Jan 2018 17:35:32 +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 D878826E1A for ; Sat, 20 Jan 2018 17:35:31 +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=6pv30/0Pr2ZaTiJJN6dfSpmqOoe/t0iPQm66MXs0XRI=; b=Gqv2J8JOOX40+c1D9HBjTDJe/B 1hXgx953kbkzesMk27dVgixId482l0MBQPMhSCYTm3reT7pcUsn8ybkqaFMpx4BfEp4hU38s0/6VS kcakcnxnntGpnYmvlgGwwm458uA92Dm1+VCvYglyalNsOXYI2EUBEiVcoj45/RPJPdxUt/ijFuEIs DnKAW6D/OemFjuTJAdZoExdCNcXLfr7/037qSiM4Q6Lu2SjNyqQw3MtygZMtmQeau5A4M6rF+kDql qCiA4GawaSFEqRLqzZvkdzHztS87/VGSSSWQj1uLOiiBHBnzdO8IC6WY7NQZwim6ShTYt/SspofHs XwhAWVzg==; 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 1ecx3A-0004bR-JN; Sat, 20 Jan 2018 17:35:28 +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 1ecx2c-0002YS-8f for linux-arm-kernel@bombadil.infradead.org; Sat, 20 Jan 2018 17:34:54 +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=fMVAEBImE43/5XkKhRpRxG7V9ArVqvu7MVszo26YhbM=; b=S9pMQ7zaLGko4HIkmq/27Z3vJ 5RG821DZ37U+1poTJcRLHMXcqjlVcCJiCkfyEBuEYAukOdwoNrWe5r7fZokJbXspXpvFhUAVODWrA rfYXBKrlExu4Iv/O/O8QSCRPT4CGM8CehwTp6mjJzd9dH0CzDQt9JaNAwZfXJqCSs1+1s6FJkjqMC fhQkw1XEiHAEw1XnlKssF5ynOI+I0uE8Y0ZYTD+FoBtb/ZqJ8APk+6XXnjz9fuZiAieODVDXO3gve US+yFvURsw4Q1XP/MS7hdzYvx8f8NNRhJKiPClfJ8GQ0b76YtuXqm8FtLLmsewi9zT8alHT839H4g Hev/kdy4w==; Received: from vern.gendns.com ([206.190.152.46]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ecwlC-0005OG-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=fMVAEBImE43/5XkKhRpRxG7V9ArVqvu7MVszo26YhbM=; b=YonXW9RFT7/x7JcAzjsOaBOtV aBInE3tHOS0NKE1NT1R2M5XmZjezoy0MP7jmKBt3H83cvr1n99qXbTOqYiEH5O0r5AvrMVohY8k0w 3cSvvPXkJNQA1YdlSmOmu+DPDyOlhRHeBAaAYScJaMynfzdUpPvzfvXkaw4ItxyRMs9mC1AtUkDp5 1V4js36fiCurKIhcpax0xQDUt+GC9IwuL9RYffH6XBKFSeOxqkMQODhAYiJqiKNt1F70aO3QuGcU+ dy/v6VsaZhocsxaS86F1udiDUgLSIwgHgqUIkpKhMIlw6ajcVDVBG92EB+a0B8R98af4FwrgQqJe6 YVChQShUA==; 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 1ecwjX-00059q-PF; Sat, 20 Jan 2018 12:15:12 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 24/41] ARM: dm644x: add new clock init using common clock framework Date: Sat, 20 Jan 2018 11:14:03 -0600 Message-Id: <1516468460-4908-25-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_371401_AA152980 X-CRM114-Status: GOOD ( 11.34 ) 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/dm644x.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 Reviewed-by: Sekhar Nori --- v6 changes: - add blank lines between function calls arch/arm/mach-davinci/dm644x.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index b409801..5b5de85 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -8,28 +8,34 @@ * 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 "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 /* * Device specific clocks @@ -43,6 +49,7 @@ #define DM644X_EMAC_CNTRL_RAM_OFFSET 0x2000 #define DM644X_EMAC_CNTRL_RAM_SIZE 0x2000 +#ifndef CONFIG_COMMON_CLK static struct pll_data pll1_data = { .num = 1, .phys_base = DAVINCI_PLL1_BASE, @@ -326,6 +333,7 @@ static struct clk_lookup dm644x_clks[] = { CLK("davinci-wdt", NULL, &timer2_clk), CLK(NULL, NULL, NULL), }; +#endif static struct emac_platform_data dm644x_emac_pdata = { .ctrl_reg_offset = DM644X_EMAC_CNTRL_OFFSET, @@ -934,7 +942,21 @@ void __init dm644x_init(void) void __init dm644x_init_time(void) { +#ifdef CONFIG_COMMON_CLK + void __iomem *pll1, *pll2, *psc; + + 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, DM644X_REF_FREQ); + + dm644x_pll_clk_init(pll1, pll2); + + dm644x_psc_clk_init(psc); +#else davinci_clk_init(dm644x_clks); +#endif davinci_timer_init(); }