diff mbox

[10/15] ARM: dts: bcm: fix msi-controller name and unit address

Message ID 20170322020313.24338-10-robh@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Rob Herring (Arm) March 22, 2017, 2:03 a.m. UTC
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
---
Sub-arch maintainers, please apply to your trees unless arm-soc wants 
to take the whole lot.

 arch/arm/boot/dts/bcm-cygnus.dtsi | 4 ++--
 arch/arm/boot/dts/bcm-nsp.dtsi    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Ray Jui March 22, 2017, 6:07 a.m. UTC | #1
Hi Rob,


On 3/21/2017 7:03 PM, Rob Herring wrote:
> 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
> ---
> Sub-arch maintainers, please apply to your trees unless arm-soc wants
> to take the whole lot.
>
>   arch/arm/boot/dts/bcm-cygnus.dtsi | 4 ++--
>   arch/arm/boot/dts/bcm-nsp.dtsi    | 6 +++---
>   2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
> index 8833a4c3cd96..9644fddb5e3c 100644
> --- 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 832795b0fd0f..42c017df490f 100644
> --- a/arch/arm/boot/dts/bcm-nsp.dtsi
> +++ b/arch/arm/boot/dts/bcm-nsp.dtsi
> @@ -450,7 +450,7 @@
>   		status = "disabled";
>   
>   		msi-parent = <&msi0>;
> -		msi0: msi@18012000 {
> +		msi0: msi-controller {
>   			compatible = "brcm,iproc-msi";
>   			msi-controller;
>   			interrupt-parent = <&gic>;
> @@ -486,7 +486,7 @@
>   		status = "disabled";
>   
>   		msi-parent = <&msi1>;
> -		msi1: msi@18013000 {
> +		msi1: msi-controller {
>   			compatible = "brcm,iproc-msi";
>   			msi-controller;
>   			interrupt-parent = <&gic>;
> @@ -522,7 +522,7 @@
>   		status = "disabled";
>   
>   		msi-parent = <&msi2>;
> -		msi2: msi@18014000 {
> +		msi2: msi-controller {
>   			compatible = "brcm,iproc-msi";
>   			msi-controller;
>   			interrupt-parent = <&gic>;
Looks good and thanks!

Acked-by: Ray Jui <ray.jui@broadcom.com>
Florian Fainelli March 22, 2017, 5:16 p.m. UTC | #2
On 03/21/2017 07:03 PM, Rob Herring wrote:
> 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
> ---
> Sub-arch maintainers, please apply to your trees unless arm-soc wants 
> to take the whole lot.

Applied, thanks Rob.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index 8833a4c3cd96..9644fddb5e3c 100644
--- 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 832795b0fd0f..42c017df490f 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -450,7 +450,7 @@ 
 		status = "disabled";
 
 		msi-parent = <&msi0>;
-		msi0: msi@18012000 {
+		msi0: msi-controller {
 			compatible = "brcm,iproc-msi";
 			msi-controller;
 			interrupt-parent = <&gic>;
@@ -486,7 +486,7 @@ 
 		status = "disabled";
 
 		msi-parent = <&msi1>;
-		msi1: msi@18013000 {
+		msi1: msi-controller {
 			compatible = "brcm,iproc-msi";
 			msi-controller;
 			interrupt-parent = <&gic>;
@@ -522,7 +522,7 @@ 
 		status = "disabled";
 
 		msi-parent = <&msi2>;
-		msi2: msi@18014000 {
+		msi2: msi-controller {
 			compatible = "brcm,iproc-msi";
 			msi-controller;
 			interrupt-parent = <&gic>;