* [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600)
@ 2024-08-01 16:01 Peter Yin
2024-08-01 16:01 ` [PATCH v3 01/11] ARM: dts: aspeed: Harma: revise hsc chip Peter Yin
` (10 more replies)
0 siblings, 11 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Summary:
Revise linux device tree entry related to Meta(Facebook) Harma
specific devices connected to BMC(AST2600) SoC.
Base on: https://lore.kernel.org/all/CAPSyxFRj0twCJG6Lr5UZpznrUHyd_L0Reo=kZSFwCw3FNQ+x+A@mail.gmail.com/
Change log:
v2 -> v3
- fixed dtb_check warning base on https://lore.kernel.org/all/20240801153429.1277378-1-peteryin.openbmc@gmail.com/
- Patch 0011 - remove pca9546 from i2c9
v1 -> v2
- Patch 0007 - add fru device
- Patch 0008 - add temperature device
- Patch 0009 - enable mctp controller
- Patch 0010 - fixed dtb_check warning
v1
- Patch 0001 - revise hsc chip
- Patch 0002 - add VR device
- Patch 0003 - add sgpio name
- Patch 0004 - add ina238
- Patch 0005 - add power monitor xdp710
- Patch 0006 - remove multi-host property
- Patch 0007 - remove pca9546
Peter Yin (11):
ARM: dts: aspeed: Harma: revise hsc chip
ARM: dts: aspeed: Harma: add VR device
ARM: dts: aspeed: Harma: add sgpio name
ARM: dts: aspeed: Harma: add ina238
ARM: dts: aspeed: Harma: add power monitor xdp710
ARM: dts: aspeed: Harma: remove multi-host property
ARM: dts: aspeed: Harma: add fru device
ARM: dts: aspeed: Harma: add temperature device
ARM: dts: aspeed: Harma: enable mctp controller
ARM: dts: aspeed: Harma: fixed dtb_check warning
ARM: dts: aspeed: Harma: remove pca9546
.../dts/aspeed/aspeed-bmc-facebook-harma.dts | 177 +++++++++++++-----
1 file changed, 132 insertions(+), 45 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 01/11] ARM: dts: aspeed: Harma: revise hsc chip
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 02/11] ARM: dts: aspeed: Harma: add VR device Peter Yin
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Revise HSC chip name and address to match LTC4287.
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index c118d473a76f..d99fba321379 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -276,11 +276,10 @@ temperature-sensor@49 {
reg = <0x49>;
};
- power-monitor@22 {
- compatible = "lltc,ltc4286";
- reg = <0x22>;
- adi,vrange-low-enable;
- shunt-resistor-micro-ohms = <500>;
+ power-monitor@44 {
+ compatible = "lltc,ltc4287";
+ reg = <0x44>;
+ shunt-resistor-micro-ohms = <250>;
};
};
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 02/11] ARM: dts: aspeed: Harma: add VR device
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
2024-08-01 16:01 ` [PATCH v3 01/11] ARM: dts: aspeed: Harma: revise hsc chip Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-02 6:36 ` Andrew Jeffery
2024-08-01 16:01 ` [PATCH v3 03/11] ARM: dts: aspeed: Harma: add sgpio name Peter Yin
` (8 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Add isl69260, xdpe152c4 device
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
.../dts/aspeed/aspeed-bmc-facebook-harma.dts | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index d99fba321379..8fb30029e46c 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -398,6 +398,30 @@ imux28: i2c@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
+ power-monitor@61 {
+ compatible = "isil,isl69260";
+ reg = <0x61>;
+ };
+ power-monitor@62 {
+ compatible = "isil,isl69260";
+ reg = <0x62>;
+ };
+ power-monitor@63 {
+ compatible = "isil,isl69260";
+ reg = <0x63>;
+ };
+ power-monitor@64 {
+ compatible = "infineon,xdpe152c4";
+ reg = <0x64>;
+ };
+ power-monitor@66 {
+ compatible = "infineon,xdpe152c4";
+ reg = <0x66>;
+ };
+ power-monitor@68 {
+ compatible = "infineon,xdpe152c4";
+ reg = <0x68>;
+ };
};
imux29: i2c@1 {
#address-cells = <1>;
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 03/11] ARM: dts: aspeed: Harma: add sgpio name
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
2024-08-01 16:01 ` [PATCH v3 01/11] ARM: dts: aspeed: Harma: revise hsc chip Peter Yin
2024-08-01 16:01 ` [PATCH v3 02/11] ARM: dts: aspeed: Harma: add VR device Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 04/11] ARM: dts: aspeed: Harma: add ina238 Peter Yin
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Add power-chassis-control and power-chassis-power
for phosphor-power
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index 8fb30029e46c..0c4bf165d0b0 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -520,13 +520,14 @@ &gpio0 {
/*O0-O7*/ "","","","","","","","",
/*P0-P7*/ "power-button","power-host-control",
"reset-button","","led-power","","","",
- /*Q0-Q7*/ "","","","","","","","",
+ /*Q0-Q7*/ "","","","","","power-chassis-control","","",
/*R0-R7*/ "","","","","","","","",
/*S0-S7*/ "","","","","","","","",
/*T0-T7*/ "","","","","","","","",
/*U0-U7*/ "","","","","","","led-identify-gate","",
/*V0-V7*/ "","","","",
- "rtc-battery-voltage-read-enable","","","",
+ "rtc-battery-voltage-read-enable","",
+ "power-chassis-good","",
/*W0-W7*/ "","","","","","","","",
/*X0-X7*/ "","","","","","","","",
/*Y0-Y7*/ "","","","","","","","",
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 04/11] ARM: dts: aspeed: Harma: add ina238
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
` (2 preceding siblings ...)
2024-08-01 16:01 ` [PATCH v3 03/11] ARM: dts: aspeed: Harma: add sgpio name Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 05/11] ARM: dts: aspeed: Harma: add power monitor xdp710 Peter Yin
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Add INA238 power monitor for Harma fan board.
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
.../dts/aspeed/aspeed-bmc-facebook-harma.dts | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index 0c4bf165d0b0..7d809f1636d6 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -198,6 +198,30 @@ pwm@5e{
#address-cells = <1>;
#size-cells = <0>;
};
+
+ power-sensor@40 {
+ compatible = "ti,ina238";
+ reg = <0x40>;
+ shunt-resistor = <1000>;
+ };
+
+ power-sensor@41 {
+ compatible = "ti,ina238";
+ reg = <0x41>;
+ shunt-resistor = <1000>;
+ };
+
+ power-sensor@44 {
+ compatible = "ti,ina238";
+ reg = <0x44>;
+ shunt-resistor = <1000>;
+ };
+
+ power-sensor@45 {
+ compatible = "ti,ina238";
+ reg = <0x45>;
+ shunt-resistor = <1000>;
+ };
};
&i2c1 {
@@ -224,6 +248,30 @@ pwm@5e{
#address-cells = <1>;
#size-cells = <0>;
};
+
+ power-sensor@40 {
+ compatible = "ti,ina238";
+ reg = <0x40>;
+ shunt-resistor = <1000>;
+ };
+
+ power-sensor@41 {
+ compatible = "ti,ina238";
+ reg = <0x41>;
+ shunt-resistor = <1000>;
+ };
+
+ power-sensor@44 {
+ compatible = "ti,ina238";
+ reg = <0x44>;
+ shunt-resistor = <1000>;
+ };
+
+ power-sensor@45 {
+ compatible = "ti,ina238";
+ reg = <0x45>;
+ shunt-resistor = <1000>;
+ };
};
&i2c3 {
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 05/11] ARM: dts: aspeed: Harma: add power monitor xdp710
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
` (3 preceding siblings ...)
2024-08-01 16:01 ` [PATCH v3 04/11] ARM: dts: aspeed: Harma: add ina238 Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 06/11] ARM: dts: aspeed: Harma: remove multi-host property Peter Yin
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Add HSC xdp710 device in i2c4.
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index 7d809f1636d6..77eaa89b5eb5 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -329,6 +329,11 @@ power-monitor@44 {
reg = <0x44>;
shunt-resistor-micro-ohms = <250>;
};
+
+ power-monitor@40 {
+ compatible = "infineon,xdp710";
+ reg = <0x40>;
+ };
};
&i2c5 {
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 06/11] ARM: dts: aspeed: Harma: remove multi-host property
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
` (4 preceding siblings ...)
2024-08-01 16:01 ` [PATCH v3 05/11] ARM: dts: aspeed: Harma: add power monitor xdp710 Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 07/11] ARM: dts: aspeed: Harma: add fru device Peter Yin
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Harma is single host, so remove multi-host property
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index 77eaa89b5eb5..e10ee54fe472 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -137,7 +137,6 @@ &mac3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii4_default>;
use-ncsi;
- mellanox,multi-host;
};
&rtc {
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 07/11] ARM: dts: aspeed: Harma: add fru device
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
` (5 preceding siblings ...)
2024-08-01 16:01 ` [PATCH v3 06/11] ARM: dts: aspeed: Harma: remove multi-host property Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 08/11] ARM: dts: aspeed: Harma: add temperature device Peter Yin
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Add Aegis fru device and gpio expander device in bus 11.
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
.../dts/aspeed/aspeed-bmc-facebook-harma.dts | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index e10ee54fe472..f55ffe9c4d89 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -427,6 +427,31 @@ eeprom@52 {
&i2c11 {
status = "okay";
+
+ gpio@30 {
+ compatible = "nxp,pca9555";
+ reg = <0x30>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+ gpio@31 {
+ compatible = "nxp,pca9555";
+ reg = <0x31>;
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ gpio-line-names =
+ "","","","",
+ "","","presence-cmm","",
+ "","","","",
+ "","","","";
+ };
+
+ // Aegis FRU
+ eeprom@52 {
+ compatible = "atmel,24c64";
+ reg = <0x52>;
+ };
};
&i2c12 {
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 08/11] ARM: dts: aspeed: Harma: add temperature device
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
` (6 preceding siblings ...)
2024-08-01 16:01 ` [PATCH v3 07/11] ARM: dts: aspeed: Harma: add fru device Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 09/11] ARM: dts: aspeed: Harma: enable mctp controller Peter Yin
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Add temperature deivce in i2c0 and i2c2
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index f55ffe9c4d89..0455475fbcff 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -221,6 +221,11 @@ power-sensor@45 {
reg = <0x45>;
shunt-resistor = <1000>;
};
+
+ temperature-sensor@4b {
+ compatible = "ti,tmp75";
+ reg = <0x4b>;
+ };
};
&i2c1 {
@@ -271,6 +276,11 @@ power-sensor@45 {
reg = <0x45>;
shunt-resistor = <1000>;
};
+
+ temperature-sensor@4b {
+ compatible = "ti,tmp75";
+ reg = <0x4b>;
+ };
};
&i2c3 {
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 09/11] ARM: dts: aspeed: Harma: enable mctp controller
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
` (7 preceding siblings ...)
2024-08-01 16:01 ` [PATCH v3 08/11] ARM: dts: aspeed: Harma: add temperature device Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 10/11] ARM: dts: aspeed: Harma: fixed dtb_check warning Peter Yin
2024-08-01 16:01 ` [PATCH v3 11/11] ARM: dts: aspeed: Harma: remove pca9546 Peter Yin
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Enable the mctp controller in i2c9.
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index 0455475fbcff..0dd0566bbf27 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -382,6 +382,14 @@ &i2c8 {
&i2c9 {
status = "okay";
+ mctp-controller;
+ multi-master;
+
+ mctp@10 {
+ compatible = "mctp-i2c-controller";
+ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ };
+
gpio@30 {
compatible = "nxp,pca9555";
reg = <0x30>;
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 10/11] ARM: dts: aspeed: Harma: fixed dtb_check warning
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
` (8 preceding siblings ...)
2024-08-01 16:01 ` [PATCH v3 09/11] ARM: dts: aspeed: Harma: enable mctp controller Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
2024-08-01 16:01 ` [PATCH v3 11/11] ARM: dts: aspeed: Harma: remove pca9546 Peter Yin
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
1. revise spi-gpio node and property name.
2. revise tpm node name
3. remove max-ngpios
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
.../arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index 0dd0566bbf27..4421822eb134 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -70,19 +70,19 @@ led-2 {
};
};
- spi_gpio: spi-gpio {
+ spi_gpio: spi {
status = "okay";
compatible = "spi-gpio";
#address-cells = <1>;
#size-cells = <0>;
- gpio-sck = <&gpio0 ASPEED_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
- gpio-mosi = <&gpio0 ASPEED_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
- gpio-miso = <&gpio0 ASPEED_GPIO(Z, 5) GPIO_ACTIVE_HIGH>;
+ sck-gpios = <&gpio0 ASPEED_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
+ mosi-gpios = <&gpio0 ASPEED_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
+ miso-gpios = <&gpio0 ASPEED_GPIO(Z, 5) GPIO_ACTIVE_HIGH>;
num-chipselects = <1>;
cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
- tpmdev@0 {
+ tpm@0 {
compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
spi-max-frequency = <33000000>;
reg = <0>;
@@ -640,7 +640,6 @@ &gpio1 {
&sgpiom0 {
status = "okay";
- max-ngpios = <128>;
ngpios = <128>;
bus-frequency = <2000000>;
gpio-line-names =
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 11/11] ARM: dts: aspeed: Harma: remove pca9546
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
` (9 preceding siblings ...)
2024-08-01 16:01 ` [PATCH v3 10/11] ARM: dts: aspeed: Harma: fixed dtb_check warning Peter Yin
@ 2024-08-01 16:01 ` Peter Yin
10 siblings, 0 replies; 14+ messages in thread
From: Peter Yin @ 2024-08-01 16:01 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Remove pca9546 device from i2c bus 9.
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
.../dts/aspeed/aspeed-bmc-facebook-harma.dts | 31 -------------------
1 file changed, 31 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index 4421822eb134..cf3f807a38fe 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -20,10 +20,6 @@ aliases {
i2c21 = &imux21;
i2c22 = &imux22;
i2c23 = &imux23;
- i2c24 = &imux24;
- i2c25 = &imux25;
- i2c26 = &imux26;
- i2c27 = &imux27;
i2c28 = &imux28;
i2c29 = &imux29;
i2c30 = &imux30;
@@ -409,33 +405,6 @@ gpio@31 {
"","","","";
};
- i2c-mux@71 {
- compatible = "nxp,pca9546";
- reg = <0x71>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- imux24: i2c@0 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
- };
- imux25: i2c@1 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <1>;
- };
- imux26: i2c@2 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <2>;
- };
- imux27: i2c@3 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <3>;
- };
- };
// PTTV FRU
eeprom@52 {
compatible = "atmel,24c64";
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v3 02/11] ARM: dts: aspeed: Harma: add VR device
2024-08-01 16:01 ` [PATCH v3 02/11] ARM: dts: aspeed: Harma: add VR device Peter Yin
@ 2024-08-02 6:36 ` Andrew Jeffery
2024-08-12 2:08 ` Andrew Jeffery
0 siblings, 1 reply; 14+ messages in thread
From: Andrew Jeffery @ 2024-08-02 6:36 UTC (permalink / raw)
To: Peter Yin, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
On Fri, 2024-08-02 at 00:01 +0800, Peter Yin wrote:
> Add isl69260, xdpe152c4 device
>
> Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
> ---
> .../dts/aspeed/aspeed-bmc-facebook-harma.dts | 24 +++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> index d99fba321379..8fb30029e46c 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> @@ -398,6 +398,30 @@ imux28: i2c@0 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0>;
> + power-monitor@61 {
> + compatible = "isil,isl69260";
> + reg = <0x61>;
> + };
> + power-monitor@62 {
> + compatible = "isil,isl69260";
> + reg = <0x62>;
> + };
> + power-monitor@63 {
> + compatible = "isil,isl69260";
> + reg = <0x63>;
> + };
As of v6.11-rc1 this gives me:
```
$ ./scripts/checkpatch.pl --strict -g HEAD
...
WARNING: DT compatible string "isil,isl69260" appears un-documented -- check ./Documentation/devicetree/bindings/
#24: FILE: arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts:402:
+ compatible = "isil,isl69260";
WARNING: DT compatible string "isil,isl69260" appears un-documented -- check ./Documentation/devicetree/bindings/
#28: FILE: arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts:406:
+ compatible = "isil,isl69260";
WARNING: DT compatible string "isil,isl69260" appears un-documented -- check ./Documentation/devicetree/bindings/
#32: FILE: arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts:410:
+ compatible = "isil,isl69260";
total: 0 errors, 3 warnings, 0 checks, 30 lines checked
```
and
```
$ make CHECK_DTBS=y aspeed/aspeed-bmc-facebook-harma.dtb 2>&1 | grep isil
...
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dtb: /ahb/apb/bus@1e78a000/i2c@700/i2c-mux@70/i2c@0/power-monitor@61: failed to match any schema with compatible: ['isil,isl69260']
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dtb: /ahb/apb/bus@1e78a000/i2c@700/i2c-mux@70/i2c@0/power-monitor@62: failed to match any schema with compatible: ['isil,isl69260']
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dtb: /ahb/apb/bus@1e78a000/i2c@700/i2c-mux@70/i2c@0/power-monitor@63: failed to match any schema with compatible: ['isil,isl69260']
```
While there's already an Aspeed-based Quanta platform that also
specifies this device, let's not add to the problems of the Aspeed
devicetrees.
Please make sure to run `make dtbs_check ...` and checkpatch on your
changes. Regarding `make dtbs_check` and related tests, this blog post
is helpful:
https://www.linaro.org/blog/tips-and-tricks-for-validating-devicetree-sources-with-the-devicetree-schema/
Andrew
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 02/11] ARM: dts: aspeed: Harma: add VR device
2024-08-02 6:36 ` Andrew Jeffery
@ 2024-08-12 2:08 ` Andrew Jeffery
0 siblings, 0 replies; 14+ messages in thread
From: Andrew Jeffery @ 2024-08-12 2:08 UTC (permalink / raw)
To: Peter Yin, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
On Fri, 2024-08-02 at 16:06 +0930, Andrew Jeffery wrote:
> On Fri, 2024-08-02 at 00:01 +0800, Peter Yin wrote:
> > Add isl69260, xdpe152c4 device
> >
> > Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
> > ---
> > .../dts/aspeed/aspeed-bmc-facebook-harma.dts | 24 +++++++++++++++++++
> > 1 file changed, 24 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> > index d99fba321379..8fb30029e46c 100644
> > --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> > +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> > @@ -398,6 +398,30 @@ imux28: i2c@0 {
> > #address-cells = <1>;
> > #size-cells = <0>;
> > reg = <0>;
> > + power-monitor@61 {
> > + compatible = "isil,isl69260";
> > + reg = <0x61>;
> > + };
> > + power-monitor@62 {
> > + compatible = "isil,isl69260";
> > + reg = <0x62>;
> > + };
> > + power-monitor@63 {
> > + compatible = "isil,isl69260";
> > + reg = <0x63>;
> > + };
>
> As of v6.11-rc1 this gives me:
>
> ```
> $ ./scripts/checkpatch.pl --strict -g HEAD
> ...
> WARNING: DT compatible string "isil,isl69260" appears un-documented -- check ./Documentation/devicetree/bindings/
> #24: FILE: arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts:402:
> + compatible = "isil,isl69260";
>
> WARNING: DT compatible string "isil,isl69260" appears un-documented -- check ./Documentation/devicetree/bindings/
> #28: FILE: arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts:406:
> + compatible = "isil,isl69260";
>
> WARNING: DT compatible string "isil,isl69260" appears un-documented -- check ./Documentation/devicetree/bindings/
> #32: FILE: arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts:410:
> + compatible = "isil,isl69260";
>
> total: 0 errors, 3 warnings, 0 checks, 30 lines checked
> ```
>
> and
>
> ```
> $ make CHECK_DTBS=y aspeed/aspeed-bmc-facebook-harma.dtb 2>&1 | grep isil
> ...
> arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dtb: /ahb/apb/bus@1e78a000/i2c@700/i2c-mux@70/i2c@0/power-monitor@61: failed to match any schema with compatible: ['isil,isl69260']
> arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dtb: /ahb/apb/bus@1e78a000/i2c@700/i2c-mux@70/i2c@0/power-monitor@62: failed to match any schema with compatible: ['isil,isl69260']
> arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dtb: /ahb/apb/bus@1e78a000/i2c@700/i2c-mux@70/i2c@0/power-monitor@63: failed to match any schema with compatible: ['isil,isl69260']
> ```
>
> While there's already an Aspeed-based Quanta platform that also
> specifies this device, let's not add to the problems of the Aspeed
> devicetrees.
>
> Please make sure to run `make dtbs_check ...` and checkpatch on your
> changes. Regarding `make dtbs_check` and related tests, this blog post
> is helpful:
>
> https://www.linaro.org/blog/tips-and-tricks-for-validating-devicetree-sources-with-the-devicetree-schema/
On the basis of the reviews on [1] and Rob stating he's applied the
binding patch, I've applied this series to be picked up through the BMC
tree.
[1]: https://lore.kernel.org/all/20240809070056.3588694-1-peteryin.openbmc@gmail.com/
Thanks,
Andrew
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-08-12 2:08 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-01 16:01 [PATCH v3 00/11] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
2024-08-01 16:01 ` [PATCH v3 01/11] ARM: dts: aspeed: Harma: revise hsc chip Peter Yin
2024-08-01 16:01 ` [PATCH v3 02/11] ARM: dts: aspeed: Harma: add VR device Peter Yin
2024-08-02 6:36 ` Andrew Jeffery
2024-08-12 2:08 ` Andrew Jeffery
2024-08-01 16:01 ` [PATCH v3 03/11] ARM: dts: aspeed: Harma: add sgpio name Peter Yin
2024-08-01 16:01 ` [PATCH v3 04/11] ARM: dts: aspeed: Harma: add ina238 Peter Yin
2024-08-01 16:01 ` [PATCH v3 05/11] ARM: dts: aspeed: Harma: add power monitor xdp710 Peter Yin
2024-08-01 16:01 ` [PATCH v3 06/11] ARM: dts: aspeed: Harma: remove multi-host property Peter Yin
2024-08-01 16:01 ` [PATCH v3 07/11] ARM: dts: aspeed: Harma: add fru device Peter Yin
2024-08-01 16:01 ` [PATCH v3 08/11] ARM: dts: aspeed: Harma: add temperature device Peter Yin
2024-08-01 16:01 ` [PATCH v3 09/11] ARM: dts: aspeed: Harma: enable mctp controller Peter Yin
2024-08-01 16:01 ` [PATCH v3 10/11] ARM: dts: aspeed: Harma: fixed dtb_check warning Peter Yin
2024-08-01 16:01 ` [PATCH v3 11/11] ARM: dts: aspeed: Harma: remove pca9546 Peter Yin
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).