ARM: dts: Cygnus: Fixed iProc PCIe controller properties

Rename the msi controller unit name to 'msi' to avoid collisions with
the 'msi-controller' boolean property. We also need to re-arrange the
'ranges' property to show the two cells as being separate instead of
combined since the DT checker is not able to differentiate otherwise.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index 8ecb7861ce106f0d9f156ee318a830f4f6ea57fc..e73a19409d711750f79b3c48ba55cfde9532b3ed 100644 (file)
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -274,8 +274,8 @@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
-                       ranges = <0x81000000 0 0          0x28000000 0 0x00010000
-                                 0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
+                       ranges = <0x81000000 0 0          0x28000000 0 0x00010000>,
+                                <0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
 
                        phys = <&pcie0_phy>;
                        phy-names = "pcie-phy";
@@ -283,7 +283,7 @@
                        status = "disabled";
 
                        msi-parent = <&msi0>;
-                       msi0: msi-controller {
+                       msi0: msi {
                                compatible = "brcm,iproc-msi";
                                msi-controller;
                                interrupt-parent = <&gic>;
@@ -309,8 +309,8 @@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
-                       ranges = <0x81000000 0 0          0x48000000 0 0x00010000
-                                 0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
+                       ranges = <0x81000000 0 0          0x48000000 0 0x00010000>,
+                                <0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
 
                        phys = <&pcie1_phy>;
                        phy-names = "pcie-phy";
@@ -318,7 +318,7 @@
                        status = "disabled";
 
                        msi-parent = <&msi1>;
-                       msi1: msi-controller {
+                       msi1: msi {
                                compatible = "brcm,iproc-msi";
                                msi-controller;
                                interrupt-parent = <&gic>;