Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
From:   Frank Li <Frank.Li@nxp.com>
To:     imx@lists.linux.dev, Richard Zhu <hongxing.zhu@nxp.com>,
        Lucas Stach <l.stach@pengutronix.de>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kw@linux.com>,
        Rob Herring <robh@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Conor Dooley <conor+dt@kernel.org>,
        Shawn Guo <shawnguo@kernel.org>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Pengutronix Kernel Team <kernel@pengutronix.de>,
        Fabio Estevam <festevam@gmail.com>,
        NXP Linux Team <linux-imx@nxp.com>,
        linux-pci@vger.kernel.org (open list:PCI DRIVER FOR IMX6),
        linux-arm-kernel@lists.infradead.org (moderated list:PCI DRIVER FOR
        IMX6),
        devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED
        DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 2/9] PCI: imx6: Simplify phy handling by using by using IMX6_PCIE_FLAG_HAS_PHY
Date:   Wed,  6 Dec 2023 10:58:56 -0500
Message-Id: <20231206155903.566194-3-Frank.Li@nxp.com>
In-Reply-To: <20231206155903.566194-1-Frank.Li@nxp.com>
References: <20231206155903.566194-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YrKeC2gHT3uIprgJkzHG6cDdXHBeQeCXyPWqEQVndPNuNGA1UhlBCi2mjWNw?=
 =?us-ascii?Q?i6RWcNj6iANvhlyJJvTOT7GyxsUOPp3rDcpZTv6BWCHzK1HEYh7okrQPuDME?=
 =?us-ascii?Q?fYTLf5l8fD2Z6SCd3PL/Z8ZArBZsnIATuYIYk02juiK5Q98zivuYaCnUZ1C3?=
 =?us-ascii?Q?xVnbXHsaa1lsOAX8pDQxDBicM5S65Ueg/LnFl6UPCx3l+lvJ95PMu9PMxJtL?=
 =?us-ascii?Q?LHdwhj2mz9WSNhU5he8WFHFNoTOCUUo4RorrjCq0hDMIfk/C44J8qXjlhuGO?=
 =?us-ascii?Q?4Cs9ptNa05ZSwjNz3XrweRN3S6XdrffrzKtFmI8oyhRaRqyMvtZo9A7eiqHT?=
 =?us-ascii?Q?qvqNB1piF2QPJLMWMwTeaL09mc0mC+xuAI/HufV3bZ/OlL0nYJv6DGYl4KvW?=
 =?us-ascii?Q?Fwmljs9UhjB2RmLfmytn7toG1oQbtDdzlaKrq/59AJcVl3esmvnKVS8BQfkI?=
 =?us-ascii?Q?1Hy8nLm/1MVL6h862fAL/ftAJrhmiVhpBZT3A8GUv48p2vRjpH1oyM2qdG4t?=
 =?us-ascii?Q?eJLB1GrUE+mxnWabTbyw1Uf0agg7aPUyNlRyt/RT1oygO80LVjIPrdHM2aQA?=
 =?us-ascii?Q?ofqYjousk8WVlKhN3u1xuk3seSIQzRbnY8bVfQe0NC9752j48KSrPzB+ekub?=
 =?us-ascii?Q?PLRCvFWY7ILYlO/cCAT8qWfr6TU2siwKtzQCBojzxmQcVwjWxReEQq/PFHLh?=
 =?us-ascii?Q?c1HY6Q5zI8hvQavRFgjyHv/+z6qT1WtY4+JrvITsv9BlI+w/QfZdbAaqmICe?=
 =?us-ascii?Q?bKSHfyCIUlLNEAVqDOBWz38fKfwFVcjEfZaP/4ZOeBIaZ35jpiQsj+cIIyFT?=
 =?us-ascii?Q?HnIHqX0Qs0IriUbh7Xx6pUrEpi9B5Gj7mIuUifuDwvdaXufPIDxkjgjJWvsm?=
 =?us-ascii?Q?a3Er50EsSpRea8Mgg2zNPNLKfZj9zwiGDZykVmsYQANtB1nEs6/nIpy87vxI?=
 =?us-ascii?Q?eVjwuxWBSibFNtZESI/FMdpaj7OQWvtgYReh91px5I20SxmIm4QwDfx/obAR?=
 =?us-ascii?Q?iDY34HSFdDwbHAPRldNi57SUFuKxHnckVHjDmBob/aX/iOJLndT/UXoxJJl7?=
 =?us-ascii?Q?GHU/6o5AYTKcZtsNRD5VcPb6UTAKzhCXmzQKmfSJpQZp17DtjgI6vJZrpvrE?=
 =?us-ascii?Q?x3xJavY0CKOG+0iEeiZZWh9OnSXZktz6XQnrBYCruC+l3ns96LPnL771y8nE?=
 =?us-ascii?Q?pA7RSmrJiuGhQTLLWBjsSQfHEpq18oNeb74cKfTV26MBCXzLSf5qrXl+7ABe?=
 =?us-ascii?Q?ym0NM6xbMx5IIcPqt0iZq54ogCbEbyeRqKmPsP8u4lubn/fSJtHlDbNEPJHB?=
 =?us-ascii?Q?RJBi5NJodFq2o096F5v+AYude7j161PXE5EI5ZK2r676dxcjHDMi51iLjQSc?=
 =?us-ascii?Q?krlgBSj1ExCK6GlxZWeURGi2mHyBLF3jFLLtyPm3KiP6eV3kJrhMDXfoKggt?=
 =?us-ascii?Q?iEIkFOOY/qBDGai/9JxHw4ZS8gE7imVTVJ4aKfOl526tnIfOP0jhEJ21aVKt?=
 =?us-ascii?Q?7kLxf/+S2OjsrTf7bzTWfXRZC3XxV+lcb9aiWJwyLa06Muk6lZ1vbDnOLPlp?=
 =?us-ascii?Q?ixgGUqMKJRsPDATKg6A=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e4313d05-6fbe-4469-3727-08dbf6745684
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 15:59:33.2912
 (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: MGNYtr20AZ/DcpUHHMGQKHbFDSewKHud+nVzzhWOOEMZIXgRCQUY7sBNAWf6RYLXLK5GxT/S6yddLg4BDS+cvA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8123
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 06 Dec 2023 08:00:02 -0800 (PST)

Refactors the phy handling logic in the imx6 PCI driver by adding
IMX6_PCIE_FLAG_HAS_PHY bitmask define for drvdata::flags.

The drvdata::flags and a bitmask ensures a cleaner and more scalable
switch-case structure for handling phy.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 8a9b527934f8..bcf52aa86462 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -62,6 +62,7 @@ enum imx6_pcie_variants {
 #define IMX6_PCIE_FLAG_SUPPORTS_SUSPEND		BIT(2)
 #define IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI	BIT(3)
 #define IMX6_PCIE_FLAG_HAS_CLK_AUX		BIT(4)
+#define IMX6_PCIE_FLAG_HAS_PHY			BIT(5)
 
 #define imx6_check_flag(pci, val)	(pci->drvdata->flags & val)
 
@@ -1327,6 +1328,13 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 					     "pcie_aux clock source missing or invalid\n");
 	}
 
+	if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_PHY)) {
+		imx6_pcie->phy = devm_phy_get(dev, "pcie-phy");
+		if (IS_ERR(imx6_pcie->phy))
+			return dev_err_probe(dev, PTR_ERR(imx6_pcie->phy),
+					     "failed to get pcie phy\n");
+	}
+
 	switch (imx6_pcie->drvdata->variant) {
 	case IMX7D:
 		if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR)
@@ -1356,11 +1364,6 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 			return dev_err_probe(dev, PTR_ERR(imx6_pcie->apps_reset),
 					     "failed to get pcie apps reset control\n");
 
-		imx6_pcie->phy = devm_phy_get(dev, "pcie-phy");
-		if (IS_ERR(imx6_pcie->phy))
-			return dev_err_probe(dev, PTR_ERR(imx6_pcie->phy),
-					     "failed to get pcie phy\n");
-
 		break;
 	default:
 		break;
@@ -1500,24 +1503,28 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 	[IMX8MM] = {
 		.variant = IMX8MM,
 		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND |
-			 IMX6_PCIE_FLAG_HAS_CLK_AUX,
+			 IMX6_PCIE_FLAG_HAS_CLK_AUX |
+			 IMX6_PCIE_FLAG_HAS_PHY,
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 	},
 	[IMX8MP] = {
 		.variant = IMX8MP,
 		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND |
-			 IMX6_PCIE_FLAG_HAS_CLK_AUX,
+			 IMX6_PCIE_FLAG_HAS_CLK_AUX |
+			 IMX6_PCIE_FLAG_HAS_PHY,
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 	},
 	[IMX8MQ_EP] = {
 		.variant = IMX8MQ_EP,
-		.flags = IMX6_PCIE_FLAG_HAS_CLK_AUX,
+		.flags = IMX6_PCIE_FLAG_HAS_CLK_AUX |
+			 IMX6_PCIE_FLAG_HAS_PHY,
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mq-iomuxc-gpr",
 	},
 	[IMX8MM_EP] = {
 		.variant = IMX8MM_EP,
-		.flags = IMX6_PCIE_FLAG_HAS_CLK_AUX,
+		.flags = IMX6_PCIE_FLAG_HAS_CLK_AUX |
+			 IMX6_PCIE_FLAG_HAS_PHY,
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 	},
-- 
2.34.1