From patchwork Mon Aug 29 15:16:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 12958029 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE1E5C0502C for ; Mon, 29 Aug 2022 15:17:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/zxUu8zSh9VUF79PHNtF+H1abW2Kay6c3Mk5Qj27Lkg=; b=2eMXWEk44B8dpp 0bI4poaHu7EP83NF6nxJ+vZSUL9yFxHav2Zr9KedsEp12iW2rpid8BRLHlzj9nmW9Czx5dZnN+gFU yiW1gj7rV1jdX6QdUZzLDqJzejurT7vlu0OBBtUZhBDjNhKaFV0XCrFb8CwRyKHiPMtlYyYpKXtRl QBGrcZDgD1IlDKl54SjrOJuKz/3QJ81PsNsIrCHseQ5lUD2HkJZkpVfyn0r3Yd8jkk9w7K6dvHMJV qoPS+iNEs41bQr1b2MOWTgKBsUc2RHKMjJLNPjqD8MuhFilKiD2SX4XRBUCOjFXw+lejVK3pNPU9p vZfP0VfHllIS/2PYAplA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSgVI-00BJL8-Ki; Mon, 29 Aug 2022 15:16:46 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSgVE-00BJJV-S0 for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2022 15:16:42 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oSgUz-0006bl-1e; Mon, 29 Aug 2022 17:16:25 +0200 From: Lucas Stach To: Richard Zhu Cc: p.zabel@pengutronix.de, bhelgaas@google.com, lorenzo.pieralisi@arm.com, robh@kernel.org, shawnguo@kernel.org, vkoul@kernel.org, alexander.stein@ew.tq-group.com, marex@denx.de, richard.leitner@linux.dev, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH 1/2] soc: imx: imx8mp-blk-ctrl: handle PCIe PHY resets Date: Mon, 29 Aug 2022 17:16:22 +0200 Message-Id: <20220829151623.808344-1-l.stach@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <1661760917-9558-1-git-send-email-hongxing.zhu@nxp.com> References: <1661760917-9558-1-git-send-email-hongxing.zhu@nxp.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220829_081640_908914_B96CA66E X-CRM114-Status: GOOD ( 10.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dessert the PHY reset when powering up the domain and put it back into reset when the domain is powered down. Signed-off-by: Lucas Stach --- drivers/soc/imx/imx8mp-blk-ctrl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/soc/imx/imx8mp-blk-ctrl.c b/drivers/soc/imx/imx8mp-blk-ctrl.c index 4ca2ede6871b..6c939d68ba9a 100644 --- a/drivers/soc/imx/imx8mp-blk-ctrl.c +++ b/drivers/soc/imx/imx8mp-blk-ctrl.c @@ -18,6 +18,8 @@ #define GPR_REG0 0x0 #define PCIE_CLOCK_MODULE_EN BIT(0) #define USB_CLOCK_MODULE_EN BIT(1) +#define PCIE_PHY_APB_RST BIT(4) +#define PCIE_PHY_INIT_RST BIT(5) struct imx8mp_blk_ctrl_domain; @@ -75,6 +77,10 @@ static void imx8mp_hsio_blk_ctrl_power_on(struct imx8mp_blk_ctrl *bc, case IMX8MP_HSIOBLK_PD_PCIE: regmap_set_bits(bc->regmap, GPR_REG0, PCIE_CLOCK_MODULE_EN); break; + case IMX8MP_HSIOBLK_PD_PCIE_PHY: + regmap_set_bits(bc->regmap, GPR_REG0, + PCIE_PHY_APB_RST | PCIE_PHY_INIT_RST); + break; default: break; } @@ -90,6 +96,10 @@ static void imx8mp_hsio_blk_ctrl_power_off(struct imx8mp_blk_ctrl *bc, case IMX8MP_HSIOBLK_PD_PCIE: regmap_clear_bits(bc->regmap, GPR_REG0, PCIE_CLOCK_MODULE_EN); break; + case IMX8MP_HSIOBLK_PD_PCIE_PHY: + regmap_clear_bits(bc->regmap, GPR_REG0, + PCIE_PHY_APB_RST | PCIE_PHY_INIT_RST); + break; default: break; } From patchwork Mon Aug 29 15:16:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 12958028 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6DA39ECAAD5 for ; Mon, 29 Aug 2022 15:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jHYstbDRpFkpFEEYqKQrXK4q1Tc6YujSXfbeHKIz0KE=; b=I1P2QCIs6kl3iN 4x/zSoLHXKGZJXUqtzot69fSpepckYbmdlhdg/iROXulyGmDNFMtfAae6QJlcU6A/dxmgtLC2zcbb RlVt0yneEYAnjHpM8XQ0/gG2EN7JTOLFpSTVAySBlncSrIeqDW3PcmNvgPeOx7FpZqTmR9fQ1ty6h qFPRTJK62oQu6Ghi/70d4mU9G1OY/D/QjNRflYzmUTKAJtu0GWbm6RHDHS/atIMcYZxFzMaLhGEUr DyeOnX0TGJE5THRkC/YV+FSqWS+2fn62w1Z3C9gcGs8UjUJFnZk+rXrtihVMsXoRuL5wqEXx3UNqx IG/0KjTJ4UNSCm2pYCyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSgVS-00BJNY-NQ; Mon, 29 Aug 2022 15:16:54 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSgVG-00BJJl-1x for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2022 15:16:43 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oSgUz-0006bl-QP; Mon, 29 Aug 2022 17:16:25 +0200 From: Lucas Stach To: Richard Zhu Cc: p.zabel@pengutronix.de, bhelgaas@google.com, lorenzo.pieralisi@arm.com, robh@kernel.org, shawnguo@kernel.org, vkoul@kernel.org, alexander.stein@ew.tq-group.com, marex@denx.de, richard.leitner@linux.dev, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH 2/2] fixup! phy: freescale: imx8m-pcie: Add iMX8MP PCIe PHY support Date: Mon, 29 Aug 2022 17:16:23 +0200 Message-Id: <20220829151623.808344-2-l.stach@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220829151623.808344-1-l.stach@pengutronix.de> References: <1661760917-9558-1-git-send-email-hongxing.zhu@nxp.com> <20220829151623.808344-1-l.stach@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220829_081642_106917_02686AB2 X-CRM114-Status: GOOD ( 14.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --- drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 31 +++------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/drivers/phy/freescale/phy-fsl-imx8m-pcie.c b/drivers/phy/freescale/phy-fsl-imx8m-pcie.c index 3463b4299f2f..f714f419b91f 100644 --- a/drivers/phy/freescale/phy-fsl-imx8m-pcie.c +++ b/drivers/phy/freescale/phy-fsl-imx8m-pcie.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -47,10 +48,6 @@ #define IMX8MM_GPR_PCIE_SSC_EN BIT(16) #define IMX8MM_GPR_PCIE_AUX_EN_OVERRIDE BIT(9) -#define IMX8MP_GPR_REG0 0x0 -#define IMX8MP_GPR_PHY_APB_RST BIT(4) -#define IMX8MP_GPR_PHY_INIT_RST BIT(5) - enum imx8_pcie_phy_type { IMX8MM, IMX8MP, @@ -58,10 +55,8 @@ enum imx8_pcie_phy_type { struct imx8_pcie_phy { void __iomem *base; - struct device *dev; struct clk *clk; struct phy *phy; - struct regmap *hsio_blk_ctrl; struct regmap *iomuxc_gpr; struct reset_control *reset; struct reset_control *perst; @@ -93,13 +88,6 @@ static int imx8_pcie_phy_init(struct phy *phy) break; case IMX8MP: reset_control_assert(imx8_phy->perst); - - /* release pcie_phy_apb_reset and pcie_phy_init_resetn */ - regmap_update_bits(imx8_phy->hsio_blk_ctrl, IMX8MP_GPR_REG0, - IMX8MP_GPR_PHY_APB_RST | - IMX8MP_GPR_PHY_INIT_RST, - IMX8MP_GPR_PHY_APB_RST | - IMX8MP_GPR_PHY_INIT_RST); break; } @@ -204,21 +192,16 @@ static int imx8_pcie_phy_probe(struct platform_device *pdev) { struct phy_provider *phy_provider; struct device *dev = &pdev->dev; - const struct of_device_id *of_id; struct device_node *np = dev->of_node; struct imx8_pcie_phy *imx8_phy; struct resource *res; - of_id = of_match_device(imx8_pcie_phy_of_match, dev); - if (!of_id) - return -EINVAL; - imx8_phy = devm_kzalloc(dev, sizeof(*imx8_phy), GFP_KERNEL); if (!imx8_phy) return -ENOMEM; - imx8_phy->dev = dev; - imx8_phy->variant = (enum imx8_pcie_phy_type)of_id->data; + imx8_phy->variant = + (enum imx8_pcie_phy_type)of_device_get_match_data(dev); /* get PHY refclk pad mode */ of_property_read_u32(np, "fsl,refclk-pad-mode", @@ -257,14 +240,6 @@ static int imx8_pcie_phy_probe(struct platform_device *pdev) return PTR_ERR(imx8_phy->reset); } if (imx8_phy->variant == IMX8MP) { - /* Grab HSIO MIX config register range */ - imx8_phy->hsio_blk_ctrl = - syscon_regmap_lookup_by_compatible("fsl,imx8mp-hsio-blk-ctrl"); - if (IS_ERR(imx8_phy->hsio_blk_ctrl)) { - dev_err(dev, "Unable to find HSIO MIX registers\n"); - return PTR_ERR(imx8_phy->hsio_blk_ctrl); - } - imx8_phy->perst = devm_reset_control_get_exclusive(dev, "perst"); if (IS_ERR(imx8_phy->perst)) {