[linux,dev-5.4] ARM: dts: aspeed: rainier: Add second cfam on the hub
diff mbox series

Message ID 20200109200839.11936-1-eajames@linux.ibm.com
State Needs Review / ACK
Headers show
Series
  • [linux,dev-5.4] ARM: dts: aspeed: rainier: Add second cfam on the hub
Related show

Commit Message

Eddie James Jan. 9, 2020, 8:08 p.m. UTC
The hub FSI master can access the cfams on two other processors. Reflect
this by adding a second cfam to the first hub description.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)

Comments

Andrew Geissler Jan. 10, 2020, 8:40 p.m. UTC | #1
> On Jan 9, 2020, at 2:08 PM, Eddie James <eajames@linux.ibm.com> wrote:
> 
> The hub FSI master can access the cfams on two other processors. Reflect
> this by adding a second cfam to the first hub description.
> 
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 36 ++++++++++++++++++++
> 1 file changed, 36 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> index 4d8b3cc5f291..9318778a461b 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -143,6 +143,38 @@
> 			no-scan-on-init;
> 		};
> 	};
> +
> +	cfam@2,0 {
> +		reg = <2 0>;
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		chip-id = <2>;
> +
> +		scom@1000 {
> +			compatible = "ibm,fsi2pib";
> +			reg = <0x1000 0x400>;
> +		};
> +
> +		sbefifo@2400 {
> +			compatible = "ibm,p9-sbefifo";
> +			reg = <0x2400 0x400>;
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +
> +			fsi_occ2: occ {
> +				compatible = "ibm,p9-occ";
> +			};
> +		};
> +
> +		fsi_hub2: hub@3400 {
> +			compatible = "fsi-master-hub";
> +			reg = <0x3400 0x400>;
> +			#address-cells = <2>;
> +			#size-cells = <0>;
> +
> +			no-scan-on-init;
> +		};
> +	};
> };
> 
> /* Legacy OCC numbering (to get rid of when userspace is fixed) */
> @@ -154,6 +186,10 @@
> 	reg = <2>;
> };
> 
> +&fsi_occ2 {
> +	reg = <3>;
> +};
> +
> &ibt {
> 	status = "okay";
> };
> — 
> 2.24.0
> 

Looked good in testing.

Tested-by: Andrew Geissler  <geissonator@yahoo.com>

Patch
diff mbox series

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 4d8b3cc5f291..9318778a461b 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -143,6 +143,38 @@ 
 			no-scan-on-init;
 		};
 	};
+
+	cfam@2,0 {
+		reg = <2 0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		chip-id = <2>;
+
+		scom@1000 {
+			compatible = "ibm,fsi2pib";
+			reg = <0x1000 0x400>;
+		};
+
+		sbefifo@2400 {
+			compatible = "ibm,p9-sbefifo";
+			reg = <0x2400 0x400>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			fsi_occ2: occ {
+				compatible = "ibm,p9-occ";
+			};
+		};
+
+		fsi_hub2: hub@3400 {
+			compatible = "fsi-master-hub";
+			reg = <0x3400 0x400>;
+			#address-cells = <2>;
+			#size-cells = <0>;
+
+			no-scan-on-init;
+		};
+	};
 };
 
 /* Legacy OCC numbering (to get rid of when userspace is fixed) */
@@ -154,6 +186,10 @@ 
 	reg = <2>;
 };
 
+&fsi_occ2 {
+	reg = <3>;
+};
+
 &ibt {
 	status = "okay";
 };