Skip to contentSkip to conversation

ARM: dts: Aspeed: Rainier: Rename 2U and add 4U

PATCH In review Eddie James 2 participants 2 messages Sep 18, 2020 – Sep 21, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: Aspeed: Rainier: Rename 2U and add 4U

Split the devicetree into 2U and 4U. Rainier 2U has only two PSUs, so remove the extras. Also change the fan details for the 4U, which has different fans.

---
 arch/arm/boot/dts/Makefile                    |    3 +-
 .../arm/boot/dts/aspeed-bmc-ibm-rainier2u.dts | 1237 +++++++++++++++++
 ...inier.dts => aspeed-bmc-ibm-rainier4u.dts} |   10 +-
 3 files changed, 1244 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier2u.dts
 rename arch/arm/boot/dts/{aspeed-bmc-ibm-rainier.dts => aspeed-bmc-ibm-rainier4u.dts} (99%)
arch/arm/boot/dts/Makefile +2 -1
index 56fd8c8a2ba9..8a8e23d34224 100644
@@ -1358,7 +1358,8 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
 	aspeed-bmc-facebook-wedge100.dtb \
 	aspeed-bmc-facebook-yamp.dtb \
 	aspeed-bmc-facebook-yosemitev2.dtb \
-	aspeed-bmc-ibm-rainier.dtb \
+	aspeed-bmc-ibm-rainier2u.dtb \
+	aspeed-bmc-ibm-rainier4u.dtb \
 	aspeed-bmc-intel-s2600wf.dtb \
 	aspeed-bmc-inspur-fp5280g2.dtb \
 	aspeed-bmc-lenovo-hr630.dtb \
arch/arm/boot/dts/aspeed-bmc-ibm-rainier2u.dts new file +1237 -0

1,237 lines not on this page · raw message

arch/arm/boot/dts/aspeed-bmc-ibm-rainier4u.dts renamed from arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +5 -5
similarity index 99%
rename from arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
rename to arch/arm/boot/dts/aspeed-bmc-ibm-rainier4u.dts
index e6f422edf454..50c0dcbdea62 100644
@@ -8,7 +8,7 @@
 #include <dt-bindings/leds/leds-pca955x.h>
 
 / {
-	model = "Rainier";
+	model = "Rainier 4U";
 	compatible = "ibm,rainier-bmc", "aspeed,ast2600";
 
 	aliases {
@@ -778,25 +778,25 @@ max31785@52 {
 		fan@0 {
 			compatible = "pmbus-fan";
 			reg = <0>;
-			tach-pulses = <2>;
+			tach-pulses = <4>;
 		};
 
 		fan@1 {
 			compatible = "pmbus-fan";
 			reg = <1>;
-			tach-pulses = <2>;
+			tach-pulses = <4>;
 		};
 
 		fan@2 {
 			compatible = "pmbus-fan";
 			reg = <2>;
-			tach-pulses = <2>;
+			tach-pulses = <4>;
 		};
 
 		fan@3 {
 			compatible = "pmbus-fan";
 			reg = <3>;
-			tach-pulses = <2>;
+			tach-pulses = <4>;
 		};
 	};
 
Signature · 1 line
2.26.2
maintainer
#1 lore raw

Hi Eddie,

Quoted 6 lines · Eddie James

Split the devicetree into 2U and 4U. Rainier 2U has only two PSUs, so remove the extras. Also change the fan details for the 4U, which has different fans.

Can we consolidate the 4u/2u models by having a common set of nodes, and overriding the unique ones similar to how we maintained the witherspoon128 device tree?

Cheers,

Joel