From patchwork Mon Feb 19 20:21:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10228941 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 6184160467 for ; Mon, 19 Feb 2018 20:28:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 506C828767 for ; Mon, 19 Feb 2018 20:28:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40D0228B86; Mon, 19 Feb 2018 20:28:28 +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=ham 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 6047328B0B for ; Mon, 19 Feb 2018 20:28:27 +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=cCxslN6t9xzAN07sGHL1qOZS8gXJqEZx2VG1IBaF/to=; b=LMPce1Knk3R/GZ8m+6PToIJc1f lOMSX8UEwv2395kQIqasZMhheWmq4cypZX1yMfbaiYJxndMmZw1lvxe7e5ssq6Hdno3HRNUqcDJ0L xF6EYQ3cuwEQAxfHW8K9dIwt/Uq6oYIECd/QocOnLFgPa8LILoiwvIR15mpRBncukDHbVXaRKgFpp 1b8zJyRx6u8lZRIcDbhV8E5NWtKrdJzMTmojgIKHG5+ZUApxVEROrfFwwQZuHrTfn2feVQUAagcuy D1FTtFdDiTVq1YyEtAgYxHw3LqN+gtanJQLtl4nlffjcARaafWpuBG80HZnGyGN3cfic1H1L2CzC6 Mgep0TIg==; 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 1ens2n-0006Uh-RS; Mon, 19 Feb 2018 20:28:13 +0000 Received: from vern.gendns.com ([206.190.152.46]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1enrxY-0002iZ-Lr for linux-arm-kernel@lists.infradead.org; Mon, 19 Feb 2018 20:23:01 +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=9qcSs/qrdkhPS0VukmJEDTqhuE1MgeyW0Wdacwm4zBw=; b=0VB8tAEYTbqX/GYg0pon8ZXtl bvZmZcmF29D0VwHqdOzYl+clTMWU9iHnhH2pfMv4ycL9/jgK45rBdvZmIxXVLdWg71HkaRvTppw/k wAj4XEDKxlaiMCbNpm1y+DzkALTC/NhbOpwdyrLJg2rS+22ochcgup7i/giKylClgwWaE6BT84FZ9 kWjtXcAzsq27eiu6q3DKf+wMm3nAXslEIW80ov8+lZa7eFn6zJqFWAa9Q2gKZE+7LpIas7PLGMHWC y8B8uvdlnt70FJquJSjCoggkyRUg/nW9F1qvL+66LFu37GfRfMjGoX5Hwvz7fITqtFFq6G5cRjBQ7 bxOXTJSEA==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:48842 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89_1) (envelope-from ) id 1enrwG-003xBV-0Q; Mon, 19 Feb 2018 15:21:28 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v7 08/42] clk: davinci: Add platform information for TI DM646x PLL Date: Mon, 19 Feb 2018 14:21:29 -0600 Message-Id: <1519071723-31790-9-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519071723-31790-1-git-send-email-david@lechnology.com> References: <1519071723-31790-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-20180219_122248_827448_B34418C7 X-CRM114-Status: GOOD ( 14.54 ) 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 platform-specific declarations for the PLL clocks on TI DM646x based systems. Signed-off-by: David Lechner --- v7 changes: - split registration functions for each PLL - Add platform_device_id lookup Note: I meant to drop the fixed factor clock for timer2 and use pll1_sysclk3 directly in the lookup but noticed it too late. Will fix in the next rev. v6 changes: - Added dm646x_pll{1,2}_info with controller-specific information - Add empty lines between function calls drivers/clk/davinci/Makefile | 1 + drivers/clk/davinci/pll-dm646x.c | 78 ++++++++++++++++++++++++++++++++++++++++ drivers/clk/davinci/pll.c | 2 ++ drivers/clk/davinci/pll.h | 3 ++ 4 files changed, 84 insertions(+) create mode 100644 drivers/clk/davinci/pll-dm646x.c diff --git a/drivers/clk/davinci/Makefile b/drivers/clk/davinci/Makefile index 59d8ab6..d471386 100644 --- a/drivers/clk/davinci/Makefile +++ b/drivers/clk/davinci/Makefile @@ -7,4 +7,5 @@ obj-$(CONFIG_ARCH_DAVINCI_DA850) += pll-da850.o obj-$(CONFIG_ARCH_DAVINCI_DM355) += pll-dm355.o obj-$(CONFIG_ARCH_DAVINCI_DM365) += pll-dm365.o obj-$(CONFIG_ARCH_DAVINCI_DM644x) += pll-dm644x.o +obj-$(CONFIG_ARCH_DAVINCI_DM646x) += pll-dm646x.o endif diff --git a/drivers/clk/davinci/pll-dm646x.c b/drivers/clk/davinci/pll-dm646x.c new file mode 100644 index 0000000..9d3e0c2 --- /dev/null +++ b/drivers/clk/davinci/pll-dm646x.c @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * PLL clock descriptions for TI DM646X + * + * Copyright (C) 2018 David Lechner + */ + +#include +#include +#include +#include + +#include "pll.h" + +static const struct davinci_pll_clk_info dm646x_pll1_info __initconst = { + .name = "pll1", + .pllm_mask = GENMASK(4, 0), + .pllm_min = 14, + .pllm_max = 32, + .flags = PLL_HAS_CLKMODE, +}; + +static const struct davinci_pll_sysclk_info dm646x_pll1_sysclk_info[] __initconst = { + SYSCLK(1, pll1_sysclk1, pll1_pllen, 4, SYSCLK_FIXED_DIV), + SYSCLK(2, pll1_sysclk2, pll1_pllen, 4, SYSCLK_FIXED_DIV), + SYSCLK(3, pll1_sysclk3, pll1_pllen, 4, SYSCLK_FIXED_DIV), + SYSCLK(4, pll1_sysclk4, pll1_pllen, 4, 0), + SYSCLK(5, pll1_sysclk5, pll1_pllen, 4, 0), + SYSCLK(6, pll1_sysclk6, pll1_pllen, 4, 0), + SYSCLK(8, pll1_sysclk8, pll1_pllen, 4, 0), + SYSCLK(9, pll1_sysclk9, pll1_pllen, 4, 0), + { } +}; + +static const struct davinci_pll_clk_info dm646x_pll2_info __initconst = { + .name = "pll2", + .pllm_mask = GENMASK(4, 0), + .pllm_min = 14, + .pllm_max = 32, + .flags = 0, +}; + +static const struct davinci_pll_sysclk_info dm646x_pll2_sysclk_info[] __initconst = { + SYSCLK(1, pll2_sysclk1, pll2_pllen, 4, 0), + { } +}; + +int __init dm646x_pll1_init(struct device *dev, void __iomem *base) +{ + const struct davinci_pll_sysclk_info *info; + + davinci_pll_clk_register(dev, &dm646x_pll1_info, "ref_clk", base); + + for (info = dm646x_pll1_sysclk_info; info->name; info++) + davinci_pll_sysclk_register(dev, info, base); + + davinci_pll_sysclkbp_clk_register(dev, "pll1_sysclkbp", base); + + davinci_pll_auxclk_register(dev, "pll1_auxclk", base); + + return 0; +} + +int __init dm646x_pll2_init(struct device *dev, void __iomem *base) +{ + const struct davinci_pll_sysclk_info *info; + struct clk *clk; + + davinci_pll_clk_register(dev, &dm646x_pll2_info, "oscin", base); + + for (info = dm646x_pll2_sysclk_info; info->name; info++) + davinci_pll_sysclk_register(dev, info, base); + + clk = clk_register_fixed_factor(dev, "timer2", "pll1_sysclk3", 0, 1, 1); + clk_register_clkdev(clk, NULL, "davinci-wdt"); + + return 0; +} diff --git a/drivers/clk/davinci/pll.c b/drivers/clk/davinci/pll.c index 613ec24..8fad491 100644 --- a/drivers/clk/davinci/pll.c +++ b/drivers/clk/davinci/pll.c @@ -762,6 +762,8 @@ static const struct platform_device_id davinci_pll_id_table[] = { { .name = "dm365-pll2", .driver_data = (kernel_ulong_t)dm365_pll2_init }, { .name = "dm644x-pll1", .driver_data = (kernel_ulong_t)dm644x_pll1_init }, { .name = "dm644x-pll2", .driver_data = (kernel_ulong_t)dm644x_pll2_init }, + { .name = "dm646x-pll1", .driver_data = (kernel_ulong_t)dm646x_pll1_init }, + { .name = "dm646x-pll2", .driver_data = (kernel_ulong_t)dm646x_pll2_init }, { } }; diff --git a/drivers/clk/davinci/pll.h b/drivers/clk/davinci/pll.h index df977a6..5977be0 100644 --- a/drivers/clk/davinci/pll.h +++ b/drivers/clk/davinci/pll.h @@ -135,4 +135,7 @@ int dm365_pll2_init(struct device *dev, void __iomem *base); int dm644x_pll1_init(struct device *dev, void __iomem *base); int dm644x_pll2_init(struct device *dev, void __iomem *base); +int dm646x_pll1_init(struct device *dev, void __iomem *base); +int dm646x_pll2_init(struct device *dev, void __iomem *base); + #endif /* __CLK_DAVINCI_PLL_H___ */