Merge branch 'for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[karo-tx-linux.git] / arch / arm / boot / dts / r8a7790.dtsi

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 99269aaca6fc953eccc3218cf78487d0a9c156d3..2805a8608d4ba007693b129dddb4d5d1600fa353 100644 (file)
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -614,7 +614,7 @@
                max-frequency = <97500000>;
        };
 
-       pfc: pfc@e6060000 {
+       pfc: pin-controller@e6060000 {
                compatible = "renesas,pfc-r8a7790";
                reg = <0 0xe6060000 0 0x250>;
        };
@@ -1602,16 +1602,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";
                };
@@ -1658,16 +1656,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 = <0x20800 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 = <0x21000 0 0 0 0>;
                        phys = <&usb2 0>;
                        phy-names = "usb";
                };