[RESEND,v2] phy: qcom-qusb2: Re add "qcom,sdm845-qusb2-phy" compat string

Commit Message

John Stultz April 14, 2020, 6:57 p.m. UTC

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 <[e-mail]>
Cc: Bjorn Andersson <[e-mail]>
Cc: Rob Herring <[e-mail]>
Cc: Mark Rutland <[e-mail]>
Cc: Doug Anderson <[e-mail]>
Cc: Manu Gautam <[e-mail]>
Cc: Sandeep Maheswaram <[e-mail]>
Cc: Matthias Kaehlcke <[e-mail]>
Cc: Stephen Boyd <[e-mail]>
Cc: Kishon Vijay Abraham I <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Reviewed-by: Bjorn Andersson <[e-mail]>
Fixes: 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support")
Reported-by: YongQin Liu <[e-mail]>
Signed-off-by: John Stultz <[e-mail]>
---
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(+)

Comments

Doug Anderson April 14, 2020, 7:06 p.m. UTC | #1

Hi,

On Tue, Apr 14, 2020 at 11:57 AM John Stultz <[e-mail]> wrote:
>
> 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 <[e-mail]>
> Cc: Bjorn Andersson <[e-mail]>
> Cc: Rob Herring <[e-mail]>
> Cc: Mark Rutland <[e-mail]>
> Cc: Doug Anderson <[e-mail]>
> Cc: Manu Gautam <[e-mail]>
> Cc: Sandeep Maheswaram <[e-mail]>
> Cc: Matthias Kaehlcke <[e-mail]>
> Cc: Stephen Boyd <[e-mail]>
> Cc: Kishon Vijay Abraham I <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Reviewed-by: Bjorn Andersson <[e-mail]>
> Fixes: 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support")
> Reported-by: YongQin Liu <[e-mail]>
> Signed-off-by: John Stultz <[e-mail]>

Re-adding reviews from:
https://lore.kernel.org/r/[e-mail]
https://lore.kernel.org/r/CAD=FV=[e-mail]

Reviewed-by: Stephen Boyd <[e-mail]>
Reviewed-by: Douglas Anderson <[e-mail]>

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

https://lore.kernel.org/r/[e-mail]

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

John Stultz April 14, 2020, 7:28 p.m. UTC | #2

On Tue, Apr 14, 2020 at 12:14 PM Doug Anderson <[e-mail]> wrote:
> On Tue, Apr 14, 2020 at 11:57 AM John Stultz <[e-mail]> wrote:
> >
> > 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 <[e-mail]>
> > Cc: Bjorn Andersson <[e-mail]>
> > Cc: Rob Herring <[e-mail]>
> > Cc: Mark Rutland <[e-mail]>
> > Cc: Doug Anderson <[e-mail]>
> > Cc: Manu Gautam <[e-mail]>
> > Cc: Sandeep Maheswaram <[e-mail]>
> > Cc: Matthias Kaehlcke <[e-mail]>
> > Cc: Stephen Boyd <[e-mail]>
> > Cc: Kishon Vijay Abraham I <[e-mail]>
> > Cc: [e-mail]
> > Cc: [e-mail]
> > Reviewed-by: Bjorn Andersson <[e-mail]>
> > Fixes: 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support")
> > Reported-by: YongQin Liu <[e-mail]>
> > Signed-off-by: John Stultz <[e-mail]>
>
> Re-adding reviews from:
> https://lore.kernel.org/r/[e-mail]
> https://lore.kernel.org/r/CAD=FV=[e-mail]
>
> Reviewed-by: Stephen Boyd <[e-mail]>
> Reviewed-by: Douglas Anderson <[e-mail]>

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

Many thanks!
-john

Bjorn Andersson April 14, 2020, 11:52 p.m. UTC | #3

On Tue 14 Apr 12:06 PDT 2020, Doug Anderson wrote:

> Hi,
> 
> On Tue, Apr 14, 2020 at 11:57 AM John Stultz <[e-mail]> wrote:
> >
> > 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 <[e-mail]>
> > Cc: Bjorn Andersson <[e-mail]>
> > Cc: Rob Herring <[e-mail]>
> > Cc: Mark Rutland <[e-mail]>
> > Cc: Doug Anderson <[e-mail]>
> > Cc: Manu Gautam <[e-mail]>
> > Cc: Sandeep Maheswaram <[e-mail]>
> > Cc: Matthias Kaehlcke <[e-mail]>
> > Cc: Stephen Boyd <[e-mail]>
> > Cc: Kishon Vijay Abraham I <[e-mail]>
> > Cc: [e-mail]
> > Cc: [e-mail]
> > Reviewed-by: Bjorn Andersson <[e-mail]>
> > Fixes: 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support")
> > Reported-by: YongQin Liu <[e-mail]>
> > Signed-off-by: John Stultz <[e-mail]>
> 
> Re-adding reviews from:
> https://lore.kernel.org/r/[e-mail]
> https://lore.kernel.org/r/CAD=FV=[e-mail]
> 
> Reviewed-by: Stephen Boyd <[e-mail]>
> Reviewed-by: Douglas Anderson <[e-mail]>
> 
> ...as of an hour ago Bjorn also picked up:
> 
> https://lore.kernel.org/r/[e-mail]
> 
> ...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

Patch

diff --git a/drivers/phy/qualcomm/phy-qcom-qusb2.c b/drivers/phy/qualcomm/phy-qcom-qusb2.c
index 3708d43b7508..393011a05b48 100644
--- a/drivers/phy/qualcomm/phy-qcom-qusb2.c
+++ b/drivers/phy/qualcomm/phy-qcom-qusb2.c
@@ -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,