From patchwork Mon Jan 8 02:17:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10148701 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 8981D60210 for ; Mon, 8 Jan 2018 02:26:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75B70287F3 for ; Mon, 8 Jan 2018 02:26:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A22D287FE; Mon, 8 Jan 2018 02:26:10 +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=ham 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 99F47287F3 for ; Mon, 8 Jan 2018 02:26:09 +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=nCHWTlMSATQ+yBeCs48O7LG/wNwnIPVKT3UVcP0BtGQ=; b=F3G8GlgKE57R9iyHqKxjB0UpM1 CDqUZC4Kp1H3+ZmNlSZnQO1mhbZ8YFdCv7RbwuOFf9nMgu0+weiIydIHFj2Ic/+qN9hAEpjeeFAre cplFUbsZlu/JftjVhC1ObzxLkn4g34C47RkOMgSo3bnZtFD+nj0ijwtjp9OYxGl5XqeG3hvmTenWz 81Kk8AsYXGHJOptv46zC6oWpn/tjFf12a8n2SUkJO+TjtQRBlZ086kGsTQpScC2nO4YAEiOSWPOvV EOvkZECR1Z5k/tD9eS/G83vgMm/YngUE2JXDlFVK1RoXK3nf+ydtNW22DkXKm8HPpwhVOIUa6D3eQ YN8t2wmg==; 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 1eYN8X-00062S-HA; Mon, 08 Jan 2018 02:26:05 +0000 Received: from vern.gendns.com ([206.190.152.46]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYN1O-00089h-IM for linux-arm-kernel@lists.infradead.org; Mon, 08 Jan 2018 02:19:21 +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=WcwSqPnP1biiCzSEN88YRVAk+uBC+o+amQ3PsXoGtTQ=; b=AAf4c1Po01fxNFohIMnd5gPf3 kclr1pFOywxTntGTjAYifv8AGiAz0do2Hqy6HM4u977YHgarTQkxmuEQ21PbL8cNVri9bmSyG831C He+DlLdAjJJuv/6JX3y+fXLL913++ILylDGPNpGj/0z9btDVXALHKYdYrtlyrhQ1cCmw+OHa5/Nvd 2JXPFLmUp6HiuzjocR9R/6tHINgN4c3EHb2/fkMPfdV+xp0s/IvIlrT3qO0cY583LHfCG3mzeAYir 4NVkYV9BEFAm61+mKB72KqfU4r67f6G3BRDjcqIG9Aag++GTBQURtHD4vsxTtg3CsB0Gv6s7J9NmM O31B8A+ig==; 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 1eYN18-0009GR-Ah; Sun, 07 Jan 2018 21:18:26 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 10/44] clk: davinci: New driver for davinci PSC clocks Date: Sun, 7 Jan 2018 20:17:09 -0600 Message-Id: <1515377863-20358-11-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-20180107_181843_562993_193C9454 X-CRM114-Status: GOOD ( 19.84 ) 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 a new driver for mach-davinci PSC clocks. This is porting the code from arch/arm/mach-davinci/psc.c to the common clock framework and is converting it to use regmap to simplify the code. Additionally, it adds device tree support for these clocks. Note: although there are similar clocks for TI Keystone we are not able to share the code for a few reasons. The keystone clocks are device tree only and use legacy one-node-per-clock bindings. Also the keystone driver makes the assumption that there is only one PSC per SoC and uses global variables, but here we have two controllers per SoC. Signed-off-by: David Lechner --- drivers/clk/davinci/Makefile | 2 + drivers/clk/davinci/psc.c | 282 +++++++++++++++++++++++++++++++++++++++++++ drivers/clk/davinci/psc.h | 49 ++++++++ 3 files changed, 333 insertions(+) create mode 100644 drivers/clk/davinci/psc.c create mode 100644 drivers/clk/davinci/psc.h diff --git a/drivers/clk/davinci/Makefile b/drivers/clk/davinci/Makefile index d471386..cd1bf2c 100644 --- a/drivers/clk/davinci/Makefile +++ b/drivers/clk/davinci/Makefile @@ -8,4 +8,6 @@ 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 + +obj-y += psc.o endif diff --git a/drivers/clk/davinci/psc.c b/drivers/clk/davinci/psc.c new file mode 100644 index 0000000..a8b5f57 --- /dev/null +++ b/drivers/clk/davinci/psc.c @@ -0,0 +1,282 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Clock driver for TI Davinci PSC controllers + * + * Copyright (C) 2017 David Lechner + * + * Based on: drivers/clk/keystone/gate.c + * Copyright (C) 2013 Texas Instruments. + * Murali Karicheri + * Santosh Shilimkar + * + * And: arch/arm/mach-davinci/psc.c + * Copyright (C) 2006 Texas Instruments. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "psc.h" + +/* PSC register offsets */ +#define EPCPR 0x070 +#define PTCMD 0x120 +#define PTSTAT 0x128 +#define PDSTAT(n) (0x200 + 4 * (n)) +#define PDCTL(n) (0x300 + 4 * (n)) +#define MDSTAT(n) (0x800 + 4 * (n)) +#define MDCTL(n) (0xa00 + 4 * (n)) + +/* PSC module states */ +enum davinci_psc_state { + PSC_STATE_SWRSTDISABLE = 0, + PSC_STATE_SYNCRST = 1, + PSC_STATE_DISABLE = 2, + PSC_STATE_ENABLE = 3, +}; + +#define MDSTAT_STATE_MASK 0x3f +#define MDSTAT_MCKOUT BIT(12) +#define PDSTAT_STATE_MASK 0x1f +#define MDCTL_FORCE BIT(31) +#define MDCTL_LRESET BIT(8) +#define PDCTL_EPCGOOD BIT(8) +#define PDCTL_NEXT BIT(0) + +/** + * struct davinci_psc_clk - PSC clock structure + * @hw: clk_hw for the psc + * @regmap: PSC MMIO region + * @lpsc: Local PSC number (module id) + * @pd: Power domain + * @flags: LPSC_* quirk flags + */ +struct davinci_psc_clk { + struct clk_hw hw; + struct regmap *regmap; + u32 lpsc; + u32 pd; + u32 flags; +}; + +#define to_davinci_psc_clk(_hw) container_of(_hw, struct davinci_psc_clk, hw) + +static void psc_config(struct davinci_psc_clk *psc, + enum davinci_psc_state next_state) +{ + u32 epcpr, pdstat, mdstat, mdctl, ptstat; + + mdctl = next_state; + if (psc->flags & LPSC_FORCE) + mdctl |= MDCTL_FORCE; + regmap_write_bits(psc->regmap, MDCTL(psc->lpsc), MDSTAT_STATE_MASK, + mdctl); + + regmap_read(psc->regmap, PDSTAT(psc->pd), &pdstat); + if ((pdstat & PDSTAT_STATE_MASK) == 0) { + regmap_write_bits(psc->regmap, PDSTAT(psc->pd), + PDSTAT_STATE_MASK, PDCTL_NEXT); + + regmap_write(psc->regmap, PTCMD, BIT(psc->pd)); + + regmap_read_poll_timeout(psc->regmap, EPCPR, epcpr, + epcpr & BIT(psc->pd), 0, 0); + + regmap_write_bits(psc->regmap, PDCTL(psc->pd), PDCTL_EPCGOOD, + PDCTL_EPCGOOD); + } else { + regmap_write(psc->regmap, PTCMD, BIT(psc->pd)); + } + + regmap_read_poll_timeout(psc->regmap, PTSTAT, ptstat, + !(ptstat & BIT(psc->pd)), 0, 0); + + regmap_read_poll_timeout(psc->regmap, MDSTAT(psc->lpsc), mdstat, + (mdstat & MDSTAT_STATE_MASK) == next_state, + 0, 0); +} + +static int davinci_psc_clk_enable(struct clk_hw *hw) +{ + struct davinci_psc_clk *psc = to_davinci_psc_clk(hw); + + psc_config(psc, PSC_STATE_ENABLE); + + return 0; +} + +static void davinci_psc_clk_disable(struct clk_hw *hw) +{ + struct davinci_psc_clk *psc = to_davinci_psc_clk(hw); + + psc_config(psc, PSC_STATE_DISABLE); +} + +static int davinci_psc_clk_is_enabled(struct clk_hw *hw) +{ + struct davinci_psc_clk *psc = to_davinci_psc_clk(hw); + u32 mdstat; + + regmap_read(psc->regmap, MDSTAT(psc->lpsc), &mdstat); + + return (mdstat & MDSTAT_MCKOUT) ? 1 : 0; +} + +static const struct clk_ops davinci_psc_clk_ops = { + .enable = davinci_psc_clk_enable, + .disable = davinci_psc_clk_disable, + .is_enabled = davinci_psc_clk_is_enabled, +}; + +/** + * davinci_psc_clk_register - register psc clock + * @dev: device that is registering this clock + * @name: name of this clock + * @parent_name: name of clock's parent + * @regmap: PSC MMIO region + * @lpsc: local PSC number + * @pd: power domain + * @flags: LPSC_* flags + */ +static struct clk *davinci_psc_clk_register(const char *name, + const char *parent_name, + struct regmap *regmap, + u32 lpsc, u32 pd, u32 flags) +{ + struct clk_init_data init; + struct davinci_psc_clk *psc; + struct clk *clk; + + psc = kzalloc(sizeof(*psc), GFP_KERNEL); + if (!psc) + return ERR_PTR(-ENOMEM); + + init.name = name; + init.ops = &davinci_psc_clk_ops; + init.parent_names = (parent_name ? &parent_name : NULL); + init.num_parents = (parent_name ? 1 : 0); + init.flags = CLK_SET_RATE_PARENT; + + if (flags & LPSC_ALWAYS_ENABLED) + init.flags |= CLK_IS_CRITICAL; + + psc->regmap = regmap; + psc->hw.init = &init; + psc->lpsc = lpsc; + psc->pd = pd; + psc->flags = flags; + + clk = clk_register(NULL, &psc->hw); + if (IS_ERR(clk)) + kfree(psc); + + return clk; +} + +/* + * FIXME: This needs to be converted to a reset controller. But, the reset + * framework is currently device tree only. + */ + +static int davinci_psc_clk_reset(struct davinci_psc_clk *psc, bool reset) +{ + u32 mdctl; + + if (IS_ERR_OR_NULL(psc)) + return -EINVAL; + + mdctl = reset ? 0 : MDCTL_LRESET; + regmap_write_bits(psc->regmap, MDCTL(psc->lpsc), MDCTL_LRESET, mdctl); + + return 0; +} + +int davinci_clk_reset_assert(struct clk *clk) +{ + struct davinci_psc_clk *psc = to_davinci_psc_clk(__clk_get_hw(clk)); + + return davinci_psc_clk_reset(psc, true); +} +EXPORT_SYMBOL(davinci_clk_reset_assert); + +int davinci_clk_reset_deassert(struct clk *clk) +{ + struct davinci_psc_clk *psc = to_davinci_psc_clk(__clk_get_hw(clk)); + + return davinci_psc_clk_reset(psc, false); +} +EXPORT_SYMBOL(davinci_clk_reset_deassert); + +static const struct regmap_config davinci_psc_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, +}; + +struct clk_onecell_data * +davinci_psc_register_clocks(void __iomem *base, + const struct davinci_psc_clk_info *info, + u8 num_clks) +{ + struct clk_onecell_data *clk_data; + struct regmap *regmap; + + clk_data = clk_alloc_onecell_data(num_clks); + if (!clk_data) { + pr_err("%s: Out of memory\n", __func__); + return NULL; + } + + regmap = regmap_init_mmio(NULL, base, &davinci_psc_regmap_config); + if (IS_ERR(regmap)) { + pr_err("%s: regmap_init_mmio failed (%ld)\n", __func__, + PTR_ERR(regmap)); + clk_free_onecell_data(clk_data); + return NULL; + } + + for (; info->name; info++) { + struct clk *clk; + + clk = davinci_psc_clk_register(info->name, info->parent, regmap, + info->lpsc, info->pd, info->flags); + if (IS_ERR(clk)) { + pr_warn("%s: Failed to register %s (%ld)\n", __func__, + info->name, PTR_ERR(clk)); + continue; + } + + clk_data->clks[info->lpsc] = clk; + } + + return clk_data; +} + +#ifdef CONFIG_OF +void of_davinci_psc_clk_init(struct device_node *node, + const struct davinci_psc_clk_info *info, + u8 num_clks) +{ + struct clk_onecell_data *clk_data; + void __iomem *base; + + base = of_iomap(node, 0); + if (!base) { + pr_err("%s: ioremap failed\n", __func__); + return; + } + + clk_data = davinci_psc_register_clocks(base, info, num_clks); + if (!clk_data) + return; + + of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); +} +#endif diff --git a/drivers/clk/davinci/psc.h b/drivers/clk/davinci/psc.h new file mode 100644 index 0000000..6022f6e --- /dev/null +++ b/drivers/clk/davinci/psc.h @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Clock driver for TI Davinci PSC controllers + * + * Copyright (C) 2017 David Lechner + */ + +#ifndef __CLK_DAVINCI_PSC_H__ +#define __CLK_DAVINCI_PSC_H__ + +#include + +/* PSC quirk flags */ +#define LPSC_ALWAYS_ENABLED BIT(1) /* never disable this clock */ +#define LPSC_FORCE BIT(2) /* requires MDCTL FORCE bit */ +#define LPSC_LOCAL_RESET BIT(3) /* acts as reset provider */ + +struct clk_onecell_data; + +struct davinci_psc_clk_info { + const char *name; + const char *parent; + u32 lpsc; + u32 pd; + unsigned long flags; + bool has_reset; +}; + +#define LPSC(l, d, n, p, f) \ +{ \ + .name = #n, \ + .parent = #p, \ + .lpsc = (l), \ + .pd = (d), \ + .flags = (f), \ +} + +struct clk_onecell_data * +davinci_psc_register_clocks(void __iomem *base, + const struct davinci_psc_clk_info *info, + u8 num_clks); + +#ifdef CONFIG_OF +void of_davinci_psc_clk_init(struct device_node *node, + const struct davinci_psc_clk_info *info, + u8 num_clks); +#endif + +#endif /* __CLK_DAVINCI_PSC_H__ */