ARM: dts: bcm: fix msi-controller name and unit address

The unit address for the msi controller is not valid as there is no reg
property, so remove it. Also, msi-controller is the preferred node name.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: Jon Mason <jonmason@broadcom.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Acked-by: Ray Jui <ray.jui@broadcom.com>
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 8833a4c3cd9695a7a6a14159bd0a3ad4578a8e9f..9644fddb5e3c3d6250f304dfee7c4ffa3bd90071 100644 (file)
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -205,7 +205,7 @@
                        status = "disabled";
 
                        msi-parent = <&msi0>;
-                       msi0: msi@18012000 {
+                       msi0: msi-controller {
                                compatible = "brcm,iproc-msi";
                                msi-controller;
                                interrupt-parent = <&gic>;
@@ -240,7 +240,7 @@
                        status = "disabled";
 
                        msi-parent = <&msi1>;
-                       msi1: msi@18013000 {
+                       msi1: msi-controller {
                                compatible = "brcm,iproc-msi";
                                msi-controller;
                                interrupt-parent = <&gic>;

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 513eb0ac486f6156d51b4a42f9c3503f9548d312..fe6cba994a97df53b42cb7bef77e89cf18d280c9 100644 (file)
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -480,7 +480,7 @@
                status = "disabled";
 
                msi-parent = <&msi0>;
-               msi0: msi@18012000 {
+               msi0: msi-controller {
                        compatible = "brcm,iproc-msi";
                        msi-controller;
                        interrupt-parent = <&gic>;
@@ -516,7 +516,7 @@
                status = "disabled";
 
                msi-parent = <&msi1>;
-               msi1: msi@18013000 {
+               msi1: msi-controller {
                        compatible = "brcm,iproc-msi";
                        msi-controller;
                        interrupt-parent = <&gic>;
@@ -552,7 +552,7 @@
                status = "disabled";
 
                msi-parent = <&msi2>;
-               msi2: msi@18014000 {
+               msi2: msi-controller {
                        compatible = "brcm,iproc-msi";
                        msi-controller;
                        interrupt-parent = <&gic>;