ARM: dts: Aspeed: Rainier: Add 4U device-tree
Subsystems (3)
PATCH v2 1/1 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.
---
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
arch/arm/boot/dts/Makefile +1 -0
@@ -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 \
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +47 -0
47 lines not on this page · raw message
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +2 -12
@@ -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>;
Signature · 1 line
2.26.2
Quoted 45 lines · 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.
Signed-off-by Eddie James <[email protected]>---
Changes since v1:
- Don't rename the 2U dts
- Include the 2U dts from the 4U and make the necessary changesarch/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.dtsarch/arm/boot/dts/Makefile +1
-0@@ -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 \arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +10
-0@@ -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"; +}; +
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 20
Quoted 10 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +10
-0+&i2c3 { + power-supply@6a { + compatible = "ibm,cffps"; + reg = <0x6a>; + }; + + power-supply@6b { + compatible = "ibm,cffps"; + reg = <0x6b>; + };
This looks good.
Quoted 15 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +15
-0+}; + +&fan_controller { + fan@0 { + compatible = "pmbus-fan"; + reg = <0>; + tach-pulses = <4>; + }; + + fan@1 { + compatible = "pmbus-fan"; + reg = <1>; + tach-pulses = <4>; + }; +
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 45
Quoted 10 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +10
-0+ 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
Quoted 46 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +2
-0+ }; +};arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +2
-12@@ -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>;Signature · 1 line
2.26.2
Quoted 77 lines · Andrew Jeffery
Quoted 45 lines · 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.
Signed-off-by Eddie James <[email protected]>---
Changes since v1:
- Don't rename the 2U dts
- Include the 2U dts from the 4U and make the necessary changesarch/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.dtsarch/arm/boot/dts/Makefile +1
-0@@ -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 \arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +10
-0@@ -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"; +}; +arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 20
Quoted 10 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +10
-0+&i2c3 { + power-supply@6a { + compatible = "ibm,cffps"; + reg = <0x6a>; + }; + + power-supply@6b { + compatible = "ibm,cffps"; + reg = <0x6b>; + };This looks good.
Quoted 18 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +18
-0+}; + +&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>;
Quoted 8 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts line 45
Quoted 7 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +7
-0+ tach-pulses = <4>; + }; + + fan@3 { + compatible = "pmbus-fan"; + reg = <3>; + tach-pulses = <4>;Where did you get the information for
tach-pulses = <4>;?
From Matthew Barth.
Thanks,
Eddie
Quoted 49 lines
Andrew
Quoted 46 lines
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts new file +2
-0+ }; +};arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +2
-12@@ -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>;Signature · 1 line
2.26.2