From patchwork Fri Jun 10 00:32:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Turquette X-Patchwork-Id: 9168683 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 66139604DB for ; Fri, 10 Jun 2016 00:33:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 590B928047 for ; Fri, 10 Jun 2016 00:33:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E11A28368; Fri, 10 Jun 2016 00:33:23 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0B0C628047 for ; Fri, 10 Jun 2016 00:33:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bBAO2-0005Zt-CW; Fri, 10 Jun 2016 00:33:22 +0000 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bBAO0-0005WA-Kn for linux-amlogic@lists.infradead.org; Fri, 10 Jun 2016 00:33:21 +0000 Received: by mail-pa0-x232.google.com with SMTP id hl6so17964306pac.2 for ; Thu, 09 Jun 2016 17:33:00 -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=htgnV/UNAkBrUQMGZxVSDARTHmrcXUsaC5X28XchyyE=; b=lQF2bspGwIhYQK+M3aWCW7EW7eR7A9h0nkMOY4Nx2d+M1vNPuCQ7sKqrYcLjzx3Vwq Ec7rZZbsiCIJr5SV073CDWjHWbn/3m0mcF6/h5VcZZKslOYRUYOZ8z6AugimcGYPO9hl /IYLPo8PJHB+JbRPBVVPw9A28IUCFv9hPIQQ7VwqVeh61LQTM7R5kRqVPTfYWtLOdQzU 69YjRydD07BxJT9nUZBkBVWI2JStg0WJUvkTDEzGFY+ZXhzXgKU99Ow5mhvKCLsebKSV Ak1KTy+2WzVqdx/sgnluOuRsRRb8vbWTQHobslbMlozCK8YcCCGNdK+9OmkuxOxAdjJ5 2P1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=htgnV/UNAkBrUQMGZxVSDARTHmrcXUsaC5X28XchyyE=; b=kT4MvCN5p7W/UAi7UKnWDw2jgLv4VAbbPc8pzbFPpodhKV77IVaHoElc9J+BA4x4t6 7rJlE6u8b/hRImpYPRxsmTQ/QSKmgTIArwqQamlbLl8F44c1oPrKuPUMpYKThdlfXL1H UbdVSxDuBf8SSNhGXYU1mQzKkvalKVZqC+BoP8WkEcG2dsicMDZ79A0Eelz1Q70vCkJ5 nu6ldvrRGVaQ0XprNeh/SYRK3m1R3we/VKWTkGFA9SpLg5exQJyhctm4zcep5B1U5tZr GhPMNCui7JJJ2tPQnd1t8xPfHlg8fOaeCmGDBDVmJllsn4pO2jGj4mcVkFTDb8C+kNN6 u6Xw== X-Gm-Message-State: ALyK8tKYS7S9NDTX1mXiUReE7iNf0VM3KmynnVsOxujBC8g47cvnNK5nTEu0iTDZ01pFTJzH X-Received: by 10.66.186.70 with SMTP id fi6mr15266976pac.3.1465518779916; Thu, 09 Jun 2016 17:32:59 -0700 (PDT) Received: from localhost (cpe-172-248-200-249.socal.res.rr.com. [172.248.200.249]) by smtp.gmail.com with ESMTPSA id ih15sm12682943pab.38.2016.06.09.17.32.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jun 2016 17:32:59 -0700 (PDT) From: Michael Turquette To: linux-clk@vger.kernel.org Subject: [PATCH 3/7] clk: meson: fractional pll support Date: Thu, 9 Jun 2016 17:32:50 -0700 Message-Id: <1465518774-26924-4-git-send-email-mturquette@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465518774-26924-1-git-send-email-mturquette@baylibre.com> References: <1465518774-26924-1-git-send-email-mturquette@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160609_173320_711648_690E01DF X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xing.xu@amlogic.com, victor.wan@amlogic.com, khilman@baylibre.com, carlo@endlessm.com, jerry.cao@amlogic.com, linux-amlogic@lists.infradead.org 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 Signed-off-by: Michael Turquette --- drivers/clk/meson/clk-pll.c | 32 ++++++++++++++++++++++++++++++-- drivers/clk/meson/clkc.h | 15 +++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index 60c6b94..4adc1e8 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -53,7 +53,7 @@ static unsigned long meson_clk_pll_recalc_rate(struct clk_hw *hw, struct parm *p; unsigned long parent_rate_mhz = parent_rate / 1000000; unsigned long rate_mhz; - u16 n, m, od; + u16 n, m, frac = 0, od, od2 = 0; u32 reg; p = &pll->n; @@ -68,7 +68,21 @@ static unsigned long meson_clk_pll_recalc_rate(struct clk_hw *hw, reg = readl(pll->base + p->reg_off); od = PARM_GET(p->width, p->shift, reg); - rate_mhz = (parent_rate_mhz * m / n) >> od; + p = &pll->od2; + if (p->width) { + reg = readl(pll->base + p->reg_off); + od2 = PARM_GET(p->width, p->shift, reg); + } + + p = &pll->frac; + if (p->width) { + reg = readl(pll->base + p->reg_off); + frac = PARM_GET(p->width, p->shift, reg); + rate_mhz = (parent_rate_mhz * m + \ + (parent_rate_mhz * frac >> 12)) * 2 / n; + rate_mhz = rate_mhz >> od >> od2; + } else + rate_mhz = (parent_rate_mhz * m / n) >> od >> od2; return rate_mhz * 1000000; } @@ -155,6 +169,20 @@ static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate, reg = PARM_SET(p->width, p->shift, reg, rate_set->od); writel(reg, pll->base + p->reg_off); + p = &pll->od2; + if (p->width) { + reg = readl(pll->base + p->reg_off); + reg = PARM_SET(p->width, p->shift, reg, rate_set->od2); + writel(reg, pll->base + p->reg_off); + } + + p = &pll->frac; + if (p->width) { + reg = readl(pll->base + p->reg_off); + reg = PARM_SET(p->width, p->shift, reg, rate_set->frac); + writel(reg, pll->base + p->reg_off); + } + p = &pll->n; ret = meson_clk_pll_wait_lock(pll, p); if (ret) { diff --git a/drivers/clk/meson/clkc.h b/drivers/clk/meson/clkc.h index 73f0146..53326c3 100644 --- a/drivers/clk/meson/clkc.h +++ b/drivers/clk/meson/clkc.h @@ -40,7 +40,10 @@ struct pll_rate_table { u16 m; u16 n; u16 od; + u16 od2; + u16 frac; }; + #define PLL_RATE(_r, _m, _n, _od) \ { \ .rate = (_r), \ @@ -49,12 +52,24 @@ struct pll_rate_table { .od = (_od), \ } \ +#define PLL_FRAC_RATE(_r, _m, _n, _od, _od2, _frac) \ + { \ + .rate = (_r), \ + .m = (_m), \ + .n = (_n), \ + .od = (_od), \ + .od2 = (_od2), \ + .frac = (_frac), \ + } \ + struct meson_clk_pll { struct clk_hw hw; void __iomem *base; struct parm m; struct parm n; + struct parm frac; struct parm od; + struct parm od2; const struct pll_rate_table *rate_table; unsigned int rate_count; spinlock_t *lock;