[PATCH linux dev-5.8 v2] ARM: dts: Aspeed: Rainier: Add 4U device-tree

[Eddie James]

On 10/26/20 12:22 AM, Andrew Jeffery wrote:
>
> On Thu, 24 Sep 2020, at 05:14, Eddie James wrote:
>> 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.
>>
>> Signed-off-by: Eddie James <eajames at linux.ibm.com>
>> ---
>> 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    | 47 +++++++++++++++++++
>>   arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts  | 14 +-----
>>   3 files changed, 50 insertions(+), 12 deletions(-)
>>   create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 56fd8c8a2ba9..8f59cb9a9b71 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -1359,6 +1359,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 \
>> diff --git a/arch/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..e5d51b9c7a47
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
>> @@ -0,0 +1,47 @@
>> +// SPDX-License-Identifier: GPL-2.0-or-later
>> +// Copyright 2019 IBM Corp.
>> +/dts-v1/;
>> +
>> +#include "aspeed-bmc-ibm-rainier.dts"
>> +
>> +/ {
>> +	model = "Rainier 4U";
>> +};
>> +
>> +&i2c3 {
>> +	power-supply at 6a {
>> +		compatible = "ibm,cffps";
>> +		reg = <0x6a>;
>> +	};
>> +
>> +	power-supply at 6b {
>> +		compatible = "ibm,cffps";
>> +		reg = <0x6b>;
>> +	};
> This looks good.
>
>> +};
>> +
>> +&fan_controller {
>> +	fan at 0 {
>> +		compatible = "pmbus-fan";
>> +		reg = <0>;
>> +		tach-pulses = <4>;
>> +	};
>> +
>> +	fan at 1 {
>> +		compatible = "pmbus-fan";
>> +		reg = <1>;
>> +		tach-pulses = <4>;
>> +	};
>> +
>> +	fan at 2 {
>> +		compatible = "pmbus-fan";
>> +		reg = <2>;
>> +		tach-pulses = <4>;
>> +	};
>> +
>> +	fan at 3 {
>> +		compatible = "pmbus-fan";
>> +		reg = <3>;
>> +		tach-pulses = <4>;
> Where did you get the information for `tach-pulses = <4>;`?


 From Matthew Barth.


Thanks,

Eddie


>
> Andrew
>
>> +	};
>> +};
>> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
>> b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
>> index e6f422edf454..6b44340a9e8c 100644
>> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
>> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
>> @@ -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 at 69 {
>>   		compatible = "ibm,cffps";
>>   		reg = <0x69>;
>>   	};
>> -
>> -	power-supply at 6a {
>> -		compatible = "ibm,cffps";
>> -		reg = <0x6a>;
>> -	};
>> -
>> -	power-supply at 6b {
>> -		compatible = "ibm,cffps";
>> -		reg = <0x6b>;
>> -	};
>>   };
>>   
>>   &i2c4 {
>> @@ -769,7 +759,7 @@ tmp275 at 48 {
>>   		reg = <0x48>;
>>   	};
>>   
>> -	max31785 at 52 {
>> +	fan_controller: max31785 at 52 {
>>   		compatible = "maxim,max31785a";
>>   		reg = <0x52>;
>>   		#address-cells = <1>;
>> -- 
>> 2.26.2
>>
>>