Linux USB
 help / color / mirror / Atom feed
* [PATCH] phy: qcom: uniphy-pcie-28lp: Rename the PHY type enum values
@ 2026-11-22 15:28 Sasha Levin
  2026-11-22 15:30 ` sashiko-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Sasha Levin @ 2026-11-22 15:28 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Krishna Kurapati
  Cc: Vinod Koul, Neil Armstrong, Manivannan Sadhasivam, Thinh Nguyen,
	linux-arm-msm, linux-phy, linux-usb, linux-kernel

Commit b28eecc89399 ("include: linux: phy: Add phy attribute "type" and
associated helpers") makes <linux/phy/phy.h> include <dt-bindings/phy/phy.h>,
which defines PHY_TYPE_PCIE. That clashes with the driver's own enum, and the
build fails:

  include/dt-bindings/phy/phy.h:15:33: error: expected identifier before numeric constant
  drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c:127:27: error: 'PHY_TYPE_PCIE_GEN2' undeclared here (not in a function); did you mean 'PHY_TYPE_PCIE'?
  drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c:135:27: error: 'PHY_TYPE_PCIE_GEN3' undeclared here (not in a function); did you mean 'PHY_TYPE_PCIE'?

Give the enum values a QCOM_UNIPHY_ prefix.

Fixes: b28eecc89399 ("include: linux: phy: Add phy attribute "type" and associated helpers")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

Against usb-next. The driver needs ARCH_QCOM and is not in arm64
defconfig.

 drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c b/drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c
index ef8709ff0e16b..4243de46a1e07 100644
--- a/drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c
+++ b/drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c
@@ -44,9 +44,9 @@
 #define PHY_CFG_GEN3_ALIGN_HOLDOFF_TIME		0x3e8
 
 enum qcom_uniphy_pcie_type {
-	PHY_TYPE_PCIE = 1,
-	PHY_TYPE_PCIE_GEN2,
-	PHY_TYPE_PCIE_GEN3,
+	QCOM_UNIPHY_PCIE = 1,
+	QCOM_UNIPHY_PCIE_GEN2,
+	QCOM_UNIPHY_PCIE_GEN3,
 };
 
 struct qcom_uniphy_pcie_regs {
@@ -124,7 +124,7 @@ static const struct qcom_uniphy_pcie_regs ipq5332_regs[] = {
 
 static const struct qcom_uniphy_pcie_data ipq5018_data = {
 	.lane_offset	= 0x800,
-	.phy_type	= PHY_TYPE_PCIE_GEN2,
+	.phy_type	= QCOM_UNIPHY_PCIE_GEN2,
 	.init_seq	= ipq5018_regs,
 	.init_seq_num	= ARRAY_SIZE(ipq5018_regs),
 	.pipe_clk_rate	= 125 * MEGA,
@@ -132,7 +132,7 @@ static const struct qcom_uniphy_pcie_data ipq5018_data = {
 
 static const struct qcom_uniphy_pcie_data ipq5332_data = {
 	.lane_offset	= 0x800,
-	.phy_type	= PHY_TYPE_PCIE_GEN3,
+	.phy_type	= QCOM_UNIPHY_PCIE_GEN3,
 	.init_seq	= ipq5332_regs,
 	.init_seq_num	= ARRAY_SIZE(ipq5332_regs),
 	.pipe_clk_rate	= 250 * MEGA,

base-commit: 8e31dedb9ad496ea7dd7064d77d6f7d459c1c90f
-- 
2.53.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] phy: qcom: uniphy-pcie-28lp: Rename the PHY type enum values
  2026-11-22 15:28 [PATCH] phy: qcom: uniphy-pcie-28lp: Rename the PHY type enum values Sasha Levin
@ 2026-11-22 15:30 ` sashiko-bot
  0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-22 15:30 UTC (permalink / raw)
  To: Sasha Levin; +Cc: linux-usb

> Commit b28eecc89399 ("include: linux: phy: Add phy attribute "type" and
> associated helpers") makes <linux/phy/phy.h> include <dt-bindings/phy/phy.h>,
> which defines PHY_TYPE_PCIE. That clashes with the driver's own enum, and the
> build fails:
> 
>   include/dt-bindings/phy/phy.h:15:33: error: expected identifier before numeric constant
>   drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c:127:27: error: 'PHY_TYPE_PCIE_GEN2' undeclared here (not in a function); did you mean 'PHY_TYPE_PCIE'?
>   drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c:135:27: error: 'PHY_TYPE_PCIE_GEN3' undeclared here (not in a function); did you mean 'PHY_TYPE_PCIE'?
> 
> Give the enum values a QCOM_UNIPHY_ prefix.
> 
> Fixes: b28eecc89399 ("include: linux: phy: Add phy attribute "type" and associated helpers")
> Signed-off-by: Sasha Levin <sashal@kernel.org>

Sashiko has reviewed this patch and found no issues.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261122152857.1113943-1-sashal@kernel.org?part=1

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-22 15:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-22 15:28 [PATCH] phy: qcom: uniphy-pcie-28lp: Rename the PHY type enum values Sasha Levin
2026-11-22 15:30 ` sashiko-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox