From patchwork Mon Jun 17 20:16:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13701400 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 BE636C27C79 for ; Mon, 17 Jun 2024 20:32:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To: In-Reply-To:References:Message-Id:Content-Transfer-Encoding:Content-Type: Subject:Date:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BFZ9y59NHvkPdCbZdfCtsYWQoubEyRTUZZdNbOF+uvs=; b=V0yJfB34Mh0uVZX+s0aKDwd6NQ /6rvUIIQQazrb3fGgWBGag5qUsYVIHJ0pmuRC7lQ//b5OuhdtWC4llS5t8kNkHQPjJohc6Yg0fQqb sjqhjBeHloPaLBvaaBtR7Js5TSFdy7Z1lhnq2QGNgq9anWTqJeAGxXGfDwcY4fUvb/pZYrjgWGqnX o3442RUJMlR6VWYuXT7VkonctDJuSRo0u6WZRxo+5ZrJS2Ks8PKwoEHCzmFnEro9RpI1jM45gVmDy Labxl+tL4dGjKd1fmPuTYnQGbgvj5cw3NFV3hLGozOaZALcB9QMZxYKUIF+ZvLH0W6EJsE3Y0/Io6 +wHCcF3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJJ1j-0000000CXqQ-31GR; Mon, 17 Jun 2024 20:32:31 +0000 Received: from mail-db3eur04on0602.outbound.protection.outlook.com ([2a01:111:f400:fe0c::602] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJJ1f-0000000CXnp-0tnP for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2024 20:32:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hedIVkg2El+B0dZN6ylBwMn4jMFw7MZYdvKR6t8CTk7mIzL45MUdBfqT3W4Odg6CXgWnpQNcz4JAIe+1hPbe2RKznTBZb/rm5Gq9Ima4CkL5L2ImyrFZlu0ZTj3wNJA2tVPFkZi1jtbMTe/T6voi2tZTzJIxzvqzjo2+n8EPGcijp0FUo0IGlWXm1bU/gz7BinJ09AaJPPQX5xfSAIML1tv8DFjrsdnyBtzlnGh11SlnaFo8h1UvsUQmjNtgULJjHILxD1Tk7fPxHpDVGtRxpt9LgkNk/feht86Yo26biGBbPmvXI4cuYuxHGHr7LtZsJqS9Ek5H35rxjVIvCgRqFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BFZ9y59NHvkPdCbZdfCtsYWQoubEyRTUZZdNbOF+uvs=; b=iYK9MImEKSyDpboKcRFA/PCszi4Izq7NCBOmR+1xorUMjmLv3vT5KcVn/O8BPIbiW0RfaBeRmU2Gm02snZLu+X3M9zT6P15hDG8Xpx831Lfjy8hW8VR+JPYCL6ZGPh+5FEH0/KTD0vP2TzzXLEsazlifxL5tG4M+yp2U7VzAlOtRq0vlXAu+IbrNTgsCuVGwFMzF3HhuED3CCOIr9gLea/E+qyIEEHUCyHjWHc7qLWNICcJ4drd+ukXf8RVgOoEgDrIgzaILprDwG9kSyfbULr2sdcqAJezIOHDxNh0zE0wNI1diLVpHcv/kV3TmNELYc+sKEUGoHkXyntJo0Qv5Kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BFZ9y59NHvkPdCbZdfCtsYWQoubEyRTUZZdNbOF+uvs=; b=LRBotwmlZHkreOaahvdfj3XurXFdMiWHK7MufhY41XsMcjrshT01rT9++7LKdewI9nEearDil1qHrDsEy29E8diPkX5C5zhIxRIaZ+16Ln0XuyOTmm7J2XBAu5QDkmOUH7tVj7ghKbA4g7qkjFosOnEkyKMUcAvLu7ADbRxlNVg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by PA4PR04MB7997.eurprd04.prod.outlook.com (2603:10a6:102:c9::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.30; Mon, 17 Jun 2024 20:17:35 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7677.030; Mon, 17 Jun 2024 20:17:35 +0000 From: Frank Li Date: Mon, 17 Jun 2024 16:16:40 -0400 Subject: [PATCH v6 04/10] PCI: imx6: Introduce SoC specific callbacks for controlling REFCLK Message-Id: <20240617-pci2_upstream-v6-4-e0821238f997@nxp.com> References: <20240617-pci2_upstream-v6-0-e0821238f997@nxp.com> In-Reply-To: <20240617-pci2_upstream-v6-0-e0821238f997@nxp.com> To: Richard Zhu , Lucas Stach , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Rob Herring , Bjorn Helgaas , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Philipp Zabel , Liam Girdwood , Mark Brown , Manivannan Sadhasivam , Krzysztof Kozlowski , Conor Dooley Cc: linux-pci@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, devicetree@vger.kernel.org, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1718655424; l=8294; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=AfTVrCLrEti1105wDAcVWo6jI2pjgIWKJzNX5Ep+/9w=; b=1Jmd0QbXMPxXo3v3/vatM08XLdpHfMiGbqmJnhHDVAXFbCE2KLER23dNPPZDb0nCj74uRnziJ VBowt2kmJrdD60z5T8ImK/30Qg7gxFz4YFzfeOge6jJtzkg98mKWqNX X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR05CA0116.namprd05.prod.outlook.com (2603:10b6:a03:334::31) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|PA4PR04MB7997:EE_ X-MS-Office365-Filtering-Correlation-Id: 99f2cad9-2e60-45f0-f5e3-08dc8f0a86b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230037|376011|7416011|1800799021|366013|52116011|38350700011|921017; X-Microsoft-Antispam-Message-Info: =?utf-8?q?v0DG3AYuIJvcVpA0fobPNL/f3px4tNQ?= =?utf-8?q?8IeW9UMWKm1kI3TVGzaV2x78SpfsIH4MmX4INjvOB1+OxvRfZi12hT+BUo0V6HbWq?= =?utf-8?q?7WD6Ra6AJItU+5Io7ii7hbtylrfz1JFaKqdrPymKXtaibKuFOyS/wcwPXYYf7Pd5+?= =?utf-8?q?/CMOuuXxCwSCJOSp8xEImaubwS74maTeQHm9Z6XN1DhG+uTf9Wgwgah+jC7/OkLZ6?= =?utf-8?q?B3ot4/lgGz1FT2h7UJtrjzQnILHrGNMzIVc3Sx61gJIPFBtStCO3YrxqDZmA3Cd5M?= =?utf-8?q?3cKvQwcfOO9OzBIffGQ9N8Sf/nAOU2DbYGTm35yRoBC9JDWXHpvKOQdPBJugtZhWs?= =?utf-8?q?Z7pLgDXbXYQIbm+3llGAwiHqdvuMEIw8cBB6tFOinvc9K9JaYRDbwChSvcLmEBNYJ?= =?utf-8?q?dS0HdZXwSvRMA8Ci2jf8zQC12CXHBH8U+H6IY6Gd3O7TG3Jw2EAuxsP2jkdn9qbDe?= =?utf-8?q?2NV4kofj4w+p9y5H8jXcbgVdGpH2dTVx09GcOFMHWa3JfRI24j3KQfLIVlieM+T/W?= =?utf-8?q?+I0ifMsL32QfQCuapoWWj+a9W/ZT61Ogzamh0CAk/OutI0X851t5vZAFerwVpHgQp?= =?utf-8?q?VcPKXSR4AO1MeFMZMTVUkWEhxj5OiHhXI69/KKWCmHPeax8txodC5+TtmN8FAebs4?= =?utf-8?q?/up/OoMr+l6/IEuZNGx5WBLjSuj7cVHH7QAFAXfWfUf/85NVEXvpF2WCUseYACuM+?= =?utf-8?q?OfarqpjlK88ZF5gsOK6dX/t8C/aVdRzy8/Uu6ga0hGLaZ7lrMqnShW2irtvVs/XPS?= =?utf-8?q?9CCptGmUqHZkQwFRUYWNtN0E0xNxySGcaQuTUIKgR4NybNZ0+CixUiEaoRf8vbnFB?= =?utf-8?q?sfPejLKEKHR1MMdlAPSbA99EkWheE8TImJg4TxQ/puwYyyMwKEJu1u6J7S/S1L6kw?= =?utf-8?q?KGqJAppzWHcSvOyQDBLRQErUA0DF/Om7ltGlY8OXZssq++eUSlI0PEEasBPClbF59?= =?utf-8?q?aUx9wAph8jZ7kZUQQrSBXopTZd5+3L7hPGxlF9SvEvoxrEWeeRZIsPdsUV7I8v6oQ?= =?utf-8?q?TGWow1iYTXIH/WI1nP+fNVFuSpfsSGLw0BFp4jE6DDmUVYgjKT1JHQnJQ16KLkCPZ?= =?utf-8?q?niSpOBndS4J5LdFJbAEYwIWLZ0nXKSiC6u54h4Raa2EDsJyRcVbRAgCkVXEVKDyfE?= =?utf-8?q?RuHLD3GgUgjhHywhWJNgFbpu11XU7Ihv/KYnkur7kZDBU1sMwOd0Pyf5Jc1OJuwUg?= =?utf-8?q?b9Z0gtXzCoY6dGTRnD8RT+WCOpEtQci5107iQDKb79Xm0U4rxWG3/JpKyGmilyH/X?= =?utf-8?q?rPEuk4GaI9QHoG8N+CIcoZIrisoghGAvm6jHgAMWpSYTDMnUFaxyGMOlw6qDnvWLq?= =?utf-8?q?f0tzeotvEeS4?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230037)(376011)(7416011)(1800799021)(366013)(52116011)(38350700011)(921017);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?2XA8hYVckA1MzqM5kA7RaGcwJ2iE?= =?utf-8?q?WGUlN2/OdimQZ9OXJUu5rlQTxjYAlPWi1lWyIuhwSiNOUlOoxCSWKIHbtW3Q8xxV+?= =?utf-8?q?MoaNdRPDQxBbMcEErNLcCJVFtUKJZxTQ+El5oi8V5Dw2m/KqzNzCbmRA7Mc8bIl39?= =?utf-8?q?lT7mA0rn21kZjXe02/IRL5PAVicolRBnICbHtqgffSW2B4bsUBPVvcdvPee7gNXDG?= =?utf-8?q?54W2hjZJIi8HDW1KS1vh0lPjCiV6PRwap9Vc4KP5yMafZoBJF8v7qNd+4MOeFyIsS?= =?utf-8?q?w5QQui/rKVrW0Xym0igDGjkaZVzrtBmu2CTuyVI3AlddIQjVON4M1b0sYil7t9/lv?= =?utf-8?q?/w6wU4hHbE7oCfa/oVVmx89D1uZs5EAaCiGNlcJKTRwuGjeWv6RDiZG6xAZ/eRzw6?= =?utf-8?q?SoKiwDisT+vyFq5ZCoGxTi1W+c3BIQLZIEt3ey0mTrrZIJ1hxVgCv+uGmdnfW2zwS?= =?utf-8?q?uDZWjLh0o3uO2ekBcmIBxu0NyaBr1PDZH14yLQ7rOwPdooKKvzi0IbeGP61jECKA/?= =?utf-8?q?7cGziPVzp24F1ogHcTHTtmuegmtnWdoE5BcAdDwgaLDYW8wfv+o58qJPEF0K/9KKr?= =?utf-8?q?tPxTk0hwIcZbxd0LD3cTPhM2fPuOH141uRi5DCPBHGkYfeTmH18A6D6gRF449/YX/?= =?utf-8?q?lIhBsGMLAozblS9YmcEfkBP1rmWLSe4XFGkNwbR2eeJ+YGDPVV3h35dHj5fQDd/T1?= =?utf-8?q?dYFFJYsjzPcQeNn4z9T7p6fYnYRIZhhBPZQ0js4U3XKriO32vMpZtgKP5thktJMYm?= =?utf-8?q?+PqTlQVUs/y8abzRLdUqz3aBE8zj+vTlFJMZBL0tAAchfiobqZAwlgQaplzWmzfkO?= =?utf-8?q?Ffzb/IQytriQEckaLdY1lAYtOWeBaseDMpmXMsparK2VpPoJEQ6rXO4RH8BnsmgTn?= =?utf-8?q?5ZIGAq+h79k+3kf8EM9zHtvlvpyFUtC/D8abLdi33au3cTm3EKOpbTQ9icd3k6pSE?= =?utf-8?q?NgizogyNoaDKqk83vRnN+/x1OS8e7h3HVWPqFpSNv/nZ1ULJVzDEapCo8YN0SXDDY?= =?utf-8?q?yea+vLf7IASDwu1WrTxo4ZyIpYlUAZqVD7eNgFtJf5dYUc8LG4DYXT6lYsN6uveQs?= =?utf-8?q?8vhZzrR4VTMX1U8r9CVEn48t6EU7zlx7fecoGg6ZldwyDcNcILjNeoZ6R0gQgErLh?= =?utf-8?q?ZACeIo18LGcX9AJizeI274jaCMLcBoztLiGwK6CAiPa82JIyyBmImb5mU7tiR0bCZ?= =?utf-8?q?wMuT2VEWsEw+zkeinRhlrvGsMjWDXRfKm+kMNj1gB74CYDtAAmVTs1NW9aRtljbjR?= =?utf-8?q?gJGBPRjHCEx8qI5e+iV/tYlev5ZPNTQF9r56jm2WwOVASN6rTVeGWCp/yWNdZR9fO?= =?utf-8?q?V0hywvBKHoFxkC06cmXs6CMeQ5nOHqmpvArLNrMcI6GGVLYXWmp5u+X2GzvkmIsLi?= =?utf-8?q?AErjgYqsnMZWkhXFpnV/GFCEBqWx1zLesA9dfYl2iHd1qq8YptlSUzgXJBF0Z9wPT?= =?utf-8?q?3KWl8qCgwk3ry1HcI/o/Tb/lvN0W/4+CK3Ysq+3ntzFslnH5iaMAyVXIRRQiTgf+E?= =?utf-8?q?N+pIrJhpVUqw?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99f2cad9-2e60-45f0-f5e3-08dc8f0a86b3 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2024 20:17:35.3014 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pzm01p0+tQuhhHiE5K5vT8eYvPR86iAPH/n9AGoPct2rK1bvLgIqtcavIRTvoCHalQFKYYN4Nar3BNrtDTMf6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7997 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240617_133227_520800_426EEE32 X-CRM114-Status: GOOD ( 16.84 ) 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 Instead of using the switch case statement to enable/disable the reference clock handled by this driver itself, let's introduce a new callback set_ref_clk() and define it for platforms that require it. This simplifies the code. Signed-off-by: Frank Li --- drivers/pci/controller/dwc/pci-imx6.c | 112 ++++++++++++++++------------------ 1 file changed, 52 insertions(+), 60 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 47134e2dfecf2..ff9d0098294fa 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -103,6 +103,7 @@ struct imx_pcie_drvdata { const u32 mode_mask[IMX_PCIE_MAX_INSTANCES]; const struct pci_epc_features *epc_features; int (*init_phy)(struct imx_pcie *pcie); + int (*set_ref_clk)(struct imx_pcie *pcie, bool enable); }; struct imx_pcie { @@ -585,21 +586,19 @@ static int imx_pcie_attach_pd(struct device *dev) return 0; } -static int imx_pcie_enable_ref_clk(struct imx_pcie *imx_pcie) +static int imx6sx_pcie_set_ref_clk(struct imx_pcie *imx_pcie, bool enable) { - unsigned int offset; - int ret = 0; + regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6SX_GPR12_PCIE_TEST_POWERDOWN, + enable ? 0 : IMX6SX_GPR12_PCIE_TEST_POWERDOWN); - switch (imx_pcie->drvdata->variant) { - case IMX6SX: - regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12, - IMX6SX_GPR12_PCIE_TEST_POWERDOWN, 0); - break; - case IMX6QP: - case IMX6Q: + return 0; +} + +static int imx6q_pcie_set_ref_clk(struct imx_pcie *imx_pcie, bool enable) +{ + if (enable) { /* power up core phy and enable ref clock */ - regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, - IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18); + regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_TEST_PD, 0); /* * the async reset input need ref clock to sync internally, * when the ref clock comes after reset, internal synced @@ -608,54 +607,34 @@ static int imx_pcie_enable_ref_clk(struct imx_pcie *imx_pcie) */ usleep_range(10, 100); regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, - IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16); - break; - case IMX7D: - case IMX95: - case IMX95_EP: - break; - case IMX8MM: - case IMX8MM_EP: - case IMX8MQ: - case IMX8MQ_EP: - case IMX8MP: - case IMX8MP_EP: - offset = imx_pcie_grp_offset(imx_pcie); - /* - * Set the over ride low and enabled - * make sure that REF_CLK is turned on. - */ - regmap_update_bits(imx_pcie->iomuxc_gpr, offset, - IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE, - 0); - regmap_update_bits(imx_pcie->iomuxc_gpr, offset, - IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE_EN, - IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE_EN); - break; + IMX6Q_GPR1_PCIE_REF_CLK_EN, IMX6Q_GPR1_PCIE_REF_CLK_EN); + } else { + regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, + IMX6Q_GPR1_PCIE_REF_CLK_EN, 0); + regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, + IMX6Q_GPR1_PCIE_TEST_PD, IMX6Q_GPR1_PCIE_TEST_PD); } - return ret; + return 0; } -static void imx_pcie_disable_ref_clk(struct imx_pcie *imx_pcie) +static int imx8mm_pcie_set_ref_clk(struct imx_pcie *imx_pcie, bool enable) { - switch (imx_pcie->drvdata->variant) { - case IMX6QP: - case IMX6Q: - regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, - IMX6Q_GPR1_PCIE_REF_CLK_EN, 0); - regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, - IMX6Q_GPR1_PCIE_TEST_PD, - IMX6Q_GPR1_PCIE_TEST_PD); - break; - case IMX7D: - regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12, - IMX7D_GPR12_PCIE_PHY_REFCLK_SEL, - IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); - break; - default: - break; - } + int offset = imx_pcie_grp_offset(imx_pcie); + + /* Set the over ride low and enabled make sure that REF_CLK is turned on.*/ + regmap_update_bits(imx_pcie->iomuxc_gpr, offset, IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE, + enable ? 0 : IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE); + regmap_update_bits(imx_pcie->iomuxc_gpr, offset, IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE_EN, + enable ? IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE_EN : 0); + return 0; +} + +static int imx7d_pcie_set_ref_clk(struct imx_pcie *imx_pcie, bool enable) +{ + regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX7D_GPR12_PCIE_PHY_REFCLK_SEL, + enable ? 0 : IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); + return 0; } static int imx_pcie_clk_enable(struct imx_pcie *imx_pcie) @@ -668,10 +647,12 @@ static int imx_pcie_clk_enable(struct imx_pcie *imx_pcie) if (ret) return ret; - ret = imx_pcie_enable_ref_clk(imx_pcie); - if (ret) { - dev_err(dev, "unable to enable pcie ref clock\n"); - goto err_ref_clk; + if (imx_pcie->drvdata->set_ref_clk) { + ret = imx_pcie->drvdata->set_ref_clk(imx_pcie, true); + if (ret) { + dev_err(dev, "Failed to enable PCIe REFCLK\n"); + goto err_ref_clk; + } } /* allow the clocks to stabilize */ @@ -686,7 +667,8 @@ static int imx_pcie_clk_enable(struct imx_pcie *imx_pcie) static void imx_pcie_clk_disable(struct imx_pcie *imx_pcie) { - imx_pcie_disable_ref_clk(imx_pcie); + if (imx_pcie->drvdata->set_ref_clk) + imx_pcie->drvdata->set_ref_clk(imx_pcie, false); clk_bulk_disable_unprepare(imx_pcie->drvdata->clks_cnt, imx_pcie->clks); } @@ -1475,6 +1457,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .init_phy = imx_pcie_init_phy, + .set_ref_clk = imx6q_pcie_set_ref_clk, }, [IMX6SX] = { .variant = IMX6SX, @@ -1489,6 +1472,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .init_phy = imx6sx_pcie_init_phy, + .set_ref_clk = imx6sx_pcie_set_ref_clk, }, [IMX6QP] = { .variant = IMX6QP, @@ -1504,6 +1488,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .init_phy = imx_pcie_init_phy, + .set_ref_clk = imx6q_pcie_set_ref_clk, }, [IMX7D] = { .variant = IMX7D, @@ -1516,6 +1501,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .init_phy = imx7d_pcie_init_phy, + .set_ref_clk = imx7d_pcie_set_ref_clk, }, [IMX8MQ] = { .variant = IMX8MQ, @@ -1529,6 +1515,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_off[1] = IOMUXC_GPR12, .mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE, .init_phy = imx8mq_pcie_init_phy, + .set_ref_clk = imx8mm_pcie_set_ref_clk, }, [IMX8MM] = { .variant = IMX8MM, @@ -1540,6 +1527,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .clks_cnt = ARRAY_SIZE(imx8mm_clks), .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .set_ref_clk = imx8mm_pcie_set_ref_clk, }, [IMX8MP] = { .variant = IMX8MP, @@ -1551,6 +1539,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .clks_cnt = ARRAY_SIZE(imx8mm_clks), .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .set_ref_clk = imx8mm_pcie_set_ref_clk, }, [IMX95] = { .variant = IMX95, @@ -1577,6 +1566,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE, .epc_features = &imx8m_pcie_epc_features, .init_phy = imx8mq_pcie_init_phy, + .set_ref_clk = imx8mm_pcie_set_ref_clk, }, [IMX8MM_EP] = { .variant = IMX8MM_EP, @@ -1589,6 +1579,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .epc_features = &imx8m_pcie_epc_features, + .set_ref_clk = imx8mm_pcie_set_ref_clk, }, [IMX8MP_EP] = { .variant = IMX8MP_EP, @@ -1601,6 +1592,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .epc_features = &imx8m_pcie_epc_features, + .set_ref_clk = imx8mm_pcie_set_ref_clk, }, [IMX95_EP] = { .variant = IMX95_EP,