Merge tag 'for-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / r8a7794.dtsi

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index a19b884fb25897fc8731feda6ed7e2d909c91403..7d9a81d970d87c6b0ebae4df4bd460305fb0cfa5 100644 (file)
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -820,16 +820,14 @@
                                 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
                                 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
 
-               usb@0,1 {
+               usb@1,0 {
                        reg = <0x800 0 0 0 0>;
-                       device_type = "pci";
                        phys = <&usb0 0>;
                        phy-names = "usb";
                };
 
-               usb@0,2 {
+               usb@2,0 {
                        reg = <0x1000 0 0 0 0>;
-                       device_type = "pci";
                        phys = <&usb0 0>;
                        phy-names = "usb";
                };
@@ -855,16 +853,14 @@
                                 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
                                 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
 
-               usb@0,1 {
-                       reg = <0x800 0 0 0 0>;
-                       device_type = "pci";
+               usb@1,0 {
+                       reg = <0x10800 0 0 0 0>;
                        phys = <&usb2 0>;
                        phy-names = "usb";
                };
 
-               usb@0,2 {
-                       reg = <0x1000 0 0 0 0>;
-                       device_type = "pci";
+               usb@2,0 {
+                       reg = <0x11000 0 0 0 0>;
                        phys = <&usb2 0>;
                        phy-names = "usb";
                };