mbox series

[v2,00/18] dt-bindings: usb: Harmonize xHCI/EHCI/OHCI/DWC3 nodes name

Message ID 20201111091552.15593-1-Sergey.Semin@baikalelectronics.ru
Headers show
Series dt-bindings: usb: Harmonize xHCI/EHCI/OHCI/DWC3 nodes name | expand

Message

Serge Semin Nov. 11, 2020, 9:15 a.m. UTC
As the subject states this series is an attempt to harmonize the xHCI,
EHCI, OHCI and DWC USB3 DT nodes with the DT schema introduced in the
framework of the patchset [1].

Firstly as Krzysztof suggested we've deprecated a support of DWC USB3
controllers with "synopsys,"-vendor prefix compatible string in favor of
the ones with valid "snps,"-prefix. It's done in all the DTS files,
which have been unfortunate to define such nodes.

Secondly we suggest to fix the snps,quirk-frame-length-adjustment property
declaration in the Amlogic meson-g12-common.dtsi DTS file, since it has
been erroneously declared as boolean while having uint32 type. Neil said
it was ok to init that property with 0x20 value.

Thirdly the main part of the patchset concern fixing the xHCI, EHCI/OHCI
and DWC USB3 DT nodes name as in accordance with their DT schema the
corresponding node name is suppose to comply with the Generic USB HCD DT
schema, which requires the USB nodes to have the name acceptable by the
regexp: "^usb(@.*)?". Such requirement had been applicable even before we
introduced the new DT schema in [1], but as we can see it hasn't been
strictly implemented for a lot the DTS files. Since DT schema is now
available the automated DTS validation shall make sure that the rule isn't
violated.

Note most of these patches have been a part of the last three patches of
[1]. But since there is no way to have them merged in in a combined
manner, I had to move them to the dedicated series and split them up so to
be accepted by the corresponding subsystem maintainers one-by-one.

[1] Link: https://lore.kernel.org/linux-usb/20201014101402.18271-1-Sergey.Semin@baikalelectronics.ru/
Changelog v1:
- As Krzysztof suggested I've created a script which checked whether the
  node names had been also updated in all the depended dts files. As a
  result I found two more files which should have been also modified:
  arch/arc/boot/dts/{axc003.dtsi,axc003_idu.dtsi}
- Correct the USB DWC3 nodes name found in
  arch/arm64/boot/dts/apm/{apm-storm.dtsi,apm-shadowcat.dtsi} too.

Changelog v2:
- Drop the patch:
  [PATCH 01/29] usb: dwc3: Discard synopsys,dwc3 compatibility string
  and get back the one which marks the "synopsys,dwc3" compatible string
  as deprecated into the DT schema related series.
- Drop the patches:
  [PATCH 03/29] arm: dts: am437x: Correct DWC USB3 compatible string
  [PATCH 04/29] arm: dts: exynos: Correct DWC USB3 compatible string
  [PATCH 07/29] arm: dts: bcm53x: Harmonize EHCI/OHCI DT nodes name
  [PATCH 08/29] arm: dts: stm32: Harmonize EHCI/OHCI DT nodes name
  [PATCH 16/29] arm: dts: bcm5301x: Harmonize xHCI DT nodes name
  [PATCH 19/29] arm: dts: exynos: Harmonize DWC USB3 DT nodes name
  [PATCH 21/29] arm: dts: ls1021a: Harmonize DWC USB3 DT nodes name
  [PATCH 22/29] arm: dts: omap5: Harmonize DWC USB3 DT nodes name
  [PATCH 24/29] arm64: dts: allwinner: h6: Harmonize DWC USB3 DT nodes name
  [PATCH 26/29] arm64: dts: exynos: Harmonize DWC USB3 DT nodes name
  [PATCH 27/29] arm64: dts: layerscape: Harmonize DWC USB3 DT nodes name
  since they have been applied to the corresponding maintainers repos.
- Fix drivers/usb/dwc3/dwc3-qcom.c to be looking for the "usb@"-prefixed
  sub-node and falling back to the "dwc3@"-prefixed one on failure.

Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Rafal Milecki <zajec5@gmail.com>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Khuong Dinh <khuong@os.amperecomputing.com>
Cc: Andy Gross <agross@kernel.org>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Amelie Delaunay <amelie.delaunay@st.com>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@bootlin.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Li Yang <leoyang.li@nxp.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Jun Li <lijun.kernel@gmail.com>
Cc: linux-snps-arc@lists.infradead.org
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-msm@vger.kernel.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org

Serge Semin (18):
  arm: dts: keystone: Correct DWC USB3 compatible string
  arm64: dts: amlogic: meson-g12: Set FL-adj property value
  arc: dts: Harmonize EHCI/OHCI DT nodes name
  arm: dts: hisi-x5hd2: Harmonize EHCI/OHCI DT nodes name
  arm: dts: lpc18xx: Harmonize EHCI/OHCI DT nodes name
  arm64: dts: hisi: Harmonize EHCI/OHCI DT nodes name
  mips: dts: jz47x: Harmonize EHCI/OHCI DT nodes name
  mips: dts: sead3: Harmonize EHCI/OHCI DT nodes name
  mips: dts: ralink: mt7628a: Harmonize EHCI/OHCI DT nodes name
  powerpc: dts: akebono: Harmonize EHCI/OHCI DT nodes name
  arm64: dts: marvell: cp11x: Harmonize xHCI DT nodes name
  arm: dts: marvell: armada-375: Harmonize DWC USB3 DT nodes name
  arm: dts: keystone: Harmonize DWC USB3 DT nodes name
  arm: dts: stih407-family: Harmonize DWC USB3 DT nodes name
  arm64: dts: apm: Harmonize DWC USB3 DT nodes name
  arm64: dts: hi3660: Harmonize DWC USB3 DT nodes name
  usb: dwc3: qcom: Detect DWC3 DT-nodes with "usb"-prefixed names
  arm64: dts: qcom: Harmonize DWC USB3 DT nodes name

 arch/arc/boot/dts/axc003.dtsi                     | 4 ++--
 arch/arc/boot/dts/axc003_idu.dtsi                 | 4 ++--
 arch/arc/boot/dts/axs10x_mb.dtsi                  | 4 ++--
 arch/arc/boot/dts/hsdk.dts                        | 4 ++--
 arch/arc/boot/dts/vdk_axs10x_mb.dtsi              | 2 +-
 arch/arm/boot/dts/armada-375.dtsi                 | 2 +-
 arch/arm/boot/dts/hisi-x5hd2.dtsi                 | 4 ++--
 arch/arm/boot/dts/keystone-k2e.dtsi               | 6 +++---
 arch/arm/boot/dts/keystone.dtsi                   | 4 ++--
 arch/arm/boot/dts/lpc18xx.dtsi                    | 4 ++--
 arch/arm/boot/dts/stih407-family.dtsi             | 2 +-
 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi        | 4 ++--
 arch/arm64/boot/dts/apm/apm-storm.dtsi            | 6 +++---
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi         | 2 +-
 arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi    | 4 ++--
 arch/arm64/boot/dts/hisilicon/hip06.dtsi          | 4 ++--
 arch/arm64/boot/dts/hisilicon/hip07.dtsi          | 4 ++--
 arch/arm64/boot/dts/marvell/armada-cp11x.dtsi     | 4 ++--
 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi      | 4 ++--
 arch/arm64/boot/dts/qcom/ipq8074.dtsi             | 4 ++--
 arch/arm64/boot/dts/qcom/msm8996.dtsi             | 4 ++--
 arch/arm64/boot/dts/qcom/msm8998.dtsi             | 2 +-
 arch/arm64/boot/dts/qcom/qcs404-evb.dtsi          | 2 +-
 arch/arm64/boot/dts/qcom/qcs404.dtsi              | 4 ++--
 arch/arm64/boot/dts/qcom/sc7180.dtsi              | 2 +-
 arch/arm64/boot/dts/qcom/sdm845.dtsi              | 4 ++--
 arch/arm64/boot/dts/qcom/sm8150.dtsi              | 2 +-
 arch/mips/boot/dts/ingenic/jz4740.dtsi            | 2 +-
 arch/mips/boot/dts/ingenic/jz4770.dtsi            | 2 +-
 arch/mips/boot/dts/mti/sead3.dts                  | 2 +-
 arch/mips/boot/dts/ralink/mt7628a.dtsi            | 2 +-
 arch/powerpc/boot/dts/akebono.dts                 | 6 +++---
 drivers/usb/dwc3/dwc3-qcom.c                      | 3 ++-
 34 files changed, 58 insertions(+), 57 deletions(-)

Comments

Bjorn Andersson Nov. 11, 2020, 4:08 p.m. UTC | #1
On Wed 11 Nov 03:15 CST 2020, Serge Semin wrote:

> In accordance with the DWC USB3 bindings the corresponding node

> name is suppose to comply with the Generic USB HCD DT schema, which

> requires the USB nodes to have the name acceptable by the regexp:

> "^usb(@.*)?" . Make sure the "snps,dwc3"-compatible nodes are correctly

> named.

> 

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

> Acked-by: Krzysztof Kozlowski <krzk@kernel.org>


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


Given the risk of merge conflicts with this patch I would prefer to take
it through the qcom dts tree. Please let me know when patch 17 has been
merged (or if you prefer that I take it through the same path).

Regards,
Bjorn

> ---

>  arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 4 ++--

>  arch/arm64/boot/dts/qcom/ipq8074.dtsi        | 4 ++--

>  arch/arm64/boot/dts/qcom/msm8996.dtsi        | 4 ++--

>  arch/arm64/boot/dts/qcom/msm8998.dtsi        | 2 +-

>  arch/arm64/boot/dts/qcom/qcs404-evb.dtsi     | 2 +-

>  arch/arm64/boot/dts/qcom/qcs404.dtsi         | 4 ++--

>  arch/arm64/boot/dts/qcom/sc7180.dtsi         | 2 +-

>  arch/arm64/boot/dts/qcom/sdm845.dtsi         | 4 ++--

>  arch/arm64/boot/dts/qcom/sm8150.dtsi         | 2 +-

>  9 files changed, 14 insertions(+), 14 deletions(-)

> 

> diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

> index defcbd15edf9..34e97da98270 100644

> --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

> +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

> @@ -1064,7 +1064,7 @@ &usb2 {

>  	status = "okay";

>  	extcon = <&usb2_id>;

>  

> -	dwc3@7600000 {

> +	usb@7600000 {

>  		extcon = <&usb2_id>;

>  		dr_mode = "otg";

>  		maximum-speed = "high-speed";

> @@ -1075,7 +1075,7 @@ &usb3 {

>  	status = "okay";

>  	extcon = <&usb3_id>;

>  

> -	dwc3@6a00000 {

> +	usb@6a00000 {

>  		extcon = <&usb3_id>;

>  		dr_mode = "otg";

>  	};

> diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi

> index 96a5ec89b5f0..1129062a4ca1 100644

> --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi

> +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi

> @@ -427,7 +427,7 @@ usb_0: usb@8af8800 {

>  			resets = <&gcc GCC_USB0_BCR>;

>  			status = "disabled";

>  

> -			dwc_0: dwc3@8a00000 {

> +			dwc_0: usb@8a00000 {

>  				compatible = "snps,dwc3";

>  				reg = <0x8a00000 0xcd00>;

>  				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;

> @@ -468,7 +468,7 @@ usb_1: usb@8cf8800 {

>  			resets = <&gcc GCC_USB1_BCR>;

>  			status = "disabled";

>  

> -			dwc_1: dwc3@8c00000 {

> +			dwc_1: usb@8c00000 {

>  				compatible = "snps,dwc3";

>  				reg = <0x8c00000 0xcd00>;

>  				interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;

> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi

> index 9951286db775..66b6d2f0a093 100644

> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi

> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi

> @@ -1767,7 +1767,7 @@ usb3: usb@6af8800 {

>  			power-domains = <&gcc USB30_GDSC>;

>  			status = "disabled";

>  

> -			dwc3@6a00000 {

> +			usb@6a00000 {

>  				compatible = "snps,dwc3";

>  				reg = <0x06a00000 0xcc00>;

>  				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;

> @@ -1978,7 +1978,7 @@ usb2: usb@76f8800 {

>  			power-domains = <&gcc USB30_GDSC>;

>  			status = "disabled";

>  

> -			dwc3@7600000 {

> +			usb@7600000 {

>  				compatible = "snps,dwc3";

>  				reg = <0x07600000 0xcc00>;

>  				interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;

> diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi

> index c45870600909..7cc7897e7b83 100644

> --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi

> +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi

> @@ -1678,7 +1678,7 @@ usb3: usb@a8f8800 {

>  

>  			resets = <&gcc GCC_USB_30_BCR>;

>  

> -			usb3_dwc3: dwc3@a800000 {

> +			usb3_dwc3: usb@a800000 {

>  				compatible = "snps,dwc3";

>  				reg = <0x0a800000 0xcd00>;

>  				interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;

> diff --git a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

> index 6422cf9d5855..88d7b7a53743 100644

> --- a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

> +++ b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

> @@ -337,7 +337,7 @@ &usb2_phy_sec {

>  &usb3 {

>  	status = "okay";

>  

> -	dwc3@7580000 {

> +	usb@7580000 {

>  		dr_mode = "host";

>  	};

>  };

> diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi

> index b654b802e95c..f6ef17553064 100644

> --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi

> +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi

> @@ -544,7 +544,7 @@ usb3: usb@7678800 {

>  			assigned-clock-rates = <19200000>, <200000000>;

>  			status = "disabled";

>  

> -			dwc3@7580000 {

> +			usb@7580000 {

>  				compatible = "snps,dwc3";

>  				reg = <0x07580000 0xcd00>;

>  				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

> @@ -573,7 +573,7 @@ usb2: usb@79b8800 {

>  			assigned-clock-rates = <19200000>, <133333333>;

>  			status = "disabled";

>  

> -			dwc3@78c0000 {

> +			usb@78c0000 {

>  				compatible = "snps,dwc3";

>  				reg = <0x078c0000 0xcc00>;

>  				interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi

> index d46b3833e52f..bbc9a2b5c570 100644

> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi

> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi

> @@ -2673,7 +2673,7 @@ usb_1: usb@a6f8800 {

>  					<&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3>;

>  			interconnect-names = "usb-ddr", "apps-usb";

>  

> -			usb_1_dwc3: dwc3@a600000 {

> +			usb_1_dwc3: usb@a600000 {

>  				compatible = "snps,dwc3";

>  				reg = <0 0x0a600000 0 0xe000>;

>  				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi

> index 2884577dcb77..ca20e4e91f61 100644

> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi

> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi

> @@ -3573,7 +3573,7 @@ usb_1: usb@a6f8800 {

>  					<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_0>;

>  			interconnect-names = "usb-ddr", "apps-usb";

>  

> -			usb_1_dwc3: dwc3@a600000 {

> +			usb_1_dwc3: usb@a600000 {

>  				compatible = "snps,dwc3";

>  				reg = <0 0x0a600000 0 0xcd00>;

>  				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

> @@ -3621,7 +3621,7 @@ usb_2: usb@a8f8800 {

>  					<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_1>;

>  			interconnect-names = "usb-ddr", "apps-usb";

>  

> -			usb_2_dwc3: dwc3@a800000 {

> +			usb_2_dwc3: usb@a800000 {

>  				compatible = "snps,dwc3";

>  				reg = <0 0x0a800000 0 0xcd00>;

>  				interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

> diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi

> index b86a7ead3006..167d14dda974 100644

> --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi

> +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi

> @@ -846,7 +846,7 @@ usb_1: usb@a6f8800 {

>  

>  			resets = <&gcc GCC_USB30_PRIM_BCR>;

>  

> -			usb_1_dwc3: dwc3@a600000 {

> +			usb_1_dwc3: usb@a600000 {

>  				compatible = "snps,dwc3";

>  				reg = <0 0x0a600000 0 0xcd00>;

>  				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

> -- 

> 2.28.0

>
Serge Semin Nov. 12, 2020, 6:43 p.m. UTC | #2
Hello Bjorn

On Wed, Nov 11, 2020 at 10:08:44AM -0600, Bjorn Andersson wrote:
> On Wed 11 Nov 03:15 CST 2020, Serge Semin wrote:

> 

> > In accordance with the DWC USB3 bindings the corresponding node

> > name is suppose to comply with the Generic USB HCD DT schema, which

> > requires the USB nodes to have the name acceptable by the regexp:

> > "^usb(@.*)?" . Make sure the "snps,dwc3"-compatible nodes are correctly

> > named.

> > 

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

> > Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

> 

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

> 


> Given the risk of merge conflicts with this patch I would prefer to take

> it through the qcom dts tree. Please let me know when patch 17 has been

> merged (or if you prefer that I take it through the same path).


I don't really know through what path the patch was supposed to find
its way into the kernel. Since I haven't got a public repo then for me a
preferred solution would be to merge this patch and the other by means
of the qcom tree.

Thanks
-Sergey

> 

> Regards,

> Bjorn

> 

> > ---

> >  arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 4 ++--

> >  arch/arm64/boot/dts/qcom/ipq8074.dtsi        | 4 ++--

> >  arch/arm64/boot/dts/qcom/msm8996.dtsi        | 4 ++--

> >  arch/arm64/boot/dts/qcom/msm8998.dtsi        | 2 +-

> >  arch/arm64/boot/dts/qcom/qcs404-evb.dtsi     | 2 +-

> >  arch/arm64/boot/dts/qcom/qcs404.dtsi         | 4 ++--

> >  arch/arm64/boot/dts/qcom/sc7180.dtsi         | 2 +-

> >  arch/arm64/boot/dts/qcom/sdm845.dtsi         | 4 ++--

> >  arch/arm64/boot/dts/qcom/sm8150.dtsi         | 2 +-

> >  9 files changed, 14 insertions(+), 14 deletions(-)

> > 

> > diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

> > index defcbd15edf9..34e97da98270 100644

> > --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

> > @@ -1064,7 +1064,7 @@ &usb2 {

> >  	status = "okay";

> >  	extcon = <&usb2_id>;

> >  

> > -	dwc3@7600000 {

> > +	usb@7600000 {

> >  		extcon = <&usb2_id>;

> >  		dr_mode = "otg";

> >  		maximum-speed = "high-speed";

> > @@ -1075,7 +1075,7 @@ &usb3 {

> >  	status = "okay";

> >  	extcon = <&usb3_id>;

> >  

> > -	dwc3@6a00000 {

> > +	usb@6a00000 {

> >  		extcon = <&usb3_id>;

> >  		dr_mode = "otg";

> >  	};

> > diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi

> > index 96a5ec89b5f0..1129062a4ca1 100644

> > --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi

> > @@ -427,7 +427,7 @@ usb_0: usb@8af8800 {

> >  			resets = <&gcc GCC_USB0_BCR>;

> >  			status = "disabled";

> >  

> > -			dwc_0: dwc3@8a00000 {

> > +			dwc_0: usb@8a00000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0x8a00000 0xcd00>;

> >  				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;

> > @@ -468,7 +468,7 @@ usb_1: usb@8cf8800 {

> >  			resets = <&gcc GCC_USB1_BCR>;

> >  			status = "disabled";

> >  

> > -			dwc_1: dwc3@8c00000 {

> > +			dwc_1: usb@8c00000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0x8c00000 0xcd00>;

> >  				interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;

> > diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi

> > index 9951286db775..66b6d2f0a093 100644

> > --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi

> > @@ -1767,7 +1767,7 @@ usb3: usb@6af8800 {

> >  			power-domains = <&gcc USB30_GDSC>;

> >  			status = "disabled";

> >  

> > -			dwc3@6a00000 {

> > +			usb@6a00000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0x06a00000 0xcc00>;

> >  				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;

> > @@ -1978,7 +1978,7 @@ usb2: usb@76f8800 {

> >  			power-domains = <&gcc USB30_GDSC>;

> >  			status = "disabled";

> >  

> > -			dwc3@7600000 {

> > +			usb@7600000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0x07600000 0xcc00>;

> >  				interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;

> > diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi

> > index c45870600909..7cc7897e7b83 100644

> > --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi

> > @@ -1678,7 +1678,7 @@ usb3: usb@a8f8800 {

> >  

> >  			resets = <&gcc GCC_USB_30_BCR>;

> >  

> > -			usb3_dwc3: dwc3@a800000 {

> > +			usb3_dwc3: usb@a800000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0x0a800000 0xcd00>;

> >  				interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;

> > diff --git a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

> > index 6422cf9d5855..88d7b7a53743 100644

> > --- a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

> > @@ -337,7 +337,7 @@ &usb2_phy_sec {

> >  &usb3 {

> >  	status = "okay";

> >  

> > -	dwc3@7580000 {

> > +	usb@7580000 {

> >  		dr_mode = "host";

> >  	};

> >  };

> > diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi

> > index b654b802e95c..f6ef17553064 100644

> > --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi

> > @@ -544,7 +544,7 @@ usb3: usb@7678800 {

> >  			assigned-clock-rates = <19200000>, <200000000>;

> >  			status = "disabled";

> >  

> > -			dwc3@7580000 {

> > +			usb@7580000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0x07580000 0xcd00>;

> >  				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

> > @@ -573,7 +573,7 @@ usb2: usb@79b8800 {

> >  			assigned-clock-rates = <19200000>, <133333333>;

> >  			status = "disabled";

> >  

> > -			dwc3@78c0000 {

> > +			usb@78c0000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0x078c0000 0xcc00>;

> >  				interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

> > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi

> > index d46b3833e52f..bbc9a2b5c570 100644

> > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi

> > @@ -2673,7 +2673,7 @@ usb_1: usb@a6f8800 {

> >  					<&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3>;

> >  			interconnect-names = "usb-ddr", "apps-usb";

> >  

> > -			usb_1_dwc3: dwc3@a600000 {

> > +			usb_1_dwc3: usb@a600000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0 0x0a600000 0 0xe000>;

> >  				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

> > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi

> > index 2884577dcb77..ca20e4e91f61 100644

> > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi

> > @@ -3573,7 +3573,7 @@ usb_1: usb@a6f8800 {

> >  					<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_0>;

> >  			interconnect-names = "usb-ddr", "apps-usb";

> >  

> > -			usb_1_dwc3: dwc3@a600000 {

> > +			usb_1_dwc3: usb@a600000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0 0x0a600000 0 0xcd00>;

> >  				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

> > @@ -3621,7 +3621,7 @@ usb_2: usb@a8f8800 {

> >  					<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_1>;

> >  			interconnect-names = "usb-ddr", "apps-usb";

> >  

> > -			usb_2_dwc3: dwc3@a800000 {

> > +			usb_2_dwc3: usb@a800000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0 0x0a800000 0 0xcd00>;

> >  				interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

> > diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi

> > index b86a7ead3006..167d14dda974 100644

> > --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi

> > +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi

> > @@ -846,7 +846,7 @@ usb_1: usb@a6f8800 {

> >  

> >  			resets = <&gcc GCC_USB30_PRIM_BCR>;

> >  

> > -			usb_1_dwc3: dwc3@a600000 {

> > +			usb_1_dwc3: usb@a600000 {

> >  				compatible = "snps,dwc3";

> >  				reg = <0 0x0a600000 0 0xcd00>;

> >  				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

> > -- 

> > 2.28.0

> >