* [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree
@ 2020-10-28 18:56 Eddie James
2020-10-30 4:09 ` Andrew Jeffery
2020-10-30 4:14 ` Joel Stanley
0 siblings, 2 replies; 6+ messages in thread
From: Eddie James @ 2020-10-28 18:56 UTC (permalink / raw)
To: openbmc; +Cc: Eddie James
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: Eddie James <eajames@linux.ibm.com>
---
Changes since v2:
- Just reference individual fan nodes rather than the whole fan
controller
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 | 37 +++++++++++++++++++
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 20 +++-------
3 files changed, 43 insertions(+), 15 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 7e4d3600e16d..9a2ab5e6e924 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1360,6 +1360,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..9c35ac1d19a6
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u.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>;
+};
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 183e1a4dcc65..676ae5602fb9 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 {
@@ -775,25 +765,25 @@ max31785@52 {
#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>;
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree
2020-10-28 18:56 [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree Eddie James
@ 2020-10-30 4:09 ` Andrew Jeffery
2020-10-30 4:14 ` Joel Stanley
1 sibling, 0 replies; 6+ messages in thread
From: Andrew Jeffery @ 2020-10-30 4:09 UTC (permalink / raw)
To: Eddie James, openbmc
On Thu, 29 Oct 2020, at 05:26, 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. Also
> add labels to the fan nodes for use in the 4U device-tree.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
> Changes since v2:
> - Just reference individual fan nodes rather than the whole fan
> controller
>
> 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 | 37 +++++++++++++++++++
> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 20 +++-------
> 3 files changed, 43 insertions(+), 15 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 7e4d3600e16d..9a2ab5e6e924 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1360,6 +1360,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..9c35ac1d19a6
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
> @@ -0,0 +1,37 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// Copyright 2020 IBM Corp.
> +/dts-v1/;
> +
> +#include "aspeed-bmc-ibm-rainier-4u.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>;
I'm still digging for info on the tac-pulses, but we can fix them later if necessary.
Looks okay otherwise:
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree
2020-10-28 18:56 [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree Eddie James
2020-10-30 4:09 ` Andrew Jeffery
@ 2020-10-30 4:14 ` Joel Stanley
2020-10-30 13:51 ` Eddie James
1 sibling, 1 reply; 6+ messages in thread
From: Joel Stanley @ 2020-10-30 4:14 UTC (permalink / raw)
To: Eddie James; +Cc: OpenBMC Maillist
Hi Eddie,
On Wed, 28 Oct 2020 at 18:56, Eddie James <eajames@linux.ibm.com> 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. Also
> add labels to the fan nodes for use in the 4U device-tree.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
> Changes since v2:
> - Just reference individual fan nodes rather than the whole fan
> controller
>
> 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 | 37 +++++++++++++++++++
> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 20 +++-------
> 3 files changed, 43 insertions(+), 15 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 7e4d3600e16d..9a2ab5e6e924 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1360,6 +1360,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..9c35ac1d19a6
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
> @@ -0,0 +1,37 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// Copyright 2020 IBM Corp.
> +/dts-v1/;
> +
> +#include "aspeed-bmc-ibm-rainier-4u.dts"
Did you test this patch?
> +
> +/ {
> + 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>;
> +};
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> index 183e1a4dcc65..676ae5602fb9 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 {
> @@ -775,25 +765,25 @@ max31785@52 {
> #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>;
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree
2020-10-30 4:14 ` Joel Stanley
@ 2020-10-30 13:51 ` Eddie James
2020-11-01 23:14 ` Joel Stanley
0 siblings, 1 reply; 6+ messages in thread
From: Eddie James @ 2020-10-30 13:51 UTC (permalink / raw)
To: Joel Stanley; +Cc: OpenBMC Maillist
On 10/29/20 11:14 PM, Joel Stanley wrote:
> Hi Eddie,
>
> On Wed, 28 Oct 2020 at 18:56, Eddie James <eajames@linux.ibm.com> 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. Also
>> add labels to the fan nodes for use in the 4U device-tree.
>>
>> Signed-off-by: Eddie James <eajames@linux.ibm.com>
>> ---
>> Changes since v2:
>> - Just reference individual fan nodes rather than the whole fan
>> controller
>>
>> 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 | 37 +++++++++++++++++++
>> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 20 +++-------
>> 3 files changed, 43 insertions(+), 15 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 7e4d3600e16d..9a2ab5e6e924 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -1360,6 +1360,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..9c35ac1d19a6
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
>> @@ -0,0 +1,37 @@
>> +// SPDX-License-Identifier: GPL-2.0-or-later
>> +// Copyright 2020 IBM Corp.
>> +/dts-v1/;
>> +
>> +#include "aspeed-bmc-ibm-rainier-4u.dts"
> Did you test this patch?
Yes, Rainier hardware BMC booted to Ready state. I suspect it wouldn't
power on properly due to bad fan configuration though, so I didn't try
that. DTS looked good under /sys/firmware though.
Thanks,
Eddie
>
>> +
>> +/ {
>> + 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>;
>> +};
>> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
>> index 183e1a4dcc65..676ae5602fb9 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 {
>> @@ -775,25 +765,25 @@ max31785@52 {
>> #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>;
>> --
>> 2.26.2
>>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree
2020-10-30 13:51 ` Eddie James
@ 2020-11-01 23:14 ` Joel Stanley
2020-11-02 14:48 ` Eddie James
0 siblings, 1 reply; 6+ messages in thread
From: Joel Stanley @ 2020-11-01 23:14 UTC (permalink / raw)
To: Eddie James; +Cc: OpenBMC Maillist
On Fri, 30 Oct 2020 at 13:51, Eddie James <eajames@linux.ibm.com> wrote:
>
>
> On 10/29/20 11:14 PM, Joel Stanley wrote:
> > Hi Eddie,
> >
> > On Wed, 28 Oct 2020 at 18:56, Eddie James <eajames@linux.ibm.com> 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. Also
> >> add labels to the fan nodes for use in the 4U device-tree.
> >>
> >> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> >> ---
> >> Changes since v2:
> >> - Just reference individual fan nodes rather than the whole fan
> >> controller
> >>
> >> 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 | 37 +++++++++++++++++++
> >> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 20 +++-------
> >> 3 files changed, 43 insertions(+), 15 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 7e4d3600e16d..9a2ab5e6e924 100644
> >> --- a/arch/arm/boot/dts/Makefile
> >> +++ b/arch/arm/boot/dts/Makefile
> >> @@ -1360,6 +1360,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..9c35ac1d19a6
> >> --- /dev/null
> >> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
> >> @@ -0,0 +1,37 @@
> >> +// SPDX-License-Identifier: GPL-2.0-or-later
> >> +// Copyright 2020 IBM Corp.
> >> +/dts-v1/;
> >> +
> >> +#include "aspeed-bmc-ibm-rainier-4u.dts"
> > Did you test this patch?
>
>
> Yes, Rainier hardware BMC booted to Ready state. I suspect it wouldn't
> power on properly due to bad fan configuration though, so I didn't try
> that. DTS looked good under /sys/firmware though.
Are you sure? The version of the patch you posted here doesn't compile.
>
>
> Thanks,
>
> Eddie
>
>
> >
> >> +
> >> +/ {
> >> + 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>;
> >> +};
> >> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> >> index 183e1a4dcc65..676ae5602fb9 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 {
> >> @@ -775,25 +765,25 @@ max31785@52 {
> >> #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>;
> >> --
> >> 2.26.2
> >>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree
2020-11-01 23:14 ` Joel Stanley
@ 2020-11-02 14:48 ` Eddie James
0 siblings, 0 replies; 6+ messages in thread
From: Eddie James @ 2020-11-02 14:48 UTC (permalink / raw)
To: Joel Stanley; +Cc: OpenBMC Maillist
On 11/1/20 5:14 PM, Joel Stanley wrote:
> On Fri, 30 Oct 2020 at 13:51, Eddie James <eajames@linux.ibm.com> wrote:
>>
>> On 10/29/20 11:14 PM, Joel Stanley wrote:
>>> Hi Eddie,
>>>
>>> On Wed, 28 Oct 2020 at 18:56, Eddie James <eajames@linux.ibm.com> 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. Also
>>>> add labels to the fan nodes for use in the 4U device-tree.
>>>>
>>>> Signed-off-by: Eddie James <eajames@linux.ibm.com>
>>>> ---
>>>> Changes since v2:
>>>> - Just reference individual fan nodes rather than the whole fan
>>>> controller
>>>>
>>>> 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 | 37 +++++++++++++++++++
>>>> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 20 +++-------
>>>> 3 files changed, 43 insertions(+), 15 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 7e4d3600e16d..9a2ab5e6e924 100644
>>>> --- a/arch/arm/boot/dts/Makefile
>>>> +++ b/arch/arm/boot/dts/Makefile
>>>> @@ -1360,6 +1360,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..9c35ac1d19a6
>>>> --- /dev/null
>>>> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
>>>> @@ -0,0 +1,37 @@
>>>> +// SPDX-License-Identifier: GPL-2.0-or-later
>>>> +// Copyright 2020 IBM Corp.
>>>> +/dts-v1/;
>>>> +
>>>> +#include "aspeed-bmc-ibm-rainier-4u.dts"
>>> Did you test this patch?
>>
>> Yes, Rainier hardware BMC booted to Ready state. I suspect it wouldn't
>> power on properly due to bad fan configuration though, so I didn't try
>> that. DTS looked good under /sys/firmware though.
> Are you sure? The version of the patch you posted here doesn't compile.
I tested the downstream version... which should be the exact same except
for additional fan config. I must have missed something.
>
>>
>> Thanks,
>>
>> Eddie
>>
>>
>>>> +
>>>> +/ {
>>>> + 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>;
>>>> +};
>>>> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
>>>> index 183e1a4dcc65..676ae5602fb9 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 {
>>>> @@ -775,25 +765,25 @@ max31785@52 {
>>>> #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>;
>>>> --
>>>> 2.26.2
>>>>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-02 14:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-28 18:56 [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree Eddie James
2020-10-30 4:09 ` Andrew Jeffery
2020-10-30 4:14 ` Joel Stanley
2020-10-30 13:51 ` Eddie James
2020-11-01 23:14 ` Joel Stanley
2020-11-02 14:48 ` Eddie James
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).