[PATCH linux dev-5.10 3/3] ARM: dts: aspeed: Add Rainier 1S4U machine

[Andrew Geissler]

> On Mar 10, 2021, at 11:32 AM, Eddie James <eajames at linux.ibm.com> wrote:
> 
> 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 at 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 7b24be9cf961..535a467822f9 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1398,6 +1398,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;

Testing brought to light that the hardware actually uses slots 0, 1, 2, and 4
for the 4 fans. So need to replace the delete of fan4 here with fan3.

Otherwise, looks good, thanks.

> +	/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 9f34136ec40f..dad90a152174 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -1978,7 +1978,7 @@ tmp275 at 48 {
> 		reg = <0x48>;
> 	};
> 
> -	max31785 at 52 {
> +	max: max31785 at 52 {
> 		compatible = "maxim,max31785a";
> 		reg = <0x52>;
> 		#address-cells = <1>;
> -- 
> 2.27.0
>