diff mbox series

usb: dwc3: imx8mp: detect dwc3 child nodes with name "usb*"

Message ID 20210430091512.1026996-1-hs@denx.de (mailing list archive)
State New, archived
Headers show
Series usb: dwc3: imx8mp: detect dwc3 child nodes with name "usb*" | expand

Commit Message

Heiko Schocher April 30, 2021, 9:15 a.m. UTC
commit:
d1689cd3c0f4: ("arm64: dts: imx8mp: Use the correct name for child node "snps, dwc3")

renamed "dwc3@3*" nodes in imx8mp.dtsi to "usb@3*"

glue layer dwc3-imx8mp.c searches for "dwc3" and so drop failure
on boot:
imx8mp-dwc3 32f10100.usb: failed to find dwc3 core child
imx8mp-dwc3: probe of 32f10100.usb failed with error 1
imx8mp-dwc3 32f10108.usb: failed to find dwc3 core child
imx8mp-dwc3: probe of 32f10108.usb failed with error 1

now. Fix this (and allow old style too)

Tested on "PHYTEC phyBOARD-Pollux i.MX8MP" board.

fixes: d1689cd3c0f4: ("arm64: dts: imx8mp: Use the correct name for child node "snps, dwc3")
Signed-off-by: Heiko Schocher <hs@denx.de>
---

 drivers/usb/dwc3/dwc3-imx8mp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Felipe Balbi April 30, 2021, 10:03 a.m. UTC | #1
Heiko Schocher <hs@denx.de> writes:

> commit:
> d1689cd3c0f4: ("arm64: dts: imx8mp: Use the correct name for child node "snps, dwc3")
>
> renamed "dwc3@3*" nodes in imx8mp.dtsi to "usb@3*"
>
> glue layer dwc3-imx8mp.c searches for "dwc3" and so drop failure
> on boot:
> imx8mp-dwc3 32f10100.usb: failed to find dwc3 core child
> imx8mp-dwc3: probe of 32f10100.usb failed with error 1
> imx8mp-dwc3 32f10108.usb: failed to find dwc3 core child
> imx8mp-dwc3: probe of 32f10108.usb failed with error 1
>
> now. Fix this (and allow old style too)
>
> Tested on "PHYTEC phyBOARD-Pollux i.MX8MP" board.
>
> fixes: d1689cd3c0f4: ("arm64: dts: imx8mp: Use the correct name for child node "snps, dwc3")
> Signed-off-by: Heiko Schocher <hs@denx.de>

already sent, see https://lore.kernel.org/r/1619765836-20387-1-git-send-email-jun.li@nxp.com
Heiko Schocher April 30, 2021, 10:15 a.m. UTC | #2
Hi Felipe,

On 30.04.21 12:03, Felipe Balbi wrote:
> Heiko Schocher <hs@denx.de> writes:
> 
>> commit:
>> d1689cd3c0f4: ("arm64: dts: imx8mp: Use the correct name for child node "snps, dwc3")
>>
>> renamed "dwc3@3*" nodes in imx8mp.dtsi to "usb@3*"
>>
>> glue layer dwc3-imx8mp.c searches for "dwc3" and so drop failure
>> on boot:
>> imx8mp-dwc3 32f10100.usb: failed to find dwc3 core child
>> imx8mp-dwc3: probe of 32f10100.usb failed with error 1
>> imx8mp-dwc3 32f10108.usb: failed to find dwc3 core child
>> imx8mp-dwc3: probe of 32f10108.usb failed with error 1
>>
>> now. Fix this (and allow old style too)
>>
>> Tested on "PHYTEC phyBOARD-Pollux i.MX8MP" board.
>>
>> fixes: d1689cd3c0f4: ("arm64: dts: imx8mp: Use the correct name for child node "snps, dwc3")
>> Signed-off-by: Heiko Schocher <hs@denx.de>
> 
> already sent, see https://lore.kernel.org/r/1619765836-20387-1-git-send-email-jun.li@nxp.com

Ah, great. Missed this patch, thanks!

So, please forget this patch.

bye,
Heiko
diff mbox series

Patch

diff --git a/drivers/usb/dwc3/dwc3-imx8mp.c b/drivers/usb/dwc3/dwc3-imx8mp.c
index b13cfab89d532..eb85ddc50f7c7 100644
--- a/drivers/usb/dwc3/dwc3-imx8mp.c
+++ b/drivers/usb/dwc3/dwc3-imx8mp.c
@@ -165,7 +165,8 @@  static int dwc3_imx8mp_probe(struct platform_device *pdev)
 	if (err < 0)
 		goto disable_rpm;
 
-	dwc3_np = of_get_child_by_name(node, "dwc3");
+	dwc3_np = of_get_child_by_name(node, "usb") ? :
+		  of_get_child_by_name(node, "dwc3");
 	if (!dwc3_np) {
 		dev_err(dev, "failed to find dwc3 core child\n");
 		goto disable_rpm;