From: "Andrew Jeffery" <andrew@aj.id.au>
To: "Eddie James" <eajames@linux.ibm.com>, openbmc@lists.ozlabs.org
Subject: Re: [PATCH linux dev-5.8 v2] ARM: dts: Aspeed: Rainier: Add 4U device-tree
Date: Mon, 26 Oct 2020 15:52:49 +1030 [thread overview]
Message-ID: <8078a638-48d1-4851-a6bc-f232f62c70af@www.fastmail.com> (raw)
In-Reply-To: <20200923194405.28857-1-eajames@linux.ibm.com>
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@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@6a {
> + compatible = "ibm,cffps";
> + reg = <0x6a>;
> + };
> +
> + power-supply@6b {
> + compatible = "ibm,cffps";
> + reg = <0x6b>;
> + };
This looks good.
> +};
> +
> +&fan_controller {
> + fan@0 {
> + compatible = "pmbus-fan";
> + reg = <0>;
> + tach-pulses = <4>;
> + };
> +
> + fan@1 {
> + compatible = "pmbus-fan";
> + reg = <1>;
> + tach-pulses = <4>;
> + };
> +
> + fan@2 {
> + compatible = "pmbus-fan";
> + reg = <2>;
> + tach-pulses = <4>;
> + };
> +
> + fan@3 {
> + compatible = "pmbus-fan";
> + reg = <3>;
> + tach-pulses = <4>;
Where did you get the information for `tach-pulses = <4>;`?
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@69 {
> compatible = "ibm,cffps";
> reg = <0x69>;
> };
> -
> - power-supply@6a {
> - compatible = "ibm,cffps";
> - reg = <0x6a>;
> - };
> -
> - power-supply@6b {
> - compatible = "ibm,cffps";
> - reg = <0x6b>;
> - };
> };
>
> &i2c4 {
> @@ -769,7 +759,7 @@ tmp275@48 {
> reg = <0x48>;
> };
>
> - max31785@52 {
> + fan_controller: max31785@52 {
> compatible = "maxim,max31785a";
> reg = <0x52>;
> #address-cells = <1>;
> --
> 2.26.2
>
>
next prev parent reply other threads:[~2020-10-26 5:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 19:44 [PATCH linux dev-5.8 v2] ARM: dts: Aspeed: Rainier: Add 4U device-tree Eddie James
2020-10-26 5:22 ` Andrew Jeffery [this message]
2020-10-26 13:44 ` Eddie James
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=8078a638-48d1-4851-a6bc-f232f62c70af@www.fastmail.com \
--to=andrew@aj.id.au \
--cc=eajames@linux.ibm.com \
--cc=openbmc@lists.ozlabs.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).