Skip to contentSkip to conversation

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

PATCH RESEND Superseded John Stultz 3 participants 4 messages Apr 14, 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
Reviewed-by Stephen Boyd Reviewed-by on v2 1/1
#1 lore raw

Hi,

Quoted 13 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 16 lines
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")

Re-adding reviews from:
https://lore.kernel.org/r/158631458374.216820.17829557619378130779@swboyd.mtv.corp.google.com
https://lore.kernel.org/r/CAD=FV=Wh9_4a-cDGPdpMrXUi_HmJvS-a2Ubeyo5WG3sgwVWKKQ@mail.gmail.com

...as of an hour ago Bjorn also picked up:

https://lore.kernel.org/r/[email protected]

...and it's now in the Qualcomm for-next and ci-next. It's still a bit of a pain that -rc1 will have the regression since many other maintainers will base their next branches on that, but not much to be done about it now.

-Doug

#2 lore raw
Quoted 31 lines · Doug Anderson
Quoted 13 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 16 lines
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")
Quoted 6 lines

Re-adding reviews from:
https://lore.kernel.org/r/158631458374.216820.17829557619378130779@swboyd.mtv.corp.google.com
https://lore.kernel.org/r/CAD=FV=Wh9_4a-cDGPdpMrXUi_HmJvS-a2Ubeyo5WG3sgwVWKKQ@mail.gmail.com

Ah! Sorry, I thought I had added those to my git commit, but apparently I didn't!

Many thanks!
-john

#3 lore raw
In reply to Doug Anderson
Quoted 40 lines · Doug Anderson

Hi,

Quoted 13 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 16 lines
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")

Re-adding reviews from:
https://lore.kernel.org/r/158631458374.216820.17829557619378130779@swboyd.mtv.corp.google.com
https://lore.kernel.org/r/CAD=FV=Wh9_4a-cDGPdpMrXUi_HmJvS-a2Ubeyo5WG3sgwVWKKQ@mail.gmail.com

Quoted 9 lines

...as of an hour ago Bjorn also picked up:

https://lore.kernel.org/r/[email protected]

...and it's now in the Qualcomm for-next and ci-next. It's still a bit of a pain that -rc1 will have the regression since many other maintainers will base their next branches on that, but not much to be done about it now.

The regression is in the driver, so we want this patch landed in v5.7. The dts change is heading for 5.8.

Regards,
Bjorn