4.19-stable review patch. If anyone has any objections, please let me know.
------------------
From: Serge Semin Sergey.Semin@baikalelectronics.ru
[ Upstream commit 74abbfe99f43eb7466d26d9e48fbeb46b8f3d804 ]
In accordance with the Generic EHCI/OHCI 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 "generic-ehci" and "generic-ohci"-compatible nodes are correctly named.
Signed-off-by: Serge Semin Sergey.Semin@baikalelectronics.ru Acked-by: Florian Fainelli f.fainelli@gmail.com Acked-by: Krzysztof Kozlowski krzk@kernel.org Signed-off-by: Florian Fainelli f.fainelli@gmail.com Stable-dep-of: 05d2c3d552b8 ("ARM: dts: BCM53573: Drop nonexistent #usb-cells") Signed-off-by: Sasha Levin sashal@kernel.org --- arch/arm/boot/dts/bcm5301x.dtsi | 4 ++-- arch/arm/boot/dts/bcm53573.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index a6406a347690e..c331217ce21b3 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -260,7 +260,7 @@ usb2: usb2@21000 {
interrupt-parent = <&gic>;
- ehci: ehci@21000 { + ehci: usb@21000 { #usb-cells = <0>;
compatible = "generic-ehci"; @@ -282,7 +282,7 @@ ehci_port2: port@2 { }; };
- ohci: ohci@22000 { + ohci: usb@22000 { #usb-cells = <0>;
compatible = "generic-ohci"; diff --git a/arch/arm/boot/dts/bcm53573.dtsi b/arch/arm/boot/dts/bcm53573.dtsi index 453a2a37dabd3..d38f103db8a64 100644 --- a/arch/arm/boot/dts/bcm53573.dtsi +++ b/arch/arm/boot/dts/bcm53573.dtsi @@ -135,7 +135,7 @@ usb2: usb2@4000 { #address-cells = <1>; #size-cells = <1>;
- ehci: ehci@4000 { + ehci: usb@4000 { compatible = "generic-ehci"; reg = <0x4000 0x1000>; interrupt-parent = <&gic>; @@ -155,7 +155,7 @@ ehci_port2: port@2 { }; };
- ohci: ohci@d000 { + ohci: usb@d000 { #usb-cells = <0>;
compatible = "generic-ohci";