From patchwork Mon Mar 13 13:26:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9620875 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 904EF60414 for ; Mon, 13 Mar 2017 13:29:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82CE128497 for ; Mon, 13 Mar 2017 13:29:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77A0C2849D; Mon, 13 Mar 2017 13:29:03 +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 [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 23FD328497 for ; Mon, 13 Mar 2017 13:29:03 +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=Pv7bmkI8Luthd0mXBPlppfzdUbf6xtsek+W51BBG6jI=; b=TEqA/zzYryQduyphaKR1++yrFr nTEV5iqTUbyeW8Xi/q51dAk5jCdiJp4eqyLyYkPi5bxLGKcBxAbxQ43K8AXDEJjso4B9AoicZh/6H meldpOpC1m3F6IuU9CbE8sVNKKxKLkRlbmU5zTFPs/dHAsul8LiD2aQd/kFCsQmITOnGrPggfrO+n Px8mrnYZO9892NO4oMKEVHkR78DWOSdhF4vKd+jenyjqpsjmqFUvo5aeUCjPoAHL2Ysu5eC+71CK0 Eft+pLTUJB85lZJ6eMN7w3OpySh0Rzu1kq9ZWLvU3GfMRAQ/7pPBfAKHAUmrGemAdipGqboQ+d5jN 98TV3OOw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cnQ1v-0003RF-JD; Mon, 13 Mar 2017 13:28:55 +0000 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cnQ0K-0002JU-90 for linux-amlogic@lists.infradead.org; Mon, 13 Mar 2017 13:27:20 +0000 Received: by mail-wr0-x22a.google.com with SMTP id l37so103648444wrc.1 for ; Mon, 13 Mar 2017 06:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HXl336VRVtXZ3JkXJP2ZdrtuFoGMbg0Z59zFo+dHIY0=; b=C8ylSpyhyZgANmVLrwDfcWzwGDAvBmBhVm3h+H3qKDmdPG2TlMtnNCNJLTodOJevAd iM5C3/rbhzbyMTXHHInnApZJZQJPuDfIrN4JJVYdyFmT5fPoQLXuTtdqZ4scFjF9OuS+ WeUOGPwsXHnp37hxxpoh/OhqJbBkl79tjSl2avpX94COX/QrGjSjwrJDSSVY2wnIDUTe 4Ke0nwSP0An1N0LaiUB0gUFtIY+ijLwqvB8PaoQH9WeKBcqfwgsQX1/DYXZgqHFprANH J00QZIQ0aDa7/pP8G00MhZoEDKI0mljQaBETrHrv6AEJcCAy1l86paz2ej79wMlx78d8 BCVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HXl336VRVtXZ3JkXJP2ZdrtuFoGMbg0Z59zFo+dHIY0=; b=bi96cadJh/3PkmjoeYuTwun0CmwwPfMLQLQOW64jkbHs/z0oM5G+QDNpKzTC3D3hHm oE1xaZf+ZvhN+t8wB3UZ8bhrMHH849gRyon9fBO0SffR1Fofg555eyhQ0IZAtzGDwJcr 8xgclivEyl5W2S/uoRImErblBhIhDlo1uS49fpiRtHNOV9hsgQOYFA7uq1HvYmdiRbK4 R8+jXSWegD0ThMrOQnzjjNPFlsswcnF4fZ2xQ1LsJVltgYl/mKz/eruNmV4+P5hHCKU1 gMQLQV4FhWSPT/VRTtac9CsRAPzWmr98Lw4rpFTLT38PEFvGq/QdmV69rKWkWHkhIBIs r1uQ== X-Gm-Message-State: AMke39lRNNi4xRhOhwFpK9nbHaCyjCwC/pkL9NMPQpdC0/Nf2L0d4+d4EE4JsmVbyFHTd466 X-Received: by 10.223.163.7 with SMTP id c7mr27557466wrb.17.1489411613949; Mon, 13 Mar 2017 06:26:53 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 5sm24968931wrd.58.2017.03.13.06.26.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Mar 2017 06:26:53 -0700 (PDT) From: Neil Armstrong To: mturquette@baylibre.com, sboyd@codeaurora.org, carlo@caione.org, khilman@baylibre.com Subject: [PATCH 1/5] clk: meson: Add support for parameters for specific PLLs Date: Mon, 13 Mar 2017 14:26:40 +0100 Message-Id: <1489411604-18700-2-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489411604-18700-1-git-send-email-narmstrong@baylibre.com> References: <1489411604-18700-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170313_062716_472531_B87BE1AB X-CRM114-Status: GOOD ( 15.86 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In recent Amlogic GXBB, GXL and GXM SoCs, the GP0 PLL needs some specific parameters in order to initialize and lock correctly. This patch adds an optional PARAM table used to initialize the PLL to a default value with it's parameters in order to achieve to desired frequency. The GP0 PLL in GXBB, GXL/GXM also needs some tweaks in the initialization steps, and these are exposed along the PARAM table. Signed-off-by: Neil Armstrong --- drivers/clk/meson/clk-pll.c | 52 +++++++++++++++++++++++++++++++++++++++++++-- drivers/clk/meson/clkc.h | 23 ++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index 4adc1e8..aff223b 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -116,6 +116,29 @@ static const struct pll_rate_table *meson_clk_get_pll_settings(struct meson_clk_ return NULL; } +/* Specific wait loop for GXL/GXM GP0 PLL */ +static int meson_clk_pll_wait_lock_reset(struct meson_clk_pll *pll, + struct parm *p_n) +{ + int delay = 100; + u32 reg; + + while (delay > 0) { + reg = readl(pll->base + p_n->reg_off); + writel(reg | MESON_PLL_RESET, pll->base + p_n->reg_off); + udelay(10); + writel(reg & ~MESON_PLL_RESET, pll->base + p_n->reg_off); + + mdelay(1); + + reg = readl(pll->base + p_n->reg_off); + if (reg & MESON_PLL_LOCK) + return 0; + delay--; + } + return -ETIMEDOUT; +} + static int meson_clk_pll_wait_lock(struct meson_clk_pll *pll, struct parm *p_n) { @@ -132,6 +155,15 @@ static int meson_clk_pll_wait_lock(struct meson_clk_pll *pll, return -ETIMEDOUT; } +static void meson_clk_pll_init_params(struct meson_clk_pll *pll) +{ + int i; + + for (i = 0 ; i < pll->params.params_count ; ++i) + writel(pll->params.params_table[i].value, + pll->base + pll->params.params_table[i].reg_off); +} + static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { @@ -151,10 +183,16 @@ static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate, if (!rate_set) return -EINVAL; + /* Initialize the PLL in a clean state if specified */ + if (pll->params.params_count) + meson_clk_pll_init_params(pll); + /* PLL reset */ p = &pll->n; reg = readl(pll->base + p->reg_off); - writel(reg | MESON_PLL_RESET, pll->base + p->reg_off); + /* If no_init_reset is provided, avoid resetting at this point */ + if (!pll->params.no_init_reset) + writel(reg | MESON_PLL_RESET, pll->base + p->reg_off); reg = PARM_SET(p->width, p->shift, reg, rate_set->n); writel(reg, pll->base + p->reg_off); @@ -184,7 +222,17 @@ static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate, } p = &pll->n; - ret = meson_clk_pll_wait_lock(pll, p); + /* If unreset_for_lock is provided, remove the reset bit here */ + if (pll->params.unreset_for_lock) { + reg = readl(pll->base + p->reg_off); + writel(reg & ~MESON_PLL_RESET, pll->base + p->reg_off); + } + + /* If reset_lock_loop, use a special loop including resetting */ + if (pll->params.reset_lock_loop) + ret = meson_clk_pll_wait_lock_reset(pll, p); + else + ret = meson_clk_pll_wait_lock(pll, p); if (ret) { pr_warn("%s: pll did not lock, trying to restore old rate %lu\n", __func__, old_rate); diff --git a/drivers/clk/meson/clkc.h b/drivers/clk/meson/clkc.h index 9bb70e7..5f1c12d 100644 --- a/drivers/clk/meson/clkc.h +++ b/drivers/clk/meson/clkc.h @@ -62,6 +62,28 @@ struct pll_rate_table { .frac = (_frac), \ } \ +struct pll_params_table { + unsigned int reg_off; + unsigned int value; +}; + +#define PLL_PARAM(_reg, _val) \ + { \ + .reg_off = (_reg), \ + .value = (_val), \ + } + +struct pll_setup_params { + struct pll_params_table *params_table; + unsigned int params_count; + /* Workaround for GP0, do not reset before configuring */ + bool no_init_reset; + /* Workaround for GP0, unreset right before checking for lock */ + bool unreset_for_lock; + /* Workaround for GXL GP0, reset in the lock checking loop */ + bool reset_lock_loop; +}; + struct meson_clk_pll { struct clk_hw hw; void __iomem *base; @@ -70,6 +92,7 @@ struct meson_clk_pll { struct parm frac; struct parm od; struct parm od2; + const struct pll_setup_params params; const struct pll_rate_table *rate_table; unsigned int rate_count; spinlock_t *lock;