Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
From:   Frank Li <Frank.Li@nxp.com>
To:     frank.li@nxp.com
Cc:     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 v3 02/13] PCI: imx6: Simplify phy handling by using by using IMX6_PCIE_FLAG_HAS_PHY
Date:   Mon, 11 Dec 2023 16:58:31 -0500
Message-Id: <20231211215842.134823-3-Frank.Li@nxp.com>
In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com>
References: <20231211215842.134823-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?+2rlerO0KAcT5Jqdy/jWviW7aWX614O8YBQvHrS1GfSroVhyE0sZqVbZCQOU?=
 =?us-ascii?Q?gdUoQz9ASyEp9pf5/TfllBy8sYIkchrD9HdHJNq5dIZjrt+ZTALEOYQFFIJr?=
 =?us-ascii?Q?yZjlLMLTzqRMz4zpHNeNhraiQihjGbcA81EIBQbHKThH1MfIhZ1/SnBPdTcO?=
 =?us-ascii?Q?6XS4lyp/Jf04ubReA+dgi6GVvQK4QAFcEkJCtrv33hMAaXPQf6NgWm4io2HG?=
 =?us-ascii?Q?ngd49aEEtHgac9a3lNLaChB8Mfke4Hsaqd+zwQehsHdkpmGV7ZR4Da3TvvC1?=
 =?us-ascii?Q?OqdBEgXStfA64052eh6R5RxcC9sxWSJya9fUfuJGR+VCYvjTrOKC08gLqs8g?=
 =?us-ascii?Q?ux5uk+WnIn1Pvcx30c/zcCZzbAHQi4hC9gRc3NyXqEmhwTFVu4Nbad/I22IG?=
 =?us-ascii?Q?L3TpyOXfyYnQOpx7AoI5Vl2NWb3FECEIyYNxWXKZOCNBpmFtpn26WrkbMT2L?=
 =?us-ascii?Q?OUB/CPIGcN8jGUj8TS85cg4x0tI1pqyZ0wp1BJtPM8xvTXnx+Jj4NniFBqoC?=
 =?us-ascii?Q?OPNBDKKHEJyBdXXYzEWeaBiBDoFNiWsjcRYjxakrXP6+/b9HIXLFJrAOvfr3?=
 =?us-ascii?Q?Q6f25JWK4IkEjHW1typHGAPVbS6n0m1n6Z7jBBOaCFMQtyFaieQfVR/u30s+?=
 =?us-ascii?Q?W4GHSJuoAlGXNIcSchxajQaGMTWuYQazx7zQDIZornUxyi7pq2v+F0ptpi49?=
 =?us-ascii?Q?njgbrNVQqVLiNMFNYiwbydRNpqj+6mNi1euuM5OusrxmK4hzIpt6alA3Tu1S?=
 =?us-ascii?Q?ngSk5loyasmMM92paNjfLh7JD5JOQwCsLyqPhHxuTPHSwKUR1rRzMV02RXpY?=
 =?us-ascii?Q?c8dVaSC6RRgCRv32269Y48xdoA9OQ3j6VH4RIHc2plS1EZix7gEOejSAFqCH?=
 =?us-ascii?Q?xlOSHJSmFXwt2aTeVme6KS8ZU0BGA+BBSWoiBw2k4Nd3oN/kDLVFCqUywqaL?=
 =?us-ascii?Q?tCtxFUqo0OYDLYrjshTQ6wrm/M/WnKnnA0Z09dJptQApFEq45K6XRGmAYzmU?=
 =?us-ascii?Q?+m40xIGDNQ7NvQFFCNW09NffvaFFuj8mvyY612IdNMu2RKulmeP0T3I+YEP/?=
 =?us-ascii?Q?vDVQcZTNBw4vGSJEDGmsBIuxSutKwDacCFL6Df3xX6NCjP7ODTES9e9VH/Ci?=
 =?us-ascii?Q?g4N9lj9J1R/A2ij1TaOZRCbUy7dm2oqPyQJRTEXAuV2CQeADH/VXqtciqtv4?=
 =?us-ascii?Q?a9gGF0vNOwp12fuJ9mNVg1roH5zSWOdUnllbsxi5INUKgxyVsH/UPwUWE6BR?=
 =?us-ascii?Q?BDq0Ue7RWhV2FL0z0wCHUYpL6NakUtDobP1JdQMjcoUdw2Zbw2WlNPOoBxFv?=
 =?us-ascii?Q?uKZCvIGic2ayuFA0v2suqyj3fSqpFm7YkHXPNqH0JsnATZA3QHwDFvI/COzj?=
 =?us-ascii?Q?rtCS+OFc2veosagEn4vL37wbRTcb/WW942zrpJoAb+wAmKI0y6y6F64GI/PJ?=
 =?us-ascii?Q?aFHMD1wb3/QvpM6YZ1fui4Olim4P7w2+qU75WsU3EW/KYsz0ZqOr9wxS1+0P?=
 =?us-ascii?Q?KdhJSZbjgWYLgYroWNPQumVALzoW/8nBFplfJh0U7Vyjqmxpw6eDvjJ8IcH2?=
 =?us-ascii?Q?PWs+XFlX8cEDxBim3L8zUy+5ve0cZ2esQT23Gns7?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c68c9b6a-2b42-4cc9-eecd-08dbfa947310
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:30.0707
 (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: KHrMfRaACH7HqS3Zss6U9ehGPbFI1OzhWbuFExHmekz/Epv9AJxzAgu2XzMEbthSycb4sUMO+1XTv4dbUN9T1Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569
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 fry.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 (fry.vger.email [0.0.0.0]); Mon, 11 Dec 2023 13:59:59 -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>
---

Notes:
    Change from v1 to v3:
    - none

 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 8a9b527934f80..bcf52aa86462e 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