Skip to content

Commit

Permalink
ARM: dts: r8a779x: Fix PCI bus dtc warnings
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Rob Herring authored and Simon Horman committed Jun 12, 2017
1 parent ad2c055 commit f7d569c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 30 deletions.
16 changes: 6 additions & 10 deletions arch/arm/boot/dts/r8a7790.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down Expand Up @@ -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";
};
Expand Down
16 changes: 6 additions & 10 deletions arch/arm/boot/dts/r8a7791.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand All @@ -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";
};
Expand Down
16 changes: 6 additions & 10 deletions arch/arm/boot/dts/r8a7794.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand All @@ -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";
};
Expand Down

0 comments on commit f7d569c

Please sign in to comment.