dts: bcm2712: put usb under /axi not /soc

On 2712, the DWC USB controller is no longer attached to the Videocore
30-bit bus with its associated aliases, and can see the bottom 4GB of
RAM directly.

Ideally it should make use of IOMMU6 but for now software bounce buffers
get it working.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm2712.dtsi b/arch/arm/boot/dts/broadcom/bcm2712.dtsi
index 328f45f..9a5581a 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2712.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2712.dtsi
@@ -133,19 +133,6 @@
                        status = "disabled";
                };
 
-               usb: usb@7c480000 {
-                       compatible = "brcm,bcm2835-usb";
-                       reg = <0x7c480000 0x10000>;
-                       interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       clocks = <&clk_usb>;
-                       clock-names = "otg";
-                       phys = <&usbphy>;
-                       phy-names = "usb2-phy";
-                       status = "disabled";
-               };
-
                mop: mop@7c500000 {
                        compatible = "brcm,bcm2712-mop";
                        reg = <0x7c500000 0x20>;
@@ -1145,6 +1132,19 @@
                        reg = <0x10 0x00400018  0x0 0x18>;
                };
 
+               usb: usb@480000 {
+                       compatible = "brcm,bcm2835-usb";
+                       reg = <0x10 0x00480000 0x0 0x10000>;
+                       interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       clocks = <&clk_usb>;
+                       clock-names = "otg";
+                       phys = <&usbphy>;
+                       phy-names = "usb2-phy";
+                       status = "disabled";
+               };
+
                rpivid: codec@800000 {
                        compatible = "raspberrypi,rpivid-vid-decoder";
                        reg = <0x10 0x00800000  0x0 0x10000>, /* HEVC */