From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D79C7C43381 for ; Tue, 19 Mar 2019 09:56:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AC3E213F2 for ; Tue, 19 Mar 2019 09:56:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="UxNSvKyu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725862AbfCSJ4C (ORCPT ); Tue, 19 Mar 2019 05:56:02 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54663 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725906AbfCSJ4B (ORCPT ); Tue, 19 Mar 2019 05:56:01 -0400 Received: by mail-wm1-f68.google.com with SMTP id f3so16064131wmj.4 for ; Tue, 19 Mar 2019 02:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=NrP4Mi9oeJxxGsdJ7+Eiov2NQ2xo2XxCE9zjWrUOj+k=; b=UxNSvKyuApAmuff+KKZx9ep1+B2y80nsXl42EDjuURnJccuEsQuXtlmUid+0kgMA3r +MrlswW2uyVznivOM77mj5b2BLmpmeVaSGA/rHDo/X0pYpuIS0JURSscKq/UuPCHzGQ8 W7Ljc9mcepJ7wwEFo/ZBH3oegPYKeReZ53xekj+2RB0v1QXMCEnJZHMyc/iCoSowEKBT P7JvKFZtUklOzqxSel+8eI6kddf/IMONuy6qLB17Qt3GhIvw3GKVL+lVK95MtCLhpefp 7lgCmzLDMkjc6kH8OcBekwiuJyjtfnhRr4xm9yKDdzkDfvEQ9qh2dADnvMPvmWvUSxkq Y/wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=NrP4Mi9oeJxxGsdJ7+Eiov2NQ2xo2XxCE9zjWrUOj+k=; b=qb/eMJEX09tcQ/nH7dTQYbwGvA2oFcUavww8e8H0XWx3HEn1VpHC+DB9V03yLf03Rb 5kDnNzBEQzkpNZ5V/Xf8drDdIvcvLQAyFaV5K/ylT0jM34a4b6W4w0//fb2BNe7V1B2f HI/oEQ1XwyY2frkdkZyWcMgTpY58vz/EuAcmrrC67XaCfP6Dxn+RsxHzSyhuw7j7QcCn 7YuHQ9rDKSFJfCOya80U1/Xsj7/hI5a54VlU5W4yI+xTPAuEMqDs8K2ICbf0hL9knNdy HpKGPgLE2HSi5o1uwYOz3Ofevh0NLtZbbcFSGtWAbWyiMLire9HK/1JB+TX49CFMEiNw 3prg== X-Gm-Message-State: APjAAAW5BnUAKpK9yQPd3UcfTVJdt7gHIkHQCj8SAFNv56SWE/F6rsrA uMyAt/UUJOudhl8zx8XTwgTU6Q== X-Google-Smtp-Source: APXvYqw9XNFgfMyTb59DlP+RsgWiv+jG45b3uMwXygdijh3aGekXr1kcNtoqxB2AIwABPaB0SAvk8Q== X-Received: by 2002:a1c:eb1a:: with SMTP id j26mr2678872wmh.43.1552989358684; Tue, 19 Mar 2019 02:55:58 -0700 (PDT) Received: from boomer.baylibre.com ([2a01:e34:eeb6:4690:106b:bae3:31ed:7561]) by smtp.gmail.com with ESMTPSA id d9sm25841879wrn.72.2019.03.19.02.55.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 19 Mar 2019 02:55:57 -0700 (PDT) Message-ID: Subject: Re: [PATCH 3/3] clk: meson-g12a: add PCIE PLL clocks From: Jerome Brunet To: Neil Armstrong Cc: linux-clk@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Date: Tue, 19 Mar 2019 10:55:56 +0100 In-Reply-To: <20190307141455.23879-4-narmstrong@baylibre.com> References: <20190307141455.23879-1-narmstrong@baylibre.com> <20190307141455.23879-4-narmstrong@baylibre.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5 (3.30.5-1.fc29) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org On Thu, 2019-03-07 at 15:14 +0100, Neil Armstrong wrote: > Add the PCIe reference clock feeding the USB3 + PCIE combo PHY. > > This PLL needs a very precise register sequence to permit to be locked, > thus using the specific clk-pll pcie ops. > > The PLL is then followed by : > - a fixed /2 divider > - a 5-bit 1-based divider > - a final /2 divider > > This reference clock is fixed to 100MHz, thus only a single PLL setup > is added. > > Signed-off-by: Neil Armstrong > --- > drivers/clk/meson/g12a.c | 118 +++++++++++++++++++++++++++++++++++++++ > drivers/clk/meson/g12a.h | 5 +- > 2 files changed, 122 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c > index 80a7172df2a6..d382c21a29e5 100644 > --- a/drivers/clk/meson/g12a.c > +++ b/drivers/clk/meson/g12a.c > @@ -614,6 +614,118 @@ static struct clk_regmap g12a_hifi_pll = { > }, > }; > > +/* > + * The Meson G12A PCIE PLL is fined tuned to deliver a very precise > + * 100MHz reference clock for the PCIe Analog PHY, and thus requires > + * a strict register sequence to enable the PLL. > + */ > +static const struct reg_sequence g12a_pcie_pll_init_regs[] = { > + { .reg = HHI_PCIE_PLL_CNTL0, .def = 0x20090496 }, > + { .reg = HHI_PCIE_PLL_CNTL0, .def = 0x30090496 }, > + { .reg = HHI_PCIE_PLL_CNTL1, .def = 0x00000000 }, > + { .reg = HHI_PCIE_PLL_CNTL2, .def = 0x00001100 }, > + { .reg = HHI_PCIE_PLL_CNTL3, .def = 0x10058e00 }, > + { .reg = HHI_PCIE_PLL_CNTL4, .def = 0x000100c0 }, > + { .reg = HHI_PCIE_PLL_CNTL5, .def = 0x68000048 }, > + { .reg = HHI_PCIE_PLL_CNTL5, .def = 0x68000068, .delay_us = 20 }, > + { .reg = HHI_PCIE_PLL_CNTL4, .def = 0x008100c0, .delay_us = 10 }, > + { .reg = HHI_PCIE_PLL_CNTL0, .def = 0x34090496 }, > + { .reg = HHI_PCIE_PLL_CNTL0, .def = 0x14090496, .delay_us = 10 }, > + { .reg = HHI_PCIE_PLL_CNTL2, .def = 0x00001000 }, > +}; > + > +/* Keep a single entry table for recalc/round_rate() ops */ > +static const struct pll_params_table g12a_pcie_pll_table[] = { > + PLL_PARAMS(150, 1), > + {0, 0}, > +}; > + > +static struct clk_regmap g12a_pcie_pll_dco = { > + .data = &(struct meson_clk_pll_data){ > + .en = { > + .reg_off = HHI_PCIE_PLL_CNTL0, > + .shift = 28, > + .width = 1, > + }, > + .m = { > + .reg_off = HHI_PCIE_PLL_CNTL0, > + .shift = 0, > + .width = 8, > + }, > + .n = { > + .reg_off = HHI_PCIE_PLL_CNTL0, > + .shift = 10, > + .width = 5, > + }, > + .frac = { > + .reg_off = HHI_PCIE_PLL_CNTL1, > + .shift = 0, > + .width = 12, > + }, > + .l = { > + .reg_off = HHI_PCIE_PLL_CNTL0, > + .shift = 31, > + .width = 1, > + }, > + .rst = { > + .reg_off = HHI_PCIE_PLL_CNTL0, > + .shift = 29, > + .width = 1, > + }, > + .table = g12a_pcie_pll_table, > + .init_regs = g12a_pcie_pll_init_regs, > + .init_count = ARRAY_SIZE(g12a_pcie_pll_init_regs), > + }, > + .hw.init = &(struct clk_init_data){ > + .name = "pcie_pll_dco", > + .ops = &meson_clk_pcie_pll_ops, > + .parent_names = (const char *[]){ IN_PREFIX "xtal" }, > + .num_parents = 1, > + }, > +}; > + > +static struct clk_fixed_factor g12a_pcie_pll_dco_div2 = { > + .mult = 1, > + .div = 2, > + .hw.init = &(struct clk_init_data){ > + .name = "pcie_pll_dco_div2", > + .ops = &clk_fixed_factor_ops, > + .parent_names = (const char *[]){ "pcie_pll_dco" }, > + .num_parents = 1, > + .flags = CLK_SET_RATE_PARENT, > + }, > +}; > + > +static struct clk_regmap g12a_pcie_pll_od = { > + .data = &(struct clk_regmap_div_data){ > + .offset = HHI_PCIE_PLL_CNTL0, > + .shift = 16, > + .width = 5, > + .flags = CLK_DIVIDER_ROUND_CLOSEST | > + CLK_DIVIDER_ONE_BASED | > + CLK_DIVIDER_ALLOW_ZERO, That's unusual ! Ods have always been power of two divider so far. I suppose you have noticed and checked this as well ? That being said, the doc seems to imply that the global post divider will divide by 36, which seems difficult to reach with powers of two. > + }, > + .hw.init = &(struct clk_init_data){ > + .name = "pcie_pll_od", > + .ops = &clk_regmap_divider_ops, > + .parent_names = (const char *[]){ "pcie_pll_dco_div2" }, > + .num_parents = 1, > + .flags = CLK_SET_RATE_PARENT, > + }, > +}; > + > +static struct clk_fixed_factor g12a_pcie_pll = { > + .mult = 1, > + .div = 2, > + .hw.init = &(struct clk_init_data){ > + .name = "pcie_pll_pll", > + .ops = &clk_fixed_factor_ops, > + .parent_names = (const char *[]){ "pcie_pll_od" }, > + .num_parents = 1, > + .flags = CLK_SET_RATE_PARENT, > + }, > +}; > + > static struct clk_regmap g12a_hdmi_pll_dco = { > .data = &(struct meson_clk_pll_data){ > .en = { > @@ -2499,6 +2611,10 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = { > [CLKID_CPU_CLK_AXI] = &g12a_cpu_clk_axi.hw, > [CLKID_CPU_CLK_TRACE_DIV] = &g12a_cpu_clk_trace_div.hw, > [CLKID_CPU_CLK_TRACE] = &g12a_cpu_clk_trace.hw, > + [CLKID_PCIE_PLL_DCO] = &g12a_pcie_pll_dco.hw, > + [CLKID_PCIE_PLL_DCO_DIV2] = &g12a_pcie_pll_dco_div2.hw, > + [CLKID_PCIE_PLL_OD] = &g12a_pcie_pll_od.hw, > + [CLKID_PCIE_PLL] = &g12a_pcie_pll.hw, > [NR_CLKS] = NULL, > }, > .num = NR_CLKS, > @@ -2685,6 +2801,8 @@ static struct clk_regmap *const g12a_clk_regmaps[] = { > &g12a_cpu_clk_axi, > &g12a_cpu_clk_trace_div, > &g12a_cpu_clk_trace, > + &g12a_pcie_pll_od, > + &g12a_pcie_pll_dco, > }; > > static const struct meson_eeclkc_data g12a_clkc_data = { > diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h > index 70aa469ca1cf..1393a09730a6 100644 > --- a/drivers/clk/meson/g12a.h > +++ b/drivers/clk/meson/g12a.h > @@ -186,8 +186,11 @@ > #define CLKID_CPU_CLK_AXI 195 > #define CLKID_CPU_CLK_TRACE_DIV 196 > #define CLKID_CPU_CLK_TRACE 197 > +#define CLKID_PCIE_PLL_DCO 198 > +#define CLKID_PCIE_PLL_DCO_DIV2 199 > +#define CLKID_PCIE_PLL_OD 200 > > -#define NR_CLKS 198 > +#define NR_CLKS 202 > > /* include the CLKIDs that have been made part of the DT binding */ > #include