ARM: dts: aspeed: Add Rainier 1S4U machine

The 1S4U version of the Rainier system has only 4 fans. Create a new
tree, include the 4U version, and delete the 2 extra fans.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/20210329150020.13632-23-eajames@linux.ibm.com
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index c22151b..87528df 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1419,6 +1419,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-bmc-facebook-yosemitev2.dtb \
        aspeed-bmc-ibm-everest.dtb \
        aspeed-bmc-ibm-rainier.dtb \
+       aspeed-bmc-ibm-rainier-1s4u.dtb \
        aspeed-bmc-ibm-rainier-4u.dtb \
        aspeed-bmc-intel-s2600wf.dtb \
        aspeed-bmc-inspur-fp5280g2.dtb \

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
new file mode 100644 (file)
index 0000000..d1d31a5
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2021 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u.dts"
+
+/ {
+       model = "Rainier 1S4U";
+};
+
+&max {
+       /delete-node/ fan4;
+       /delete-node/ fan5;
+};

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 7a14d99..4dbb030 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1211,7 +1211,7 @@
                reg = <0x48>;
        };
 
-       max31785@52 {
+       max: max31785@52 {
                compatible = "maxim,max31785a";
                reg = <0x52>;
                #address-cells = <1>;