Commit fd6a1e60 authored by Eddie James's avatar Eddie James Committed by Joel Stanley
Browse files

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.

Signed-off-by: default avatarEddie James <eajames@linux.ibm.com>
Reviewed-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Link: https://lore.kernel.org/r/20201028185647.14565-1-eajames@linux.ibm.com


Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent 6ff28622

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1392,6 +1392,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

0 → 100644
+37 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

// Copyright 2020 IBM Corp.

/dts-v1/;



#include "aspeed-bmc-ibm-rainier.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
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <dt-bindings/leds/leds-pca955x.h>



/ {

	model = "Rainier";

	model = "Rainier 2U";

	compatible = "ibm,rainier-bmc", "aspeed,ast2600";



	aliases {
@@ -594,16 +594,6 @@ 
		compatible = "ibm,cffps";

		reg = <0x69>;

	};



	power-supply@6a {

		compatible = "ibm,cffps";

		reg = <0x6a>;

	};



	power-supply@6b {

		compatible = "ibm,cffps";

		reg = <0x6b>;

	};

};



&i2c4 {
@@ -723,25 +713,25 @@ 
		#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>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE