From: Eddie James <eajames@linux.ibm.com>
To: joel@jms.id.au
Cc: andrew@aj.id.au, robh+dt@kernel.org, devicetree@vger.kernel.org,
linux-aspeed@lists.ozlabs.org,
Eddie James <eajames@linux.ibm.com>
Subject: [PATCH 22/22] ARM: dts: aspeed: Add Rainier 1S4U machine
Date: Mon, 29 Mar 2021 10:00:20 -0500 [thread overview]
Message-ID: <20210329150020.13632-23-eajames@linux.ibm.com> (raw)
In-Reply-To: <20210329150020.13632-1-eajames@linux.ibm.com>
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>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts | 14 ++++++++++++++
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index c2c8ec8c1cd5..8e1819fb4497 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1424,6 +1424,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-ibm-everest.dtb \
aspeed-bmc-ibm-rainier.dtb \
aspeed-bmc-ibm-rainier-v2.dtb \
+ aspeed-bmc-ibm-rainier-1s4u.dtb \
aspeed-bmc-ibm-rainier-4u.dtb \
aspeed-bmc-ibm-rainier-4u-v2.dtb \
aspeed-bmc-intel-s2600wf.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
index 000000000000..78b2dab63624
--- /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-v2.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 a8c0ed4d37c3..089358704e64 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1979,7 +1979,7 @@ tmp275@48 {
reg = <0x48>;
};
- max31785@52 {
+ max: max31785@52 {
compatible = "maxim,max31785a";
reg = <0x52>;
#address-cells = <1>;
--
2.27.0
prev parent reply other threads:[~2021-03-29 15:01 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-29 14:59 [PATCH 00/22] ARM: dts: aspeed: Updates for Rainier and Everest machines Eddie James
2021-03-29 14:59 ` [PATCH 01/22] ARM: dts: aspeed: rainier: Add Operator Panel LEDs Eddie James
2021-03-29 15:00 ` [PATCH 02/22] ARM: dts: aspeed: rainier: Add directly controlled LEDs Eddie James
2021-03-29 15:00 ` [PATCH 03/22] ARM: dts: aspeed: rainier: Add gpio-keys-polled for fans Eddie James
2021-03-29 15:00 ` [PATCH 04/22] ARM: dts: aspeed: rainier: Add additional processor CFAMs Eddie James
2021-03-29 15:00 ` [PATCH 05/22] ARM: dts: aspeed: rainier: Add leds that are off PCA9552 Eddie James
2021-03-29 15:00 ` [PATCH 06/22] ARM: dts: aspeed: rainier: Add leds that are off pic16f882 Eddie James
2021-03-29 15:00 ` [PATCH 07/22] ARM: dts: aspeed: rainier: Add leds on optional DASD cards Eddie James
2021-03-29 15:00 ` [PATCH 08/22] ARM: dts: aspeed: rainier: Add leds on optional PCI cable cards Eddie James
2021-03-29 15:00 ` [PATCH 09/22] ARM: dts: aspeed: rainier: Add presence GPIOs Eddie James
2021-03-29 15:00 ` [PATCH 10/22] ARM: dts: aspeed: rainier: Enable fan watchdog Eddie James
2021-03-29 15:00 ` [PATCH 11/22] ARM: dts: aspeed: rainier 4U: Fix fan configuration Eddie James
2021-03-30 0:23 ` kernel test robot
2021-03-29 15:00 ` [PATCH 12/22] ARM: dts: aspeed: Everest: Add I2C components Eddie James
2021-03-29 15:00 ` [PATCH 13/22] ARM: dts: Aspeed: Everest: Add max31785 fan controller device Eddie James
2021-03-29 15:00 ` [PATCH 14/22] ARM: dts: Aspeed: Everest: Add FSI CFAMs and re-number engines Eddie James
2021-03-29 15:00 ` [PATCH 15/22] ARM: dts: Aspeed: Everest: Add pca9552 fan presence Eddie James
2021-04-07 22:34 ` Brandon Wyman
2021-03-29 15:00 ` [PATCH 16/22] ARM: dts: aspeed: everest: Add power supply i2c devices Eddie James
2021-03-29 15:00 ` [PATCH 17/22] ARM: dts: aspeed: everest: Add UCD90320 power sequencer Eddie James
2021-03-29 15:00 ` [PATCH 18/22] ARM: dts: aspeed: everest: GPIOs support Eddie James
2021-04-07 22:19 ` Brandon Wyman
2021-03-29 15:00 ` [PATCH 19/22] ARM: dts: Aspeed: Everest: Add RTC Eddie James
2021-03-29 15:00 ` [PATCH 20/22] ARM: dts: aspeed: everest: Enable fan watchdog Eddie James
2021-04-08 0:34 ` Andrew Jeffery
2021-03-29 15:00 ` [PATCH 21/22] ARM: dts: aspeed: rainier: Support pass 2 planar Eddie James
2021-03-30 3:57 ` kernel test robot
2021-03-29 15:00 ` Eddie James [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210329150020.13632-23-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=andrew@aj.id.au \
--cc=devicetree@vger.kernel.org \
--cc=joel@jms.id.au \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).