diff mbox series

[v3,09/10] usb: dwc3: qcom: Detect DWC3 DT-nodes with "usb"-prefixed names

Message ID 20201205155621.3045-10-Sergey.Semin@baikalelectronics.ru
State Superseded
Headers show
Series None | expand

Commit Message

Serge Semin Dec. 5, 2020, 3:56 p.m. UTC 
In accordance with the USB HCD/DRD schema all the USB controllers are
supposed to have DT-nodes named with prefix "^usb(@.*)?".  Since the
existing DT-nodes will be renamed in a subsequent patch let's first make
sure the DWC3 Qualcomm driver supports them and second falls back to the
deprecated naming so not to fail on the legacy DTS-files passed to the
newer kernels.

Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/usb/dwc3/dwc3-qcom.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Bjorn Andersson Feb. 2, 2021, 11:02 p.m. UTC | #1 
On Sat 05 Dec 09:56 CST 2020, Serge Semin wrote:

> In accordance with the USB HCD/DRD schema all the USB controllers are

> supposed to have DT-nodes named with prefix "^usb(@.*)?".  Since the

> existing DT-nodes will be renamed in a subsequent patch let's first make

> sure the DWC3 Qualcomm driver supports them and second falls back to the

> deprecated naming so not to fail on the legacy DTS-files passed to the

> newer kernels.

> 


Felipe, will you merge this, so that I can merge the dts patch depending
on this into the Qualcomm DT tree?

Regards,
Bjorn

> Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>

> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---

>  drivers/usb/dwc3/dwc3-qcom.c | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c

> index c703d552bbcf..49ad8d507d37 100644

> --- a/drivers/usb/dwc3/dwc3-qcom.c

> +++ b/drivers/usb/dwc3/dwc3-qcom.c

> @@ -630,7 +630,8 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)

>  	struct device		*dev = &pdev->dev;

>  	int			ret;

>  

> -	dwc3_np = of_get_child_by_name(np, "dwc3");

> +	dwc3_np = of_get_child_by_name(np, "usb") ?:

> +		  of_get_child_by_name(np, "dwc3");

>  	if (!dwc3_np) {

>  		dev_err(dev, "failed to find dwc3 core child\n");

>  		return -ENODEV;

> -- 

> 2.29.2

>
Greg Kroah-Hartman Feb. 3, 2021, 9:06 a.m. UTC | #2 
On Tue, Feb 02, 2021 at 05:02:08PM -0600, Bjorn Andersson wrote:
> On Sat 05 Dec 09:56 CST 2020, Serge Semin wrote:
> 
> > In accordance with the USB HCD/DRD schema all the USB controllers are
> > supposed to have DT-nodes named with prefix "^usb(@.*)?".  Since the
> > existing DT-nodes will be renamed in a subsequent patch let's first make
> > sure the DWC3 Qualcomm driver supports them and second falls back to the
> > deprecated naming so not to fail on the legacy DTS-files passed to the
> > newer kernels.
> > 
> 
> Felipe, will you merge this, so that I can merge the dts patch depending
> on this into the Qualcomm DT tree?

Patches this old are long-gone out of our queues.  If it needs to be
applied to a linux-usb tree, please resend.

thanks,

greg k-h
Serge Semin Feb. 10, 2021, 2:56 p.m. UTC | #3 
On Wed, Feb 03, 2021 at 10:06:46AM +0100, Greg Kroah-Hartman wrote:
> On Tue, Feb 02, 2021 at 05:02:08PM -0600, Bjorn Andersson wrote:
> > On Sat 05 Dec 09:56 CST 2020, Serge Semin wrote:
> > 
> > > In accordance with the USB HCD/DRD schema all the USB controllers are
> > > supposed to have DT-nodes named with prefix "^usb(@.*)?".  Since the
> > > existing DT-nodes will be renamed in a subsequent patch let's first make
> > > sure the DWC3 Qualcomm driver supports them and second falls back to the
> > > deprecated naming so not to fail on the legacy DTS-files passed to the
> > > newer kernels.
> > > 
> > 
> > Felipe, will you merge this, so that I can merge the dts patch depending
> > on this into the Qualcomm DT tree?
> 
> Patches this old are long-gone out of our queues.  If it needs to be
> applied to a linux-usb tree, please resend.

Greg, Bjorn,
I've revised and resent the series. Please find the recently posted
patchset:
Link: https://lore.kernel.org/lkml/20210208135154.6645-1-Sergey.Semin@baikalelectronics.ru/

Alas I've forgotten to Cc the linux-usb mailing list. Should I resend
the series one more time?

-Sergey

> 
> thanks,
> 
> greg k-h
Greg Kroah-Hartman Feb. 10, 2021, 5:07 p.m. UTC | #4 
On Wed, Feb 10, 2021 at 05:56:40PM +0300, Serge Semin wrote:
> On Wed, Feb 03, 2021 at 10:06:46AM +0100, Greg Kroah-Hartman wrote:
> > On Tue, Feb 02, 2021 at 05:02:08PM -0600, Bjorn Andersson wrote:
> > > On Sat 05 Dec 09:56 CST 2020, Serge Semin wrote:
> > > 
> > > > In accordance with the USB HCD/DRD schema all the USB controllers are
> > > > supposed to have DT-nodes named with prefix "^usb(@.*)?".  Since the
> > > > existing DT-nodes will be renamed in a subsequent patch let's first make
> > > > sure the DWC3 Qualcomm driver supports them and second falls back to the
> > > > deprecated naming so not to fail on the legacy DTS-files passed to the
> > > > newer kernels.
> > > > 
> > > 
> > > Felipe, will you merge this, so that I can merge the dts patch depending
> > > on this into the Qualcomm DT tree?
> > 
> > Patches this old are long-gone out of our queues.  If it needs to be
> > applied to a linux-usb tree, please resend.
> 
> Greg, Bjorn,
> I've revised and resent the series. Please find the recently posted
> patchset:
> Link: https://lore.kernel.org/lkml/20210208135154.6645-1-Sergey.Semin@baikalelectronics.ru/
> 
> Alas I've forgotten to Cc the linux-usb mailing list. Should I resend
> the series one more time?

Please do.
Rob Herring Feb. 10, 2021, 6:16 p.m. UTC | #5 
On Sat, Dec 5, 2020 at 9:56 AM Serge Semin
<Sergey.Semin@baikalelectronics.ru> wrote:
>
> In accordance with the USB HCD/DRD schema all the USB controllers are
> supposed to have DT-nodes named with prefix "^usb(@.*)?".  Since the
> existing DT-nodes will be renamed in a subsequent patch let's first make
> sure the DWC3 Qualcomm driver supports them and second falls back to the
> deprecated naming so not to fail on the legacy DTS-files passed to the
> newer kernels.
>
> Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>  drivers/usb/dwc3/dwc3-qcom.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index c703d552bbcf..49ad8d507d37 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -630,7 +630,8 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)
>         struct device           *dev = &pdev->dev;
>         int                     ret;
>
> -       dwc3_np = of_get_child_by_name(np, "dwc3");
> +       dwc3_np = of_get_child_by_name(np, "usb") ?:
> +                 of_get_child_by_name(np, "dwc3");

Is there some reason using compatible instead wouldn't work here?

>         if (!dwc3_np) {
>                 dev_err(dev, "failed to find dwc3 core child\n");
>                 return -ENODEV;
> --
> 2.29.2
>
diff mbox series

Patch

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index c703d552bbcf..49ad8d507d37 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -630,7 +630,8 @@  static int dwc3_qcom_of_register_core(struct platform_device *pdev)
 	struct device		*dev = &pdev->dev;
 	int			ret;
 
-	dwc3_np = of_get_child_by_name(np, "dwc3");
+	dwc3_np = of_get_child_by_name(np, "usb") ?:
+		  of_get_child_by_name(np, "dwc3");
 	if (!dwc3_np) {
 		dev_err(dev, "failed to find dwc3 core child\n");
 		return -ENODEV;