ARM: dts: r8a779x: Fix PCI bus dtc warnings

The bogus 'device_type = "pci"' confuses dtc, causing lots of totally
unrelated warnings.  After fixing that, real warnings like

    arch/arm/boot/dts/r8a7790-lager.dtb: Warning (pci_device_reg): Node /pci@ee090000/usb@0,1 PCI unit address format error, expected "1,0"

are left.  Correct the unit-addresses and reg properties of the subnodes
to fix these.

Signed-off-by: Rob Herring <robh@kernel.org>
[geert: Improve description]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 416956a42c93452e1f7718855ef57a3bd764fed6..2805a8608d4ba007693b129dddb4d5d1600fa353 100644 (file)
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -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";
                };

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index b730c889a40454771dcd1b54e21e2832c4fbde3f..bd93f699ad84098762e99082cfa027dfa4abc088 100644 (file)
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1613,16 +1613,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";
                };
@@ -1648,16 +1646,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";
                };

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";
                };