From patchwork Wed Dec 14 08:14:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Yushchenko X-Patchwork-Id: 9473837 X-Patchwork-Delegate: sboyd@codeaurora.org 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 EF6CC60823 for ; Wed, 14 Dec 2016 08:14:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDB23286E6 for ; Wed, 14 Dec 2016 08:14:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D02E6286EF; Wed, 14 Dec 2016 08:14:54 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16AB3286E6 for ; Wed, 14 Dec 2016 08:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754866AbcLNIOx (ORCPT ); Wed, 14 Dec 2016 03:14:53 -0500 Received: from mail-lf0-f45.google.com ([209.85.215.45]:33913 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754804AbcLNIOw (ORCPT ); Wed, 14 Dec 2016 03:14:52 -0500 Received: by mail-lf0-f45.google.com with SMTP id y21so7774202lfa.1 for ; Wed, 14 Dec 2016 00:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=htql+hKkDjKpLWj2vBacR+bPS5ymkMoa99EjkN0OYC0=; b=SRHo+PTckRAyGIZJsHa6PDxgVjxTa+mC3skM92rQ+eVP83ZYiGd9ZG9/DV34hn0idD VBrwjBeXlJVRsNvGI5fILPLMhX/c6AGDttx5sF0ToX0yVAx77PZ0B39iZHufa6S+N//l ap8qt139Yr2/cRpI8+aqokfPa3X6CCX0bk51nrsO2CPncEhcY4Q3lkesUu6706erby1t QR5wrS/MxfT9Yge7qZ98UeMIkcBHhacHYmEqsKQnbaTLp2K9MEgrJ2XSjJdEj4IMhIdN WFXxRf1nIXosvjZy6JASvWiOnC6tWEvIs7eoXr5I5ZzK9tt+MT5fQoQH1gHAypXRKihw 6lag== 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; bh=htql+hKkDjKpLWj2vBacR+bPS5ymkMoa99EjkN0OYC0=; b=l45CEvAgGmL/tkOP/wyYQp57Cmjva4O3vKu2Lil1IhBnKcZninfTauV0kV85a3ONEI +cHfpHr5RM3SVtJEYeKzgG5+SzdcsXJcsJVQzCiNDsRwQfE7EK8bhSTjV14oLL/XJiJr f++SGa3mlsv187UlHtZ/sXXtgK+nNpEKOrGuoBqoimjp/tG76xox0D3FUJdSc3j78Vre pAFbXJktfh4zXGZia75UVJfMqIT4dRyRCD5gC/vteUJpTM9lFk6Ae09HxsAmTuWZtwIl IBMzGAsbHFSwsFErSYGHOGrQQuiN/QOvUGE4MFZ8bq2I+d8R/wPyMxVt3GdHJouzqDyX tLUQ== X-Gm-Message-State: AKaTC01UZ5nWA/4wNJtYoj5yC28Gxl23f4tKLwyR3AaDvhgACCUoLL+zt/fPjWYT6TMgNw== X-Received: by 10.25.43.130 with SMTP id r124mr33351567lfr.122.1481703277752; Wed, 14 Dec 2016 00:14:37 -0800 (PST) Received: from hugenb.home (nikaet.starlink.ru. [94.141.168.29]) by smtp.gmail.com with ESMTPSA id y3sm10488018lfj.42.2016.12.14.00.14.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Dec 2016 00:14:37 -0800 (PST) From: Nikita Yushchenko To: Shawn Guo , Sascha Hauer , Fabio Estevam , Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org Cc: Chris Healy , linux-kernel@vger.kernel.org, Andrey Smirnov , Nikita Yushchenko Subject: [PATCH v2] clk: imx: pllv3: support fractional multiplier on vf610 PLL1/PLL2 Date: Wed, 14 Dec 2016 11:14:22 +0300 Message-Id: <1481703262-16668-1-git-send-email-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.1.4 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On vf610, PLL1 and PLL2 have registers to configure fractional part of frequency multiplier. This patch adds support for these registers. This fixes "fast system clock" issue on boards where bootloader sets fractional multiplier for PLL1. Suggested-by: Andrey Smirnov CC: Chris Healy Signed-off-by: Nikita Yushchenko --- This version restructures the patch: - introduce explicit structure to store mf (multiply factor) consisting of integer part, numenator and denumenator; - provides routines that: - calculate rate based on parent rate and mf, - read mf from hw, - write mf to hw, - calculate best mf for wanted rate; - implement recalc_rate() / round_rate() / set_rate() based on these. drivers/clk/imx/clk-pllv3.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/imx/clk-vf610.c | 4 +- drivers/clk/imx/clk.h | 1 + 3 files changed, 113 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index 7a6acc3e4a92..89ab42e7d6c0 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/imx/clk-pllv3.c @@ -21,6 +21,9 @@ #define PLL_NUM_OFFSET 0x10 #define PLL_DENOM_OFFSET 0x20 +#define PLL_VF610_NUM_OFFSET 0x20 +#define PLL_VF610_DENOM_OFFSET 0x30 + #define BM_PLL_POWER (0x1 << 12) #define BM_PLL_LOCK (0x1 << 31) #define IMX7_ENET_PLL_POWER (0x1 << 5) @@ -292,6 +295,110 @@ static const struct clk_ops clk_pllv3_av_ops = { .set_rate = clk_pllv3_av_set_rate, }; +struct clk_pllv3_vf610_mf { + u32 mfi; /* integer part, can be 20 or 22 */ + u32 mfn; /* numinator, 30-bit value */ + u32 mfd; /* denomenator, 30-bit value, must be less than mfn */ +}; + +static unsigned long clk_pllv3_vf610_calc_rate(unsigned long parent_rate, + struct clk_pllv3_vf610_mf *mf) +{ + u64 temp64; + + temp64 = parent_rate; + temp64 *= mf->mfn; + do_div(temp64, mf->mfd); + + return (parent_rate * mf->mfi) + temp64; +} + +static void clk_pllv3_vf610_mf_from_hw(struct clk_hw *hw, + struct clk_pllv3_vf610_mf *mf) +{ + struct clk_pllv3 *pll = to_clk_pllv3(hw); + + mf->mfn = readl_relaxed(pll->base + PLL_VF610_NUM_OFFSET); + mf->mfd = readl_relaxed(pll->base + PLL_VF610_DENOM_OFFSET); + mf->mfi = (readl_relaxed(pll->base) & pll->div_mask) ? 22 : 20; +} + +static void clk_pllv3_vf610_mf_to_hw(struct clk_hw *hw, + struct clk_pllv3_vf610_mf *mf) +{ + struct clk_pllv3 *pll = to_clk_pllv3(hw); + u32 val; + + val = readl_relaxed(pll->base); + if (mf->mfi == 20) + val &= ~pll->div_mask; /* clear bit for mfi=20 */ + else + val |= pll->div_mask; /* set bit for mfi=22 */ + writel_relaxed(val, pll->base); + + writel_relaxed(mf->mfn, pll->base + PLL_VF610_NUM_OFFSET); + writel_relaxed(mf->mfd, pll->base + PLL_VF610_DENOM_OFFSET); +} + +static void clk_pllv3_vf610_mf_for_rate(unsigned long rate, + unsigned long parent_rate, struct clk_pllv3_vf610_mf *mf) +{ + u64 temp64; + + mf->mfi = (rate >= 22 * parent_rate) ? 22 : 20; + mf->mfd = 0x3fffffff; /* use max supported value for best accuracy */ + + if (rate <= parent_rate * mf->mfi) + mf->mfn = 0; + else if (rate >= parent_rate * (mf->mfi + 1)) + mf->mfn = mf->mfd - 1; + else { + /* rate = parent_rate * (mfi + mfn/mfd) */ + temp64 = rate - parent_rate * mf->mfi; + temp64 *= mf->mfd; + do_div(temp64, parent_rate); + mf->mfn = temp64; + } +} + +static unsigned long clk_pllv3_vf610_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct clk_pllv3_vf610_mf mf; + + clk_pllv3_vf610_mf_from_hw(hw, &mf); + return clk_pllv3_vf610_calc_rate(parent_rate, &mf); +} + +static long clk_pllv3_vf610_round_rate(struct clk_hw *hw, unsigned long rate, + unsigned long *prate) +{ + struct clk_pllv3_vf610_mf mf; + + clk_pllv3_vf610_mf_for_rate(rate, *prate, &mf); + return clk_pllv3_vf610_calc_rate(*prate, &mf); +} + +static int clk_pllv3_vf610_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct clk_pllv3_vf610_mf mf; + + clk_pllv3_vf610_mf_for_rate(rate, parent_rate, &mf); + clk_pllv3_vf610_mf_to_hw(hw, &mf); + + return clk_pllv3_wait_lock(to_clk_pllv3(hw)); +} + +static const struct clk_ops clk_pllv3_vf610_ops = { + .prepare = clk_pllv3_prepare, + .unprepare = clk_pllv3_unprepare, + .is_prepared = clk_pllv3_is_prepared, + .recalc_rate = clk_pllv3_vf610_recalc_rate, + .round_rate = clk_pllv3_vf610_round_rate, + .set_rate = clk_pllv3_vf610_set_rate, +}; + static unsigned long clk_pllv3_enet_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { @@ -326,6 +433,9 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, case IMX_PLLV3_SYS: ops = &clk_pllv3_sys_ops; break; + case IMX_PLLV3_SYS_VF610: + ops = &clk_pllv3_vf610_ops; + break; case IMX_PLLV3_USB_VF610: pll->div_shift = 1; case IMX_PLLV3_USB: diff --git a/drivers/clk/imx/clk-vf610.c b/drivers/clk/imx/clk-vf610.c index 0476353ab423..59b1863deb88 100644 --- a/drivers/clk/imx/clk-vf610.c +++ b/drivers/clk/imx/clk-vf610.c @@ -219,8 +219,8 @@ static void __init vf610_clocks_init(struct device_node *ccm_node) clk[VF610_CLK_PLL6_BYPASS_SRC] = imx_clk_mux("pll6_bypass_src", PLL6_CTRL, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels)); clk[VF610_CLK_PLL7_BYPASS_SRC] = imx_clk_mux("pll7_bypass_src", PLL7_CTRL, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels)); - clk[VF610_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll1", "pll1_bypass_src", PLL1_CTRL, 0x1); - clk[VF610_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2", "pll2_bypass_src", PLL2_CTRL, 0x1); + clk[VF610_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_SYS_VF610, "pll1", "pll1_bypass_src", PLL1_CTRL, 0x1); + clk[VF610_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_SYS_VF610, "pll2", "pll2_bypass_src", PLL2_CTRL, 0x1); clk[VF610_CLK_PLL3] = imx_clk_pllv3(IMX_PLLV3_USB_VF610, "pll3", "pll3_bypass_src", PLL3_CTRL, 0x2); clk[VF610_CLK_PLL4] = imx_clk_pllv3(IMX_PLLV3_AV, "pll4", "pll4_bypass_src", PLL4_CTRL, 0x7f); clk[VF610_CLK_PLL5] = imx_clk_pllv3(IMX_PLLV3_ENET, "pll5", "pll5_bypass_src", PLL5_CTRL, 0x3); diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index 3799ff82a9b4..99a617897831 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -34,6 +34,7 @@ enum imx_pllv3_type { IMX_PLLV3_AV, IMX_PLLV3_ENET, IMX_PLLV3_ENET_IMX7, + IMX_PLLV3_SYS_VF610, }; struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,