From patchwork Mon Jul 13 00:25:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Van Asbroeck X-Patchwork-Id: 11658475 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6629360D for ; Mon, 13 Jul 2020 00:27:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F7952067D for ; Mon, 13 Jul 2020 00:27:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jHafVh2m"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BrZv9/8T" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F7952067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=eBQMQqByZL2IH28uY/p25rCJt4JQ728Ndp5n8cu5+/E=; b=jHafVh2mEHdGyyWX5xDRicOIdJ wytKwo/gUGna8zIEaVtaJ8p1/+iKunMYnR4S1FM36XvSnaDxvwSfnXqjoZJZsnS0VRc94HkYsfFu/ MtZ7y9ZV8J+gYkVF7Wgyzys2OJ8T3cODa6p12getWfk+WS6rGyYByjVSF/0fc8vtNY6YCYiEQOLuM axNcH0d3VIqru047d8jjZrZ94PQ7haRjtefaBmWyrZh8Tvn5x9GIInDGh0Wq8MvRAwuhRIePDzgHy 8AsxwAJOFKAcly34VlV3cisYg5N38FXp068JBlE642XtYF44R1rWnsQszW+X5Kuw/Vq6DYe9fehVJ elormfkw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jumHm-00024S-3z; Mon, 13 Jul 2020 00:25:34 +0000 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jumHa-000219-Ef for linux-arm-kernel@lists.infradead.org; Mon, 13 Jul 2020 00:25:23 +0000 Received: by mail-qt1-x842.google.com with SMTP id k18so8757010qtm.10 for ; Sun, 12 Jul 2020 17:25:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JgHj2BWQPrhnQaPMMFNV2nwDiVdYjO7RB3aO5GzyH+c=; b=BrZv9/8TB75OtJEb8hEG7X366z5/nGCAsrSYyko50Rb/KVl4HHWIkzYe4ZTtfC7CSn svNKN2H/xvWaBnDJCD3T0VJcFzmbSiOwsKigXniF9HJItm36nCka0G6691C0aK0mPnMh xJ5jycZr8CPwPwWcqo54zQnQyWMtITeW9ENW+OWtlD4xRM91zGW3IF1Cf3/yPQnm5IWV 8xhw2BpCu2+x0OvSczJDWtFw+jX5P4/7HxlqH0KY1DaLTBn0FhZ/f6LznGxOZllcUl1j SgQGODjLD01BuTdOV4Yu/VK61TDU8vCOhP6FxkIFQ2YxrDjMij0Y4FuXgcdy843mbrXU 5W5Q== 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=JgHj2BWQPrhnQaPMMFNV2nwDiVdYjO7RB3aO5GzyH+c=; b=PT7Y/NhmQfR09OXruIi2mra62aKafKAlTWuqyZYFYYVHPhlcXxhD/D1iJw/f5+lQbO w/W27JwRBha7Viv5VQesLuuxB4vORMNqjTG3axrgaODa/88aaNRLD2UWUFynz4U6Jrrp 68HpCgDiSUCBKYVvjIuU5prjkWQKUVOd1CovCS/zngkGtYyXhtmP+VBp0UPMWPh6XEtX qFmVfsiCqmrsjfmr4V+J/HHD3KJ6Qdm07iioa5MyVVAIPSBaiDtNtqdOBFnfBYaqfk8m csv5Nr9gr0KMt3R/doDVMsJJP7FFcymmMhsO4TDau1KGYV/EfD/XSOb7V+ehmrU51lgY AK9g== X-Gm-Message-State: AOAM532JqNJ5ASFgIwLIBKNmeqctS6RSDqfT+b6XF5WAw4N0JGhhMK/g fwf8LxqfRkYJ3T3WgjpDqF0= X-Google-Smtp-Source: ABdhPJzen7JV5VR6696sjedTEkdewWidv4Db4Q2QTTCa6eH/M9EHJlz89ccx29KzPcWnTukyDtKqEw== X-Received: by 2002:ac8:1667:: with SMTP id x36mr70871607qtk.344.1594599920703; Sun, 12 Jul 2020 17:25:20 -0700 (PDT) Received: from localhost.localdomain ([72.53.229.195]) by smtp.gmail.com with ESMTPSA id u5sm17044309qke.32.2020.07.12.17.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2020 17:25:20 -0700 (PDT) From: Sven Van Asbroeck X-Google-Original-From: Sven Van Asbroeck To: shawnguo@kernel.org, s.hauer@pengutronix.de Subject: [PATCH v1 4/5] clk: imx6q: support improved enet clocking on QuadPlus Date: Sun, 12 Jul 2020 20:25:11 -0400 Message-Id: <20200713002512.28742-5-TheSven73@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200713002512.28742-1-TheSven73@gmail.com> References: <20200713002512.28742-1-TheSven73@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200712_202522_538321_D221095E X-CRM114-Status: GOOD ( 20.13 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:842 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [thesven73[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [thesven73[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , Fabio Estevam , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On the imx6q QuadPlus, hardware designers have improved the enet clocking: _ anaclk3---------| \ | | _ |M |--enet_pad-->| \ | | | | enet_ref---o--->|_/ |M |----enet_ptp | | | o---------------------|_/ Where anaclk3 is an external clock fed into the imx6q via a pad, typically RGMII_TX_CTL or GPIO_16, when these are configured in mux mode ENET_REF_CLK. Board designers can now change the clock tree (via the devicetree) to choose between all three supported enet clocking methods. See follow-up devicetree patch for details. Signed-off-by: Sven Van Asbroeck --- Tree: v5.8-rc4 To: Shawn Guo To: Sascha Hauer Cc: Pengutronix Kernel Team Cc: Fabio Estevam Cc: NXP Linux Team Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-clk@vger.kernel.org drivers/clk/imx/clk-imx6q.c | 46 +++++++++++++++++++++ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 + 2 files changed, 47 insertions(+) diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c index ba33c79158de..0edffa306a28 100644 --- a/drivers/clk/imx/clk-imx6q.c +++ b/drivers/clk/imx/clk-imx6q.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include "clk.h" @@ -87,6 +89,8 @@ static const char *pll4_bypass_sels[] = { "pll4", "pll4_bypass_src", }; static const char *pll5_bypass_sels[] = { "pll5", "pll5_bypass_src", }; static const char *pll6_bypass_sels[] = { "pll6", "pll6_bypass_src", }; static const char *pll7_bypass_sels[] = { "pll7", "pll7_bypass_src", }; +static const char * const enet_pad_sels[] = { "anaclk3", "enet_ref", }; +static const char * const enet_ptp_sels[] = { "enet_pad", "enet_ref", }; static struct clk_hw **hws; static struct clk_hw_onecell_data *clk_hw_data; @@ -436,6 +440,7 @@ static struct clk_hw * __init imx6q_obtain_fixed_clk_hw(struct device_node *np, static void __init imx6q_clocks_init(struct device_node *ccm_node) { + struct regmap *gpr; struct device_node *np; void __iomem *anatop_base, *base; int ret; @@ -464,6 +469,9 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) WARN_ON(!base); of_node_put(np); + gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr"); + WARN_ON(IS_ERR_OR_NULL(gpr)); + /* Audio/video PLL post dividers do not work on i.MX6q revision 1.0 */ if (clk_on_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_1_0) { post_div_table[1].div = 1; @@ -959,6 +967,44 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) /* Audio-related clocks configuration */ clk_set_parent(hws[IMX6QDL_CLK_SPDIF_SEL]->clk, hws[IMX6QDL_CLK_PLL3_PFD3_454M]->clk); + /* + * The QuadPlus has improved enet clocking: + * _ + * anaclk3---------| \ + * | | _ + * |M |--enet_pad-->| \ + * | | | | + * enet_ref---o--->|_/ |M |----enet_ptp + * | | | + * o---------------------|_/ + * + * On the plus, three options to generate the enet ptp clock: + * + * a) route enet_ref externally from pad to pad (the default): + * enet_ptp from enet_pad + * enet_pad from enet_ref + * b) route internally on SoC from enet_ref: + * enet_ptp from enet_ref + * c) route external clock (from PHY or oscillator) via pad: + * enet_ptp from enet_pad + * enet_pad from anaclk3 + * anaclk3 from PHY or oscillator, add devicetree node + */ + if (clk_on_imx6qp()) { + /* + * anaclk3: clock source from external clock via: + * - RGMII_TX_CTL PAD (mux mode ENET_REF_CLK), or + * - GPIO_16 PAD (mux mode ENET_REF_CLK) + */ + hws[IMX6QDL_CLK_ANACLK3] = imx6q_obtain_fixed_clk_hw(ccm_node, "anaclk3", 0); + hws[IMX6QDL_CLK_ENET_PAD] = imx_clk_hw_mux_regmap("enet_pad", gpr, IOMUXC_GPR1, ffs(IMX6Q_GPR1_ENET_CLK_SEL_MASK) - 1, + 1, enet_pad_sels, ARRAY_SIZE(enet_pad_sels)); + hws[IMX6QDL_CLK_ENET_PTP] = imx_clk_hw_mux_regmap("enet_ptp", gpr, IOMUXC_GPR5, ffs(IMX6Q_GPR5_ENET_TXCLK_SEL_MASK) - 1, + 1, enet_ptp_sels, ARRAY_SIZE(enet_ptp_sels)); + clk_set_parent(hws[IMX6QDL_CLK_ENET_PAD]->clk, hws[IMX6QDL_CLK_ENET_REF]->clk); + clk_set_parent(hws[IMX6QDL_CLK_ENET_PTP]->clk, hws[IMX6QDL_CLK_ENET_PAD]->clk); + } + /* All existing boards with PCIe use LVDS1 */ if (IS_ENABLED(CONFIG_PCI_IMX6)) clk_set_parent(hws[IMX6QDL_CLK_LVDS1_SEL]->clk, hws[IMX6QDL_CLK_SATA_REF_100M]->clk); diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h index d4b5e527a7a3..ac1bb3695933 100644 --- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h +++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h @@ -240,6 +240,7 @@ #define IMX6Q_GPR4_IPU_RD_CACHE_CTL BIT(0) #define IMX6Q_GPR5_L2_CLK_STOP BIT(8) +#define IMX6Q_GPR5_ENET_TXCLK_SEL_MASK BIT(9) #define IMX6Q_GPR5_SATA_SW_PD BIT(10) #define IMX6Q_GPR5_SATA_SW_RST BIT(11)