Revert "Partial revert of "BCM2708: Add core Device Tree support""

This reverts commit 03f0f80.

Author: popcornmix

arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi

@@ -139,6 +139,14 @@
 		#dma-cells = <1>;
 		brcm,dma-channel-mask = <0x7800>;
 	};
+
+	xhci: xhci@7e9c0000 {
+		compatible = "generic-xhci";
+		status = "disabled";
+		reg = <0x0 0x7e9c0000  0x0 0x100000>;
+		interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
+		power-domains = <&power RPI_POWER_DOMAIN_USB>;
+	};
 };
 
 &hevc_dec {

arch/arm/boot/dts/broadcom/bcm2711.dtsi

@@ -602,21 +602,6 @@
 			};
 		};
 
-		xhci: usb@7e9c0000 {
-			compatible = "brcm,bcm2711-xhci", "brcm,xhci-brcm-v2";
-			reg = <0x0 0x7e9c0000 0x100000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
-			power-domains = <&pm BCM2835_POWER_DOMAIN_USB>;
-			/* DWC2 and this IP block share the same USB PHY,
-			 * enabling both at the same time results in lockups.
-			 * So keep this node disabled and let the bootloader
-			 * decide which interface should be enabled.
-			 */
-			status = "disabled";
-		};
-
 		v3d: gpu@7ec00000 {
 			compatible = "brcm,2711-v3d";
 			reg = <0x0 0x7ec00000 0x4000>,