[PATCH 19/20] arch: dts: Fix xHCI DT nodes name

Serge Semin Sergey.Semin at baikalelectronics.ru
Wed Oct 14 21:14:01 AEDT 2020


In accordance with the Generic xHCI 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(@.*)?" .
Let's fix the DTS files, which have the xHCI-nodes defined with
incompatible names.

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

---

Please, test the patch out to make sure it doesn't brake the dependent DTS
files. I did only a manual grepping of the possible nodes dependencies.
---
 arch/arm/boot/dts/bcm5301x.dtsi               | 2 +-
 arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index bf5656d79a55..cf89a44673c5 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -314,7 +314,7 @@ usb3: usb3 at 23000 {
 
 			interrupt-parent = <&gic>;
 
-			xhci: xhci at 23000 {
+			xhci: usb at 23000 {
 				#usb-cells = <0>;
 
 				compatible = "generic-xhci";
diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
index 9dcf16beabf5..1e37ae181acf 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
@@ -275,7 +275,7 @@ CP11X_LABEL(thermal): thermal-sensor at 70 {
 			};
 		};
 
-		CP11X_LABEL(usb3_0): usb3 at 500000 {
+		CP11X_LABEL(usb3_0): usb at 500000 {
 			compatible = "marvell,armada-8k-xhci",
 			"generic-xhci";
 			reg = <0x500000 0x4000>;
@@ -287,7 +287,7 @@ CP11X_LABEL(usb3_0): usb3 at 500000 {
 			status = "disabled";
 		};
 
-		CP11X_LABEL(usb3_1): usb3 at 510000 {
+		CP11X_LABEL(usb3_1): usb at 510000 {
 			compatible = "marvell,armada-8k-xhci",
 			"generic-xhci";
 			reg = <0x510000 0x4000>;
-- 
2.27.0



More information about the Linuxppc-dev mailing list