Received-SPF: pass (google.com: domain of linux-kernel+bounces-2461-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Frank Li <Frank.Li@nxp.com>
To: krzysztof.kozlowski@linaro.org
Cc: Frank.li@nxp.com,
	bhelgaas@google.com,
	conor+dt@kernel.org,
	devicetree@vger.kernel.org,
	festevam@gmail.com,
	helgaas@kernel.org,
	hongxing.zhu@nxp.com,
	imx@lists.linux.dev,
	kernel@pengutronix.de,
	krzysztof.kozlowski+dt@linaro.org,
	kw@linux.com,
	l.stach@pengutronix.de,
	linux-arm-kernel@lists.infradead.org,
	linux-imx@nxp.com,
	linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org,
	lpieralisi@kernel.org,
	manivannan.sadhasivam@linaro.org,
	robh@kernel.org,
	s.hauer@pengutronix.de,
	shawnguo@kernel.org
Subject: [PATCH v4 02/15] PCI: imx6: Simplify phy handling by using by using IMX6_PCIE_FLAG_HAS_PHY
Date: Sun, 17 Dec 2023 00:11:57 -0500
Message-Id: <20231217051210.754832-3-Frank.Li@nxp.com>
In-Reply-To: <20231217051210.754832-1-Frank.Li@nxp.com>
References: <20231217051210.754832-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?DI28Cqy3Ybo+22MIEJspsy3yZalrjMbH8L8ObhV9VOdbXiO2irnZx3ukAfX8?=
 =?us-ascii?Q?yxoRJOWLo9oKg0d/MweLlk49VB/aNmZ59edmP+rn/iBA2BgAHi9Sbu2XBGfY?=
 =?us-ascii?Q?/kFueqQ4Qch7LahAqHGklL04aRGYHrr/C0RjlbX/5ayPOwGonKCMxCwYRMT2?=
 =?us-ascii?Q?YCAAu6u/GBRMIUFql9MXTF+mp2ejTjyi23FU3fGjJN6e7nMXwPq2LA3fTwCD?=
 =?us-ascii?Q?se9Hzfz8+D13clzZXWN9jg1EjtMYuBCB2yKMkMCNeWvTs5OANeLo/waHGh/z?=
 =?us-ascii?Q?ahCdWahMOJFxpA4bTNpV21Djz7lJnhsocq5x4K0gpl1ltxtdOG1FZW5GYlwK?=
 =?us-ascii?Q?W8lEHevgZUI7aiMMgkQbE87eqmMGbDso08TKEVJdc4J+Zgq4btAAOfXa5zvl?=
 =?us-ascii?Q?OFJC7ETAnbNi3Zw4dBNeqvcccJTDYcBDC5okMcH8ugzbAiesj0AGLGEVoE28?=
 =?us-ascii?Q?KDBjP2K3bhJeFOTvygs2om6uR9kytQqFGQn75Ec0SakFM+4uxvu3ZNqql2Cw?=
 =?us-ascii?Q?mxHRDt3ZA3pYddId8yEf3E18TuS79xP4Vc6v+qHHuqTon2sB9llA6rNretBv?=
 =?us-ascii?Q?nrIKSmU/9DfKXdwWYT03K/LwgkN2sqeddXcsvaE9CDIHLGutPUZg7CoJYue1?=
 =?us-ascii?Q?NRsMlmlEBSB1pbniJNrJ4DNFxHk3sp6zrW5nSEb79XzL20VY/0bXa7Ozr39E?=
 =?us-ascii?Q?rsMdxNnelSkYzUkfsiUj8Y+H6be8PnOCHAciqAU+0m0us8M5PX1T+6Jv+sWz?=
 =?us-ascii?Q?+rxlLHBMx1Rt24y3KxZvBaP0TCMP6fQMfcO7UDigEhBb+6P/gksfcXOXyrWc?=
 =?us-ascii?Q?bqnqv8SainxyDtFsJ+HW4k614bbJsofFzZnRd/UvMKiiHIh9Ha5ap++lIQF5?=
 =?us-ascii?Q?79yYB+E9Pl1bcCtHMMmhSh91tlsre9q2yqClqrUrISNVI1RIMq8+ExX7Qfum?=
 =?us-ascii?Q?arla3SVh5Wb592bsiXnALyg03LAHYCG9guGBbKKcywh0hP1GqEms9a8HRmoC?=
 =?us-ascii?Q?lAVH6DBGWGRVsBX7QHpwH3H09+fjt8zrdT4SuXcmSo3l+Akh5Qc/pruRG4k6?=
 =?us-ascii?Q?fy4qmqPInlORvvxBx1/AiWmjxp9loAffB+ObZOollSmDVML/UgaemW7p7od2?=
 =?us-ascii?Q?aVh2pLhOKMBGvJxf3/+O2lN2WWJ6UitPiWHrvXWhf713O29HREQJRUR0IhRD?=
 =?us-ascii?Q?+KS3QEZWM9GYq75Gst/ScqRF9lq/aGBisQOg//44WEXqq0BQJHff+XCqNy3N?=
 =?us-ascii?Q?qLm3EJ39P1uwv5HelKLZM2XJw0/UXTkRh0TBaVyIs2Qk3+dVcxjtRZFRupna?=
 =?us-ascii?Q?ViQNzhYCl2k2lPyC+3wAjJAgljon+O0AIrWTMdBb3j82TAfuY7RV3d2C0Zrb?=
 =?us-ascii?Q?QhEyBrwt262sHhsDT3l5s80lqQbpMus5t1/z13nG1BTYR7PdKcpHWtvpkr14?=
 =?us-ascii?Q?DsOwFhgXGTapEFM2XkS3yBobnD09TQIx2ZgoBWbOuHfO8m9vf0P6U7QqaJ/p?=
 =?us-ascii?Q?NHyQvg3fSk+C9Dw2O84Dg0JmgPsnYt4N6QcKn9WWYdSY4JoOP47Z6C13FNQ1?=
 =?us-ascii?Q?aaGqJhJMR5zLJyEtf/w=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d75b788b-a14b-47e4-1db0-08dbfebece06
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2023 05:12:45.8472
 (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: sEZgPxl2h3y91tcIZUMPDx6P3XS/gg2kTGa2SIfyIQbA0WVT3f4IvlXaT95cbmlIWzJlubXFan/sdD6MM4C1iw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8174

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>
---

Notes:
    Change from v1 to v3:
    - none

 drivers/pci/controller/dwc/pci-imx6.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 2086214345e9a..91ba26a4b4c3d 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -60,6 +60,9 @@ enum imx6_pcie_variants {
 #define IMX6_PCIE_FLAG_IMX6_PHY			BIT(0)
 #define IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE	BIT(1)
 #define IMX6_PCIE_FLAG_SUPPORTS_SUSPEND		BIT(2)
+#define IMX6_PCIE_FLAG_HAS_PHY			BIT(3)
+
+#define imx6_check_flag(pci, val)     (pci->drvdata->flags & val)
 
 #define IMX6_PCIE_MAX_CLKS       6
 
@@ -1277,6 +1280,13 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
+	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)
@@ -1306,11 +1316,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;
@@ -1447,13 +1452,15 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 	},
 	[IMX8MM] = {
 		.variant = IMX8MM,
-		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,
+		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND |
+			 IMX6_PCIE_FLAG_HAS_PHY,
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 		.clk_names = {IMX6_CLKS_COMMON, "pcie_aux"},
 	},
 	[IMX8MP] = {
 		.variant = IMX8MP,
-		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,
+		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND |
+			 IMX6_PCIE_FLAG_HAS_PHY,
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 		.clk_names = {IMX6_CLKS_COMMON, "pcie_aux"},
 	},
@@ -1465,12 +1472,14 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 	},
 	[IMX8MM_EP] = {
 		.variant = IMX8MM_EP,
+		.flags = IMX6_PCIE_FLAG_HAS_PHY,
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 		.clk_names = {IMX6_CLKS_COMMON, "pcie_aux"},
 	},
 	[IMX8MP_EP] = {
 		.variant = IMX8MP_EP,
+		.flags = IMX6_PCIE_FLAG_HAS_PHY,
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 		.clk_names = {IMX6_CLKS_COMMON, "pcie_aux"},
-- 
2.34.1