Skip to contentSkip to conversation

ARM: dts: Aspeed: Rainier: Add 4U device-tree

PATCH In review Eddie James 3 participants 6 messages Oct 28, 2020 – Nov 2, 2020

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

PATCH v3 1/1 ARM: dts: Aspeed: Rainier: Add 4U device-tree

Add a device-tree for the Rainier 4U system. Change the model name on the existing Rainier device-tree to 2U, and remove the two extra power supplies that are only present on the 4U system. Also add labels to the fan nodes for use in the 4U device-tree.

---
Changes since v2:
- Just reference individual fan nodes rather than the whole fan controller

Changes since v1:
- Don't rename the 2U dts
- Include the 2U dts from the 4U and make the necessary Changes

 arch/arm/boot/dts/Makefile                    |  1 +
 .../boot/dts/aspeed-bmc-ibm-rainier-4u.dts    | 37 +++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts  | 20 +++-------
 3 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
arch/arm/boot/dts/Makefile +1 -0
index 7e4d3600e16d..9a2ab5e6e924 100644
@@ -1360,6 +1360,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
 	aspeed-bmc-facebook-yamp.dtb \
 	aspeed-bmc-facebook-yosemitev2.dtb \
 	aspeed-bmc-ibm-rainier.dtb \
+	aspeed-bmc-ibm-rainier-4u.dtb \
 	aspeed-bmc-intel-s2600wf.dtb \
 	aspeed-bmc-inspur-fp5280g2.dtb \
 	aspeed-bmc-lenovo-hr630.dtb \
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +37 -0
new file mode 100644
index 000000000000..9c35ac1d19a6
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u.dts"
+
+/ {
+	model = "Rainier 4U";
+};
+
+&i2c3 {
+	power-supply@6a {
+		compatible = "ibm,cffps";
+		reg = <0x6a>;
+	};
+
+	power-supply@6b {
+		compatible = "ibm,cffps";
+		reg = <0x6b>;
+	};
+};
+
+&fan0 {
+	tach-pulses = <4>;
+};
+
+&fan1 {
+	tach-pulses = <4>;
+};
+
+&fan2 {
+	tach-pulses = <4>;
+};
+
+&fan3 {
+	tach-pulses = <4>;
+};
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +5 -15
index 183e1a4dcc65..676ae5602fb9 100644
@@ -8,7 +8,7 @@
 #include <dt-bindings/leds/leds-pca955x.h>
 
 / {
-	model = "Rainier";
+	model = "Rainier 2U";
 	compatible = "ibm,rainier-bmc", "aspeed,ast2600";
 
 	aliases {
@@ -646,16 +646,6 @@ power-supply@69 {
 		compatible = "ibm,cffps";
 		reg = <0x69>;
 	};
-
-	power-supply@6a {
-		compatible = "ibm,cffps";
-		reg = <0x6a>;
-	};
-
-	power-supply@6b {
-		compatible = "ibm,cffps";
-		reg = <0x6b>;
-	};
 };
 
 &i2c4 {
@@ -775,25 +765,25 @@ max31785@52 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		fan@0 {
+		fan0: fan@0 {
 			compatible = "pmbus-fan";
 			reg = <0>;
 			tach-pulses = <2>;
 		};
 
-		fan@1 {
+		fan1: fan@1 {
 			compatible = "pmbus-fan";
 			reg = <1>;
 			tach-pulses = <2>;
 		};
 
-		fan@2 {
+		fan2: fan@2 {
 			compatible = "pmbus-fan";
 			reg = <2>;
 			tach-pulses = <2>;
 		};
 
-		fan@3 {
+		fan3: fan@3 {
 			compatible = "pmbus-fan";
 			reg = <3>;
 			tach-pulses = <2>;
Signature · 1 line
2.26.2
Reviewed-by on v3 1/1
#1 lore raw
Quoted 66 lines · Eddie James

Add a device-tree for the Rainier 4U system. Change the model name on the existing Rainier device-tree to 2U, and remove the two extra power supplies that are only present on the 4U system. Also add labels to the fan nodes for use in the 4U device-tree.

---
Changes since v2:
- Just reference individual fan nodes rather than the whole fan controller

Changes since v1:
- Don't rename the 2U dts
- Include the 2U dts from the 4U and make the necessary Changes

 arch/arm/boot/dts/Makefile                    |  1 +
 .../boot/dts/aspeed-bmc-ibm-rainier-4u.dts    | 37 +++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts  | 20 +++-------
 3 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
arch/arm/boot/dts/Makefile +1 -0
index 7e4d3600e16d..9a2ab5e6e924 100644
@@ -1360,6 +1360,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
 	aspeed-bmc-facebook-yamp.dtb \
 	aspeed-bmc-facebook-yosemitev2.dtb \
 	aspeed-bmc-ibm-rainier.dtb \
+	aspeed-bmc-ibm-rainier-4u.dtb \
 	aspeed-bmc-intel-s2600wf.dtb \
 	aspeed-bmc-inspur-fp5280g2.dtb \
 	aspeed-bmc-lenovo-hr630.dtb \
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +26 -0
new file mode 100644
index 000000000000..9c35ac1d19a6
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u.dts"
+
+/ {
+	model = "Rainier 4U";
+};
+
+&i2c3 {
+	power-supply@6a {
+		compatible = "ibm,cffps";
+		reg = <0x6a>;
+	};
+
+	power-supply@6b {
+		compatible = "ibm,cffps";
+		reg = <0x6b>;
+	};
+};
+
+&fan0 {
+	tach-pulses = <4>;
+};
+

arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 36

Quoted 10 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +10 -0
+&fan1 {
+	tach-pulses = <4>;
+};
+
+&fan2 {
+	tach-pulses = <4>;
+};
+
+&fan3 {
+	tach-pulses = <4>;

I'm still digging for info on the tac-pulses, but we can fix them later if necessary.

Looks okay otherwise:

maintainer
#2 lore raw
In reply to Eddie James

Hi Eddie,

Quoted 40 lines · Eddie James

Add a device-tree for the Rainier 4U system. Change the model name on the existing Rainier device-tree to 2U, and remove the two extra power supplies that are only present on the 4U system. Also add labels to the fan nodes for use in the 4U device-tree.

---
Changes since v2:
- Just reference individual fan nodes rather than the whole fan controller

Changes since v1:
- Don't rename the 2U dts
- Include the 2U dts from the 4U and make the necessary Changes

 arch/arm/boot/dts/Makefile                    |  1 +
 .../boot/dts/aspeed-bmc-ibm-rainier-4u.dts    | 37 +++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts  | 20 +++-------
 3 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
arch/arm/boot/dts/Makefile +1 -0
index 7e4d3600e16d..9a2ab5e6e924 100644
@@ -1360,6 +1360,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-bmc-facebook-yamp.dtb \
        aspeed-bmc-facebook-yosemitev2.dtb \
        aspeed-bmc-ibm-rainier.dtb \
+       aspeed-bmc-ibm-rainier-4u.dtb \
        aspeed-bmc-intel-s2600wf.dtb \
        aspeed-bmc-inspur-fp5280g2.dtb \
        aspeed-bmc-lenovo-hr630.dtb \
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +0 -0
new file mode 100644
index 000000000000..9c35ac1d19a6

arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 5

Quoted 5 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +5 -0
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u.dts"

Did you test this patch?

Quoted 95 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +32 -0
+
+/ {
+       model = "Rainier 4U";
+};
+
+&i2c3 {
+       power-supply@6a {
+               compatible = "ibm,cffps";
+               reg = <0x6a>;
+       };
+
+       power-supply@6b {
+               compatible = "ibm,cffps";
+               reg = <0x6b>;
+       };
+};
+
+&fan0 {
+       tach-pulses = <4>;
+};
+
+&fan1 {
+       tach-pulses = <4>;
+};
+
+&fan2 {
+       tach-pulses = <4>;
+};
+
+&fan3 {
+       tach-pulses = <4>;
+};
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +5 -16
index 183e1a4dcc65..676ae5602fb9 100644
@@ -8,7 +8,7 @@
 #include <dt-bindings/leds/leds-pca955x.h>
 
 / {
-       model = "Rainier";
+       model = "Rainier 2U";
        compatible = "ibm,rainier-bmc", "aspeed,ast2600";
 
        aliases {
@@ -646,16 +646,6 @@ power-supply@69 {
                compatible = "ibm,cffps";
                reg = <0x69>;
        };
-
-       power-supply@6a {
-               compatible = "ibm,cffps";
-               reg = <0x6a>;
-       };
-
-       power-supply@6b {
-               compatible = "ibm,cffps";
-               reg = <0x6b>;
-       };
 };
 
 &i2c4 {
@@ -775,25 +765,25 @@ max31785@52 {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               fan@0 {
+               fan0: fan@0 {
                        compatible = "pmbus-fan";
                        reg = <0>;
                        tach-pulses = <2>;
                };
 
-               fan@1 {
+               fan1: fan@1 {
                        compatible = "pmbus-fan";
                        reg = <1>;
                        tach-pulses = <2>;
                };
 
-               fan@2 {
+               fan2: fan@2 {
                        compatible = "pmbus-fan";
                        reg = <2>;
                        tach-pulses = <2>;
                };
 
-               fan@3 {
+               fan3: fan@3 {
                        compatible = "pmbus-fan";
                        reg = <3>;
                        tach-pulses = <2>;
--

2.26.2

#3 lore raw
Quoted 40 lines · Joel Stanley

Hi Eddie,

Quoted 37 lines · Eddie James

Add a device-tree for the Rainier 4U system. Change the model name on the existing Rainier device-tree to 2U, and remove the two extra power supplies that are only present on the 4U system. Also add labels to the fan nodes for use in the 4U device-tree.

---
Changes since v2:
- Just reference individual fan nodes rather than the whole fan controller

Changes since v1:
- Don't rename the 2U dts
- Include the 2U dts from the 4U and make the necessary Changes

  arch/arm/boot/dts/Makefile                    |  1 +
  .../boot/dts/aspeed-bmc-ibm-rainier-4u.dts    | 37 +++++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts  | 20 +++-------
  3 files changed, 43 insertions(+), 15 deletions(-)

create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts

arch/arm/boot/dts/Makefile +1 -0
index 7e4d3600e16d..9a2ab5e6e924 100644
@@ -1360,6 +1360,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
         aspeed-bmc-facebook-yamp.dtb \
         aspeed-bmc-facebook-yosemitev2.dtb \
         aspeed-bmc-ibm-rainier.dtb \
+       aspeed-bmc-ibm-rainier-4u.dtb \
         aspeed-bmc-intel-s2600wf.dtb \
         aspeed-bmc-inspur-fp5280g2.dtb \
         aspeed-bmc-lenovo-hr630.dtb \
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +0 -1
new file mode 100644
index 000000000000..9c35ac1d19a6
--- /dev/null
Quoted 8 lines

arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 5

Quoted 7 lines

+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts

arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +5 -0
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u.dts"

Did you test this patch?

Yes, Rainier hardware BMC booted to Ready state. I suspect it wouldn't power on properly due to bad fan configuration though, so I didn't try that. DTS looked good under /sys/firmware though.

Thanks,

Eddie

Quoted 96 lines
Quoted 96 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +32 -0
+
+/ {
+       model = "Rainier 4U";
+};
+
+&i2c3 {
+       power-supply@6a {
+               compatible = "ibm,cffps";
+               reg = <0x6a>;
+       };
+
+       power-supply@6b {
+               compatible = "ibm,cffps";
+               reg = <0x6b>;
+       };
+};
+
+&fan0 {
+       tach-pulses = <4>;
+};
+
+&fan1 {
+       tach-pulses = <4>;
+};
+
+&fan2 {
+       tach-pulses = <4>;
+};
+
+&fan3 {
+       tach-pulses = <4>;
+};
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +5 -16
index 183e1a4dcc65..676ae5602fb9 100644
@@ -8,7 +8,7 @@
  #include <dt-bindings/leds/leds-pca955x.h>
 
  / {
-       model = "Rainier";
+       model = "Rainier 2U";
         compatible = "ibm,rainier-bmc", "aspeed,ast2600";
 
         aliases {
@@ -646,16 +646,6 @@ power-supply@69 {
                 compatible = "ibm,cffps";
                 reg = <0x69>;
         };
-
-       power-supply@6a {
-               compatible = "ibm,cffps";
-               reg = <0x6a>;
-       };
-
-       power-supply@6b {
-               compatible = "ibm,cffps";
-               reg = <0x6b>;
-       };
  };
 
  &i2c4 {
@@ -775,25 +765,25 @@ max31785@52 {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-               fan@0 {
+               fan0: fan@0 {
                         compatible = "pmbus-fan";
                         reg = <0>;
                         tach-pulses = <2>;
                 };
 
-               fan@1 {
+               fan1: fan@1 {
                         compatible = "pmbus-fan";
                         reg = <1>;
                         tach-pulses = <2>;
                 };
 
-               fan@2 {
+               fan2: fan@2 {
                         compatible = "pmbus-fan";
                         reg = <2>;
                         tach-pulses = <2>;
                 };
 
-               fan@3 {
+               fan3: fan@3 {
                         compatible = "pmbus-fan";
                         reg = <3>;
                         tach-pulses = <2>;
--

2.26.2

maintainer
#4 lore raw
Quoted 53 lines · Eddie James
Quoted 40 lines · Joel Stanley

Hi Eddie,

Quoted 37 lines · Eddie James

Add a device-tree for the Rainier 4U system. Change the model name on the existing Rainier device-tree to 2U, and remove the two extra power supplies that are only present on the 4U system. Also add labels to the fan nodes for use in the 4U device-tree.

---
Changes since v2:
- Just reference individual fan nodes rather than the whole fan controller

Changes since v1:
- Don't rename the 2U dts
- Include the 2U dts from the 4U and make the necessary Changes

  arch/arm/boot/dts/Makefile                    |  1 +
  .../boot/dts/aspeed-bmc-ibm-rainier-4u.dts    | 37 +++++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts  | 20 +++-------
  3 files changed, 43 insertions(+), 15 deletions(-)

create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts

arch/arm/boot/dts/Makefile +1 -0
index 7e4d3600e16d..9a2ab5e6e924 100644
@@ -1360,6 +1360,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
         aspeed-bmc-facebook-yamp.dtb \
         aspeed-bmc-facebook-yosemitev2.dtb \
         aspeed-bmc-ibm-rainier.dtb \
+       aspeed-bmc-ibm-rainier-4u.dtb \
         aspeed-bmc-intel-s2600wf.dtb \
         aspeed-bmc-inspur-fp5280g2.dtb \
         aspeed-bmc-lenovo-hr630.dtb \
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +0 -1
new file mode 100644
index 000000000000..9c35ac1d19a6
--- /dev/null
Quoted 8 lines

arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 5

Quoted 7 lines

+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts

arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +5 -0
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u.dts"

Did you test this patch?

Quoted 3 lines

Yes, Rainier hardware BMC booted to Ready state. I suspect it wouldn't power on properly due to bad fan configuration though, so I didn't try that. DTS looked good under /sys/firmware though.

Are you sure? The version of the patch you posted here doesn't compile.

Quoted 103 lines

Thanks,

Eddie

Quoted 96 lines
Quoted 96 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +32 -0
+
+/ {
+       model = "Rainier 4U";
+};
+
+&i2c3 {
+       power-supply@6a {
+               compatible = "ibm,cffps";
+               reg = <0x6a>;
+       };
+
+       power-supply@6b {
+               compatible = "ibm,cffps";
+               reg = <0x6b>;
+       };
+};
+
+&fan0 {
+       tach-pulses = <4>;
+};
+
+&fan1 {
+       tach-pulses = <4>;
+};
+
+&fan2 {
+       tach-pulses = <4>;
+};
+
+&fan3 {
+       tach-pulses = <4>;
+};
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +5 -16
index 183e1a4dcc65..676ae5602fb9 100644
@@ -8,7 +8,7 @@
  #include <dt-bindings/leds/leds-pca955x.h>
 
  / {
-       model = "Rainier";
+       model = "Rainier 2U";
         compatible = "ibm,rainier-bmc", "aspeed,ast2600";
 
         aliases {
@@ -646,16 +646,6 @@ power-supply@69 {
                 compatible = "ibm,cffps";
                 reg = <0x69>;
         };
-
-       power-supply@6a {
-               compatible = "ibm,cffps";
-               reg = <0x6a>;
-       };
-
-       power-supply@6b {
-               compatible = "ibm,cffps";
-               reg = <0x6b>;
-       };
  };
 
  &i2c4 {
@@ -775,25 +765,25 @@ max31785@52 {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-               fan@0 {
+               fan0: fan@0 {
                         compatible = "pmbus-fan";
                         reg = <0>;
                         tach-pulses = <2>;
                 };
 
-               fan@1 {
+               fan1: fan@1 {
                         compatible = "pmbus-fan";
                         reg = <1>;
                         tach-pulses = <2>;
                 };
 
-               fan@2 {
+               fan2: fan@2 {
                         compatible = "pmbus-fan";
                         reg = <2>;
                         tach-pulses = <2>;
                 };
 
-               fan@3 {
+               fan3: fan@3 {
                         compatible = "pmbus-fan";
                         reg = <3>;
                         tach-pulses = <2>;
--

2.26.2

#5 lore raw
Quoted 53 lines · Joel Stanley
Quoted 52 lines · Eddie James
Quoted 49 lines · Joel Stanley

Hi Eddie,

Quoted 40 lines · Eddie James

Add a device-tree for the Rainier 4U system. Change the model name on the existing Rainier device-tree to 2U, and remove the two extra power supplies that are only present on the 4U system. Also add labels to the fan nodes for use in the 4U device-tree.

---
Changes since v2:
- Just reference individual fan nodes rather than the whole fan controller

Changes since v1:
- Don't rename the 2U dts
- Include the 2U dts from the 4U and make the necessary Changes

   arch/arm/boot/dts/Makefile                    |  1 +
   .../boot/dts/aspeed-bmc-ibm-rainier-4u.dts    | 37 +++++++++++++++++++
   arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts  | 20 +++-------
   3 files changed, 43 insertions(+), 15 deletions(-)

create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts

arch/arm/boot/dts/Makefile +1 -0
index 7e4d3600e16d..9a2ab5e6e924 100644
@@ -1360,6 +1360,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
          aspeed-bmc-facebook-yamp.dtb \
          aspeed-bmc-facebook-yosemitev2.dtb \
          aspeed-bmc-ibm-rainier.dtb \
+       aspeed-bmc-ibm-rainier-4u.dtb \
          aspeed-bmc-intel-s2600wf.dtb \
          aspeed-bmc-inspur-fp5280g2.dtb \
          aspeed-bmc-lenovo-hr630.dtb \
(quoted diff) +0 -0

arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file mode 100644
index 000000000000..9c35ac1d19a6

arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 5

Quoted 5 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +5 -0
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u.dts"

Did you test this patch?

Quoted 4 lines
Quoted 3 lines

Yes, Rainier hardware BMC booted to Ready state. I suspect it wouldn't power on properly due to bad fan configuration though, so I didn't try that. DTS looked good under /sys/firmware though.

Are you sure? The version of the patch you posted here doesn't compile.

I tested the downstream version... which should be the exact same except for additional fan config. I must have missed something.

Quoted 102 lines
Quoted 102 lines

Thanks,

Eddie

Quoted 95 lines
Quoted 95 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +32 -0
+
+/ {
+       model = "Rainier 4U";
+};
+
+&i2c3 {
+       power-supply@6a {
+               compatible = "ibm,cffps";
+               reg = <0x6a>;
+       };
+
+       power-supply@6b {
+               compatible = "ibm,cffps";
+               reg = <0x6b>;
+       };
+};
+
+&fan0 {
+       tach-pulses = <4>;
+};
+
+&fan1 {
+       tach-pulses = <4>;
+};
+
+&fan2 {
+       tach-pulses = <4>;
+};
+
+&fan3 {
+       tach-pulses = <4>;
+};
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +5 -16
index 183e1a4dcc65..676ae5602fb9 100644
@@ -8,7 +8,7 @@
   #include <dt-bindings/leds/leds-pca955x.h>
 
   / {
-       model = "Rainier";
+       model = "Rainier 2U";
          compatible = "ibm,rainier-bmc", "aspeed,ast2600";
 
          aliases {
@@ -646,16 +646,6 @@ power-supply@69 {
                  compatible = "ibm,cffps";
                  reg = <0x69>;
          };
-
-       power-supply@6a {
-               compatible = "ibm,cffps";
-               reg = <0x6a>;
-       };
-
-       power-supply@6b {
-               compatible = "ibm,cffps";
-               reg = <0x6b>;
-       };
   };
 
   &i2c4 {
@@ -775,25 +765,25 @@ max31785@52 {
                  #address-cells = <1>;
                  #size-cells = <0>;
 
-               fan@0 {
+               fan0: fan@0 {
                          compatible = "pmbus-fan";
                          reg = <0>;
                          tach-pulses = <2>;
                  };
 
-               fan@1 {
+               fan1: fan@1 {
                          compatible = "pmbus-fan";
                          reg = <1>;
                          tach-pulses = <2>;
                  };
 
-               fan@2 {
+               fan2: fan@2 {
                          compatible = "pmbus-fan";
                          reg = <2>;
                          tach-pulses = <2>;
                  };
 
-               fan@3 {
+               fan3: fan@3 {
                          compatible = "pmbus-fan";
                          reg = <3>;
                          tach-pulses = <2>;
--

2.26.2