Skip to contentSkip to conversation

phy: qcom-qusb2: Re add "qcom,sdm845-qusb2-phy" compat string

PATCH RESEND In review John Stultz 2 participants 4 messages Apr 21, 2020 – Apr 24, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND v2 1/1 phy: qcom-qusb2: Re add "qcom,sdm845-qusb2-phy" compat string

This patch fixes a regression in 5.7-rc1+

In commit 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support"), the change was made to add "qcom,qusb2-v2-phy" as a generic compat string. However the change also removed the "qcom,sdm845-qusb2-phy" compat string, which is documented in the binding and already in use.

This patch re-adds the "qcom,sdm845-qusb2-phy" compat string which allows the driver to continue to work with existing dts entries such as found on the db845c.

Cc Andy Gross <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Doug Anderson <[email protected]>
Cc Manu Gautam <[email protected]>
Cc Sandeep Maheswaram <[email protected]>
Cc Matthias Kaehlcke <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Kishon Vijay Abraham I <[email protected]>
Fixes 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support")

---
v2: Add deprecation note on "qcom,sdm845-qusb2-phy" string
as suggested by Doug.

---
 drivers/phy/qualcomm/phy-qcom-qusb2.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/phy/qualcomm/phy-qcom-qusb2.c +7 -0
index 3708d43b7508..393011a05b48 100644
@@ -815,6 +815,13 @@ static const struct of_device_id qusb2_phy_of_match_table[] = {
 	}, {
 		.compatible	= "qcom,msm8998-qusb2-phy",
 		.data		= &msm8998_phy_cfg,
+	}, {
+		/*
+		 * Deprecated. Only here to support legacy device
+		 * trees that didn't include "qcom,qusb2-v2-phy"
+		 */
+		.compatible	= "qcom,sdm845-qusb2-phy",
+		.data		= &qusb2_v2_phy_cfg,
 	}, {
 		.compatible	= "qcom,qusb2-v2-phy",
 		.data		= &qusb2_v2_phy_cfg,
Signature · 1 line
2.17.1
#1 lore raw
Quoted 9 lines · John Stultz

This patch fixes a regression in 5.7-rc1+

In commit 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support"), the change was made to add "qcom,qusb2-v2-phy" as a generic compat string. However the change also removed the "qcom,sdm845-qusb2-phy" compat string, which is documented in the binding and already in use.

Quoted 3 lines

This patch re-adds the "qcom,sdm845-qusb2-phy" compat string which allows the driver to continue to work with existing dts entries such as found on the db845c.

I hate to be a bother on this, but I'd really like to see this regression resolved. This fix missed rc1 and rc2, and it would be a shame to miss rc3 too.

Do I have the right folks on the cc for this?

thanks
-john

#2 lore raw

Hi John,

Quoted 14 lines · John Stultz
Quoted 9 lines · John Stultz

This patch fixes a regression in 5.7-rc1+

In commit 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support"), the change was made to add "qcom,qusb2-v2-phy" as a generic compat string. However the change also removed the "qcom,sdm845-qusb2-phy" compat string, which is documented in the binding and already in use.

Quoted 3 lines

This patch re-adds the "qcom,sdm845-qusb2-phy" compat string which allows the driver to continue to work with existing dts entries such as found on the db845c.

Quoted 5 lines

I hate to be a bother on this, but I'd really like to see this regression resolved. This fix missed rc1 and rc2, and it would be a shame to miss rc3 too.

Do I have the right folks on the cc for this?

Yes, I'll be merging this. Sorry for the delay.

Regards
Kishon

#3 lore raw
Quoted 15 lines · Kishon Vijay Abraham I
Quoted 14 lines · John Stultz
Quoted 12 lines · John Stultz

This patch fixes a regression in 5.7-rc1+

In commit 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support"), the change was made to add "qcom,qusb2-v2-phy" as a generic compat string. However the change also removed the "qcom,sdm845-qusb2-phy" compat string, which is documented in the binding and already in use.

This patch re-adds the "qcom,sdm845-qusb2-phy" compat string which allows the driver to continue to work with existing dts entries such as found on the db845c.

Quoted 7 lines
Quoted 5 lines

I hate to be a bother on this, but I'd really like to see this regression resolved. This fix missed rc1 and rc2, and it would be a shame to miss rc3 too.

Do I have the right folks on the cc for this?

Yes, I'll be merging this. Sorry for the delay.

Thanks so much, sorry to be a nag! I was just worried it was slipping through.

thanks again!
-john