Skip to contentSkip to conversation

Revise Facebook Minerva BMC DTS

PATCH In review Yang Chen 3 participants 21 messages Jun 25, 2024 – Jun 26, 2024

Subsystems (2)
lore
Share & tools
lore

Yang Chen

author
#0 lore raw

cover Revise Facebook Minerva BMC DTS

Revise the Linux device tree entry related to Facebook platform Minerva specific devices connected to the Aspeed AST2600 BMC.

Yang Chen (17):
ARM: dts: aspeed: minerva: change the address of tmp75
ARM: dts: aspeed: minerva: Add spi-gpio
ARM: dts: aspeed: minerva: change aliases for uart
ARM: dts: aspeed: minerva: add eeprom on i2c bus
ARM: dts: aspeed: minerva: change RTC reference
ARM: dts: aspeed: minerva: enable mdio3
ARM: dts: aspeed: minerva: remove unused bus and device
ARM: dts: aspeed: minerva: Define the LEDs node name
ARM: dts: aspeed: minerva: Add adc sensors for fan board
ARM: dts: aspeed: minerva: add linename of two pins
ARM: dts: aspeed: minerva: enable ehci0 for USB
ARM: dts: aspeed: minerva: add tmp75 sensor
ARM: dts: minerva: add power monitor xdp710
ARM: dts: aspeed: minerva: revise sgpio line name
ARM: dts: aspeed: minerva: Switch the i2c bus number
ARM: dts: aspeed: minerva: remove unused power device
ARM: dts: aspeed: minerva: add ltc4287 device

 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 516 +++++++++++++-----
 1 file changed, 373 insertions(+), 143 deletions(-)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/17 ARM: dts: aspeed: minerva: change the address of tmp75

From: Yang Chen <[email protected]>

Revise the address of tmp75 on I2C bus 1 from 0x48 to 0x4f due to design change.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +2 -2
index 942e53d5c714..e20e31917d6c 100644
@@ -145,9 +145,9 @@ temperature-sensor at 4b {
 		reg = <0x4b>;
 	};
 
-	temperature-sensor at 48 {
+	temperature-sensor at 4f {
 		compatible = "ti,tmp75";
-		reg = <0x48>;
+		reg = <0x4f>;
 	};
 
 	eeprom at 54 {
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 2/17 ARM: dts: aspeed: minerva: Add spi-gpio

In reply to Yang Chen

From: Yang Chen <[email protected]>

Add spi-gpio for TPM device.

---
 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +21 -0
index e20e31917d6c..7d96a3638448 100644
@@ -22,6 +22,8 @@ aliases {
 		i2c19 = &imux19;
 		i2c20 = &imux20;
 		i2c21 = &imux21;
+
+		spi1 = &spi_gpio;
 	};
 
 	chosen {
@@ -49,6 +51,25 @@ led-fan-fault {
 			default-state = "off";
 		};
 	};
+
+	spi_gpio: spi-gpio {
+		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>;
+		num-chipselects = <1>;
+		cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
+
+		tpmdev at 0 {
+			compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
+			spi-max-frequency = <33000000>;
+			reg = <0>;
+		};
+	};
 };
 
 &uart6 {
Signature · 1 line
2.34.1
maintainer
#3 lore raw

Re: [PATCH 02/17] ARM: dts: aspeed: minerva: Add spi-gpio

Quoted 35 lines · Yang Chen

From: Yang Chen <[email protected]>

Add spi-gpio for TPM device.

---
 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +11 -0
index e20e31917d6c..7d96a3638448 100644
@@ -22,6 +22,8 @@ aliases {
 		i2c19 = &imux19;
 		i2c20 = &imux20;
 		i2c21 = &imux21;
+
+		spi1 = &spi_gpio;
 	};
 
 	chosen {
@@ -49,6 +51,25 @@ led-fan-fault {
 			default-state = "off";
 		};
 	};
+
+	spi_gpio: spi-gpio {
+		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>;

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts led-fan-fault { · line 72

Quoted 10 lines
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +10 -0
+		gpio-miso = <&gpio0 ASPEED_GPIO(Z, 5) GPIO_ACTIVE_HIGH>;
+		num-chipselects = <1>;
+		cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
+
+		tpmdev at 0 {
+			compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
+			spi-max-frequency = <33000000>;
+			reg = <0>;
+		};
+	};

I poked at your series with the following script:

```
$ cat dtb-check
#!/usr/bin/bash

set -euo pipefail

DTB="$1"

rm -f arch/arm/boot/dts/"$DTB"
make CHECK_DTBS=y "$DTB" 2>&1 |
    sed "/should not be valid under {'type': 'object'}/d" > curr.log
diff -u ref.log curr.log
```

I ran this after creating a reference output prior to your series using the same make CHECK_DTBS=y command.

This patch gave the following output (which I expect Rob's bot will follow up with at some point as well):

```
--- ref.log     2024-06-26 10:48:23.767078834 +0930
+++ curr.log    2024-06-26 10:55:56.857034132 +0930
@@ -1,4 +1,6 @@
   DTC_CHK arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: /: spi-gpio: {'status': ['okay'], 'compatible': ['spi-gpio'], '#address-cells': [[1]], '#size-cells': [[0]], 'gpio-sck': [[62, 203, 0]], 'gpio-mosi': [[62, 204, 0]], 'gpio-miso': [[62, 205, 0]], 'num-chipselects': [[1]], 'cs-gpios': [[62, 200, 1]], 'tpmdev at 0': {'compatible': ['infineon,slb9670', 'tcg,tpm_tis-spi'], 'spi-max-frequency': [[33000000]], 'reg': [[0]]}} is not of type 'array'
+       from schema $id: http://devicetree.org/schemas/gpio/gpio-consumer.yaml#
 /home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: timer: 'clocks' does not match any of the regexes: 'pinctrl-[0-9]+'
        from schema $id: http://devicetree.org/schemas/timer/arm,arch_timer.yaml#
 /home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: sdram at 1e6e0000: compatible: ['aspeed,ast2600-sdram-edac', 'syscon'] is too long
@@ -38,3 +40,17 @@
        from schema $id: http://devicetree.org/schemas/fsi/aspeed,ast2600-fsi-master.yaml#
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: /ahb/apb/fsi at 1e79b100: failed to match any schema with compatible: ['aspeed,ast2600-fsi-master', 'fsi-master']
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: /ahb/apb/dma-controller at 1e79e000: failed to match any schema with compatible: ['aspeed,ast2600-udma']
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: $nodename:0: 'spi-gpio' does not match '^spi(@.*|-([0-9]|[1-9][0-9]+))?$'
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: gpio-sck: False schema does not allow [[62, 203, 0]]
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: gpio-miso: False schema does not allow [[62, 205, 0]]
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: gpio-mosi: False schema does not allow [[62, 204, 0]]
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: 'sck-gpios' is a required property
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'gpio-miso', 'gpio-mosi', 'gpio-sck', 'tpmdev at 0' were unexpected)
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: tpmdev at 0: $nodename:0: 'tpmdev at 0' does not match '^tpm(@[0-9a-f]+)?$'
+       from schema $id: http://devicetree.org/schemas/tpm/tcg,tpm_tis-spi.yaml#
```

Can you please address these and go over the rest of the patches to shore them up against the current bindings?

Thanks,

Andrew

author
#4 lore raw

PATCH 2/17 ARM: dts: aspeed: minerva: Add spi-gpio

Hi Andrew,

Quoted 143 lines · On Wed, Jun 26, 2024 at 9:30?AM Andrew Jeffery <[email protected]>…

Review

Quoted 10 lines · Yang Chen

From: Yang Chen <[email protected]>

Add spi-gpio for TPM device.

---
 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
(quoted diff) +0 -0

b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts

Quoted 25 lines

index e20e31917d6c..7d96a3638448 100644

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +11 -0
@@ -22,6 +22,8 @@ aliases {
              i2c19 = &imux19;
              i2c20 = &imux20;
              i2c21 = &imux21;
+
+             spi1 = &spi_gpio;
      };
 
      chosen {
@@ -49,6 +51,25 @@ led-fan-fault {
                      default-state = "off";
              };
      };
+
+     spi_gpio: spi-gpio {
+             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>;

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts led-fan-fault { · line 72

Quoted 10 lines
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +10 -0
+             gpio-miso = <&gpio0 ASPEED_GPIO(Z, 5) GPIO_ACTIVE_HIGH>;
+             num-chipselects = <1>;
+             cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
+
+             tpmdev at 0 {
+                     compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
+                     spi-max-frequency = <33000000>;
+                     reg = <0>;
+             };
+     };

I poked at your series with the following script:

```
$ cat dtb-check
#!/usr/bin/bash

set -euo pipefail

DTB="$1"

rm -f arch/arm/boot/dts/"$DTB"
make CHECK_DTBS=y "$DTB" 2>&1 |
    sed "/should not be valid under {'type': 'object'}/d" > curr.log
diff -u ref.log curr.log
```

I ran this after creating a reference output prior to your series using the same make CHECK_DTBS=y command.

This patch gave the following output (which I expect Rob's bot will follow up with at some point as well):

```

curr.log 2024-06-26 10:55:56.857034132 +0930 renamed from ref.log 2024-06-26 10:48:23.767078834 +0930 +1 -0
@@ -1,4 +1,6 @@
   DTC_CHK arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb
+/home/andrew/src/

kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb:
/: spi-gpio: {'status': ['okay'], 'compatible': ['spi-gpio'],
'#address-cells': [[1]], '#size-cells': [[0]], 'gpio-sck': [[62, 203, 0]], 'gpio-mosi': [[62, 204, 0]], 'gpio-miso': [[62, 205, 0]],
'num-chipselects': [[1]], 'cs-gpios': [[62, 200, 1]], 'tpmdev at 0':
{'compatible': ['infineon,slb9670', 'tcg,tpm_tis-spi'],
'spi-max-frequency': [[33000000]], 'reg': [[0]]}} is not of type 'array'
+ from schema $id:
http://devicetree.org/schemas/gpio/gpio-consumer.yaml#
/home/andrew/src/
kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb:
timer: 'clocks' does not match any of the regexes: 'pinctrl-[0-9]+'
from schema $id:
http://devicetree.org/schemas/timer/arm,arch_timer.yaml#
/home/andrew/src/
kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb:
sdram at 1e6e0000: compatible: ['aspeed,ast2600-sdram-edac', 'syscon'] is
too long

curr.log 2024-06-26 10:55:56.857034132 +0930 renamed from ref.log 2024-06-26 10:48:23.767078834 +0930 +0 -0
@@ -38,3 +40,17 @@
        from schema $id:

http://devicetree.org/schemas/fsi/aspeed,ast2600-fsi-master.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb:
/ahb/apb/fsi at 1e79b100: failed to match any schema with compatible:
['aspeed,ast2600-fsi-master', 'fsi-master']
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb:
/ahb/apb/dma-controller at 1e79e000: failed to match any schema with
compatible: ['aspeed,ast2600-udma']
+/home/andrew/src/ kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb:
spi-gpio: $nodename:0: 'spi-gpio' does not match '^spi(@.*|-([0-9]|[1-9][0-9]+))?$'

curr.log 2024-06-26 10:55:56.857034132 +0930 renamed from ref.log 2024-06-26 10:48:23.767078834 +0930 +2 -0
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
 
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb

<http://devicetree.org/schemas/spi/spi-gpio.yaml#+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb>:
spi-gpio: gpio-sck: False schema does not allow [[62, 203, 0]]

curr.log 2024-06-26 10:55:56.857034132 +0930 renamed from ref.log 2024-06-26 10:48:23.767078834 +0930 +2 -0
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
 
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb

<http://devicetree.org/schemas/spi/spi-gpio.yaml#+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb>:
spi-gpio: gpio-miso: False schema does not allow [[62, 205, 0]]

curr.log 2024-06-26 10:55:56.857034132 +0930 renamed from ref.log 2024-06-26 10:48:23.767078834 +0930 +2 -0
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
 
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb

<http://devicetree.org/schemas/spi/spi-gpio.yaml#+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb>:
spi-gpio: gpio-mosi: False schema does not allow [[62, 204, 0]]

curr.log 2024-06-26 10:55:56.857034132 +0930 renamed from ref.log 2024-06-26 10:48:23.767078834 +0930 +2 -0
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
 
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb

<http://devicetree.org/schemas/spi/spi-gpio.yaml#+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb>:
spi-gpio: 'sck-gpios' is a required property

curr.log 2024-06-26 10:55:56.857034132 +0930 renamed from ref.log 2024-06-26 10:48:23.767078834 +0930 +2 -0
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
 
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb

<http://devicetree.org/schemas/spi/spi-gpio.yaml#+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb>:
spi-gpio: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'gpio-miso', 'gpio-mosi', 'gpio-sck', 'tpmdev at 0' were unexpected)

curr.log 2024-06-26 10:55:56.857034132 +0930 renamed from ref.log 2024-06-26 10:48:23.767078834 +0930 +2 -0
+       from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
 
+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb

<http://devicetree.org/schemas/spi/spi-gpio.yaml#+/home/andrew/src/kernel.org/linux/origin/build.aspeed_g5/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb>:
tpmdev at 0: $nodename:0: 'tpmdev at 0' does not match '^tpm(@[0-9a-f]+)?$'
+ from schema $id:
http://devicetree.org/schemas/tpm/tcg,tpm_tis-spi.yaml#
```

Quoted 7 lines

Can you please address these and go over the rest of the patches to shore them up against the current bindings?

Thanks,

Andrew

Thanks for your suggestion, I sent a v1 version and the link is below:
https://lore.kernel.org/all/20240626130332.929534-1-yangchen.openbmc at gmail.com/

Please help to review again, thank you!

Thanks,
Yang Chen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20240626/363ce407/attachment-0001.htm>

author
#5 lore raw

PATCH 3/17 ARM: dts: aspeed: minerva: change aliases for uart

In reply to Yang Chen

From: Yang Chen <[email protected]>

Change and add aliases name for uart interface.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +2 -1
index 7d96a3638448..b0643d1d549b 100644
@@ -11,7 +11,8 @@ / {
 	compatible = "facebook,minerva-cmc", "aspeed,ast2600";
 
 	aliases {
-		serial5 = &uart5;
+		serial4 = &uart5;
+		serial5 = &uart6;
 		/*
 		 * PCA9548 (2-0077) provides 8 channels connecting to
 		 * 6 pcs of FCB (Fan Controller Board).
Signature · 1 line
2.34.1
author
#6 lore raw

PATCH 4/17 ARM: dts: aspeed: minerva: add eeprom on i2c bus

In reply to Yang Chen

From: Yang Chen <[email protected]>

Add eeprom on the i2c-9 address 0x50 and i2c-15 address 0x56.

---
 .../boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts    | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +10 -0
index b0643d1d549b..19f609cfd026 100644
@@ -324,6 +324,11 @@ &i2c8 {
 
 &i2c9 {
 	status = "okay";
+
+	eeprom at 50 {
+		compatible = "atmel,24c64";
+		reg = <0x50>;
+	};
 };
 
 &i2c10 {
@@ -360,6 +365,11 @@ eeprom at 50 {
 		compatible = "atmel,24c128";
 		reg = <0x50>;
 	};
+
+	eeprom at 56 {
+		compatible = "atmel,24c64";
+		reg = <0x56>;
+	};
 };
 
 &adc0 {
Signature · 1 line
2.34.1
author
#7 lore raw

PATCH 5/17 ARM: dts: aspeed: minerva: change RTC reference

In reply to Yang Chen

From: Yang Chen <[email protected]>

Change the RTC reference from on-chip to externel on i2c bus 9 and address is 0x51.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +5 -4
index 19f609cfd026..32400284479e 100644
@@ -116,10 +116,6 @@ flash at 1 {
 	};
 };
 
-&rtc {
-	status = "okay";
-};
-
 &sgpiom0 {
 	status = "okay";
 	ngpios = <128>;
@@ -329,6 +325,11 @@ eeprom at 50 {
 		compatible = "atmel,24c64";
 		reg = <0x50>;
 	};
+
+	rtc at 51 {
+		compatible = "nxp,pcf8563";
+		reg = <0x51>;
+	};
 };
 
 &i2c10 {
Signature · 1 line
2.34.1
author
#8 lore raw

PATCH 6/17 ARM: dts: aspeed: minerva: enable mdio3

In reply to Yang Chen

From: Yang Chen <[email protected]>

Change usage of I2C bus 11 to mdio3.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +4 -4
index 32400284479e..4d67ef29023c 100644
@@ -99,6 +99,10 @@ fixed-link {
 	};
 };
 
+&mdio3 {
+	status = "okay";
+};
+
 &fmc {
 	status = "okay";
 	flash at 0 {
@@ -336,10 +340,6 @@ &i2c10 {
 	status = "okay";
 };
 
-&i2c11 {
-	status = "okay";
-};
-
 &i2c12 {
 	status = "okay";
 };
Signature · 1 line
2.34.1
author
#9 lore raw

PATCH 7/17 ARM: dts: aspeed: minerva: remove unused bus and device

In reply to Yang Chen

From: Yang Chen <[email protected]>

Remove unused bus and device.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +0 -4
index 4d67ef29023c..a80c46c1962d 100644
@@ -336,10 +336,6 @@ rtc at 51 {
 	};
 };
 
-&i2c10 {
-	status = "okay";
-};
-
 &i2c12 {
 	status = "okay";
 };
Signature · 1 line
2.34.1
author
#10 lore raw

PATCH 8/17 ARM: dts: aspeed: minerva: Define the LEDs node name

In reply to Yang Chen

From: Yang Chen <[email protected]>

Define the LEDs node name.

---
 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +26 -2
index a80c46c1962d..bea389d1e90b 100644
@@ -46,11 +46,35 @@ iio-hwmon {
 	leds {
 		compatible = "gpio-leds";
 
-		led-fan-fault {
-			label = "led-fan-fault";
+		led-0 {
+			label = "bmc_heartbeat_amber";
+			gpios = <&gpio0 ASPEED_GPIO(P, 7) GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "heartbeat";
+		};
+
+		led-1 {
+			label = "fp_id_amber";
+			default-state = "off";
+			gpios = <&gpio0 ASPEED_GPIO(B, 5) GPIO_ACTIVE_HIGH>;
+		};
+
+		led-2 {
+			label = "power_blue";
+			default-state = "off";
+			gpios = <&gpio0 ASPEED_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
+		};
+
+		led-3 {
+			label = "fan_status_led";
 			gpios = <&leds_gpio 9 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
 		};
+
+		led-4 {
+			label = "fan_fault_led_n";
+			gpios = <&leds_gpio 10 GPIO_ACTIVE_LOW>;
+			default-state = "off";
+		};
 	};
 
 	spi_gpio: spi-gpio {
Signature · 1 line
2.34.1
author
#11 lore raw

PATCH 9/17 ARM: dts: aspeed: minerva: Add adc sensors for fan board

In reply to Yang Chen

From: Yang Chen <[email protected]>

Add ina238 support to read the sensors in front of fans.

---
 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 144 ++++++++++++++++++
 1 file changed, 144 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +144 -0
index bea389d1e90b..60beda2737a1 100644
@@ -228,6 +228,30 @@ pwm at 5e{
 				#address-cells = <1>;
 				#size-cells = <0>;
 			};
+
+			power-sensor at 40 {
+				compatible = "ti,ina238";
+				reg = <0x40>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 41 {
+				compatible = "ti,ina238";
+				reg = <0x41>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 44 {
+				compatible = "ti,ina238";
+				reg = <0x44>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 45 {
+				compatible = "ti,ina238";
+				reg = <0x45>;
+				shunt-resistor = <1000>;
+			};
 		};
 
 		imux17: i2c at 1 {
@@ -246,6 +270,30 @@ pwm at 5e{
 				#address-cells = <1>;
 				#size-cells = <0>;
 			};
+
+			power-sensor at 40 {
+				compatible = "ti,ina238";
+				reg = <0x40>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 41 {
+				compatible = "ti,ina238";
+				reg = <0x41>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 44 {
+				compatible = "ti,ina238";
+				reg = <0x44>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 45 {
+				compatible = "ti,ina238";
+				reg = <0x45>;
+				shunt-resistor = <1000>;
+			};
 		};
 
 		imux18: i2c at 2 {
@@ -264,6 +312,30 @@ pwm at 5e{
 				#address-cells = <1>;
 				#size-cells = <0>;
 			};
+
+			power-sensor at 40 {
+				compatible = "ti,ina238";
+				reg = <0x40>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 41 {
+				compatible = "ti,ina238";
+				reg = <0x41>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 44 {
+				compatible = "ti,ina238";
+				reg = <0x44>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 45 {
+				compatible = "ti,ina238";
+				reg = <0x45>;
+				shunt-resistor = <1000>;
+			};
 		};
 
 		imux19: i2c at 3 {
@@ -282,6 +354,30 @@ pwm at 5e{
 				#address-cells = <1>;
 				#size-cells = <0>;
 			};
+
+			power-sensor at 40 {
+				compatible = "ti,ina238";
+				reg = <0x40>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 41 {
+				compatible = "ti,ina238";
+				reg = <0x41>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 44 {
+				compatible = "ti,ina238";
+				reg = <0x44>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 45 {
+				compatible = "ti,ina238";
+				reg = <0x45>;
+				shunt-resistor = <1000>;
+			};
 		};
 
 		imux20: i2c at 4 {
@@ -300,6 +396,30 @@ pwm at 5e{
 				#address-cells = <1>;
 				#size-cells = <0>;
 			};
+
+			power-sensor at 40 {
+				compatible = "ti,ina238";
+				reg = <0x40>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 41 {
+				compatible = "ti,ina238";
+				reg = <0x41>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 44 {
+				compatible = "ti,ina238";
+				reg = <0x44>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 45 {
+				compatible = "ti,ina238";
+				reg = <0x45>;
+				shunt-resistor = <1000>;
+			};
 		};
 
 		imux21: i2c at 5 {
@@ -318,6 +438,30 @@ pwm at 5e{
 				#address-cells = <1>;
 				#size-cells = <0>;
 			};
+
+			power-sensor at 40 {
+				compatible = "ti,ina238";
+				reg = <0x40>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 41 {
+				compatible = "ti,ina238";
+				reg = <0x41>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 44 {
+				compatible = "ti,ina238";
+				reg = <0x44>;
+				shunt-resistor = <1000>;
+			};
+
+			power-sensor at 45 {
+				compatible = "ti,ina238";
+				reg = <0x45>;
+				shunt-resistor = <1000>;
+			};
 		};
 	};
 };
Signature · 1 line
2.34.1
author
#12 lore raw

PATCH 10/17 ARM: dts: aspeed: minerva: add linename of two pins

In reply to Yang Chen

From: Yang Chen <[email protected]>

Add linename of two pins for power good/control.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +2 -2
index 60beda2737a1..58a083536c79 100644
@@ -578,12 +578,12 @@ &gpio0 {
 	/*N0-N7*/	"","","","","","","","",
 	/*O0-O7*/	"","","","","","","","",
 	/*P0-P7*/	"","","","","","","","",
-	/*Q0-Q7*/	"","","","","","","","",
+	/*Q0-Q7*/	"","","","","","power-chassis-control","","",
 	/*R0-R7*/	"","","","","","","","",
 	/*S0-S7*/	"","","","","","","","",
 	/*T0-T7*/	"","","","","","","","",
 	/*U0-U7*/	"","","","","","","","",
-	/*V0-V7*/	"","","","","BAT_DETECT","","","",
+	/*V0-V7*/	"","","","","BAT_DETECT","","power-chassis-good","",
 	/*W0-W7*/	"","","","","","","","",
 	/*X0-X7*/	"","","BLADE_UART_SEL3","","","","","",
 	/*Y0-Y7*/	"","","","","","","","",
Signature · 1 line
2.34.1
author
#13 lore raw

PATCH 11/17 ARM: dts: aspeed: minerva: enable ehci0 for USB

In reply to Yang Chen

From: Yang Chen <[email protected]>

Enable ehci0 for USB.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +4 -0
index 58a083536c79..830616663387 100644
@@ -552,6 +552,10 @@ &adc1 {
 	pinctrl-0 = <&pinctrl_adc10_default>;
 };
 
+&ehci0 {
+	status = "okay";
+};
+
 &ehci1 {
 	status = "okay";
 };
Signature · 1 line
2.34.1
author
#14 lore raw

PATCH 12/17 ARM: dts: aspeed: minerva: add tmp75 sensor

In reply to Yang Chen

From: Yang Chen <[email protected]>

Add tmp75 sensor on the i2c bus connect to each fan board.

---
 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +28 -0
index 830616663387..7f6df8750953 100644
@@ -252,6 +252,11 @@ power-sensor at 45 {
 				reg = <0x45>;
 				shunt-resistor = <1000>;
 			};
+
+			temperature-sensor at 4b {
+				compatible = "ti,tmp75";
+				reg = <0x4b>;
+			};
 		};
 
 		imux17: i2c at 1 {
@@ -294,6 +299,11 @@ power-sensor at 45 {
 				reg = <0x45>;
 				shunt-resistor = <1000>;
 			};
+
+			temperature-sensor at 4b {
+				compatible = "ti,tmp75";
+				reg = <0x4b>;
+			};
 		};
 
 		imux18: i2c at 2 {
@@ -336,6 +346,11 @@ power-sensor at 45 {
 				reg = <0x45>;
 				shunt-resistor = <1000>;
 			};
+
+			temperature-sensor at 4b {
+				compatible = "ti,tmp75";
+				reg = <0x4b>;
+			};
 		};
 
 		imux19: i2c at 3 {
@@ -378,6 +393,11 @@ power-sensor at 45 {
 				reg = <0x45>;
 				shunt-resistor = <1000>;
 			};
+
+			temperature-sensor at 4b {
+				compatible = "ti,tmp75";
+				reg = <0x4b>;
+			};
 		};
 
 		imux20: i2c at 4 {
@@ -420,6 +440,10 @@ power-sensor at 45 {
 				reg = <0x45>;
 				shunt-resistor = <1000>;
 			};
+			temperature-sensor at 4b {
+				compatible = "ti,tmp75";
+				reg = <0x4b>;
+			};
 		};
 
 		imux21: i2c at 5 {
@@ -462,6 +486,10 @@ power-sensor at 45 {
 				reg = <0x45>;
 				shunt-resistor = <1000>;
 			};
+			temperature-sensor at 4b {
+				compatible = "ti,tmp75";
+				reg = <0x4b>;
+			};
 		};
 	};
 };
Signature · 1 line
2.34.1
author
#15 lore raw

PATCH 13/17 ARM: dts: minerva: add power monitor xdp710

In reply to Yang Chen

From: Yang Chen <[email protected]>

Add HSC xdp710 on i2c bus0.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +5 -0
index 7f6df8750953..dd8240279ed4 100644
@@ -175,6 +175,11 @@ power-monitor at 68 {
 		reg = <0x68>;
 	};
 
+	power-monitor at 43 {
+		compatible = "infineon,xdp710";
+		reg = <0x43>;
+	};
+
 	leds_gpio: gpio at 19 {
 		compatible = "nxp,pca9555";
 		reg = <0x19>;
Signature · 1 line
2.34.1
author
#16 lore raw

PATCH 14/17 ARM: dts: aspeed: minerva: revise sgpio line name

In reply to Yang Chen

From: Yang Chen <[email protected]>

Revise the SGPIO naming to mapping the SGPIO from the CPLD.

---
 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 236 +++++++++---------
 1 file changed, 118 insertions(+), 118 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +118 -118
index dd8240279ed4..ba67422a49b2 100644
@@ -631,118 +631,118 @@ &sgpiom0 {
 	gpio-line-names =
 	/*"input pin","output pin"*/
 	/*A0 - A7*/
-	"PRSNT_MTIA_BLADE0_N","PWREN_MTIA_BLADE0_EN",
-	"PRSNT_MTIA_BLADE1_N","PWREN_MTIA_BLADE1_EN",
-	"PRSNT_MTIA_BLADE2_N","PWREN_MTIA_BLADE2_EN",
-	"PRSNT_MTIA_BLADE3_N","PWREN_MTIA_BLADE3_EN",
-	"PRSNT_MTIA_BLADE4_N","PWREN_MTIA_BLADE4_EN",
-	"PRSNT_MTIA_BLADE5_N","PWREN_MTIA_BLADE5_EN",
-	"PRSNT_MTIA_BLADE6_N","PWREN_MTIA_BLADE6_EN",
-	"PRSNT_MTIA_BLADE7_N","PWREN_MTIA_BLADE7_EN",
+	"PRSNT_MTIA_BLADE0_N","PWREN_MTIA_BLADE0_EN_N",
+	"PRSNT_MTIA_BLADE1_N","PWREN_MTIA_BLADE1_EN_N",
+	"PRSNT_MTIA_BLADE2_N","PWREN_MTIA_BLADE2_EN_N",
+	"PRSNT_MTIA_BLADE3_N","PWREN_MTIA_BLADE3_EN_N",
+	"PRSNT_MTIA_BLADE4_N","PWREN_MTIA_BLADE4_EN_N",
+	"PRSNT_MTIA_BLADE5_N","PWREN_MTIA_BLADE5_EN_N",
+	"PRSNT_MTIA_BLADE6_N","PWREN_MTIA_BLADE6_EN_N",
+	"PRSNT_MTIA_BLADE7_N","PWREN_MTIA_BLADE7_EN_N",
 	/*B0 - B7*/
-	"PRSNT_MTIA_BLADE8_N","PWREN_MTIA_BLADE8_EN",
-	"PRSNT_MTIA_BLADE9_N","PWREN_MTIA_BLADE9_EN",
-	"PRSNT_MTIA_BLADE10_N","PWREN_MTIA_BLADE10_EN",
-	"PRSNT_MTIA_BLADE11_N","PWREN_MTIA_BLADE11_EN",
-	"PRSNT_MTIA_BLADE12_N","PWREN_MTIA_BLADE12_EN",
-	"PRSNT_MTIA_BLADE13_N","PWREN_MTIA_BLADE13_EN",
-	"PRSNT_MTIA_BLADE14_N","PWREN_MTIA_BLADE14_EN",
-	"PRSNT_MTIA_BLADE15_N","PWREN_MTIA_BLADE15_EN",
+	"PRSNT_MTIA_BLADE8_N","PWREN_MTIA_BLADE8_EN_N",
+	"PRSNT_MTIA_BLADE9_N","PWREN_MTIA_BLADE9_EN_N",
+	"PRSNT_MTIA_BLADE10_N","PWREN_MTIA_BLADE10_EN_N",
+	"PRSNT_MTIA_BLADE11_N","PWREN_MTIA_BLADE11_EN_N",
+	"PRSNT_MTIA_BLADE12_N","PWREN_MTIA_BLADE12_EN_N",
+	"PRSNT_MTIA_BLADE13_N","PWREN_MTIA_BLADE13_EN_N",
+	"PRSNT_MTIA_BLADE14_N","PWREN_MTIA_BLADE14_EN_N",
+	"PRSNT_MTIA_BLADE15_N","PWREN_MTIA_BLADE15_EN_N",
 	/*C0 - C7*/
-	"PRSNT_NW_BLADE0_N","PWREN_NW_BLADE0_EN",
-	"PRSNT_NW_BLADE1_N","PWREN_NW_BLADE1_EN",
-	"PRSNT_NW_BLADE2_N","PWREN_NW_BLADE2_EN",
-	"PRSNT_NW_BLADE3_N","PWREN_NW_BLADE3_EN",
-	"PRSNT_NW_BLADE4_N","PWREN_NW_BLADE4_EN",
-	"PRSNT_NW_BLADE5_N","PWREN_NW_BLADE5_EN",
-	"PRSNT_FCB_TOP_0_N","PWREN_MTIA_BLADE0_HSC_EN",
-	"PRSNT_FCB_TOP_1_N","PWREN_MTIA_BLADE1_HSC_EN",
+	"PRSNT_NW_BLADE0_N","PWREN_NW_BLADE0_EN_N",
+	"PRSNT_NW_BLADE1_N","PWREN_NW_BLADE1_EN_N",
+	"PRSNT_NW_BLADE2_N","PWREN_NW_BLADE2_EN_N",
+	"PRSNT_NW_BLADE3_N","PWREN_NW_BLADE3_EN_N",
+	"PRSNT_NW_BLADE4_N","PWREN_NW_BLADE4_EN_N",
+	"PRSNT_NW_BLADE5_N","PWREN_NW_BLADE5_EN_N",
+	"PRSNT_FCB_TOP_0_N","PWREN_MTIA_BLADE0_HSC_EN_N",
+	"PRSNT_FCB_TOP_1_N","PWREN_MTIA_BLADE1_HSC_EN_N",
 	/*D0 - D7*/
-	"PRSNT_FCB_MIDDLE_0_N","PWREN_MTIA_BLADE2_HSC_EN",
-	"PRSNT_FCB_MIDDLE_1_N","PWREN_MTIA_BLADE3_HSC_EN",
-	"PRSNT_FCB_BOTTOM_0_N","PWREN_MTIA_BLADE4_HSC_EN",
-	"PRSNT_FCB_BOTTOM_1_N","PWREN_MTIA_BLADE5_HSC_EN",
-	"PWRGD_MTIA_BLADE0_PWROK_L_BUF","PWREN_MTIA_BLADE6_HSC_EN",
-	"PWRGD_MTIA_BLADE1_PWROK_L_BUF","PWREN_MTIA_BLADE7_HSC_EN",
-	"PWRGD_MTIA_BLADE2_PWROK_L_BUF","PWREN_MTIA_BLADE8_HSC_EN",
-	"PWRGD_MTIA_BLADE3_PWROK_L_BUF","PWREN_MTIA_BLADE9_HSC_EN",
+	"PRSNT_FCB_MIDDLE_0_N","PWREN_MTIA_BLADE2_HSC_EN_N",
+	"PRSNT_FCB_MIDDLE_1_N","PWREN_MTIA_BLADE3_HSC_EN_N",
+	"PRSNT_FCB_BOTTOM_1_N","PWREN_MTIA_BLADE4_HSC_EN_N",
+	"PRSNT_FCB_BOTTOM_0_N","PWREN_MTIA_BLADE5_HSC_EN_N",
+	"PWRGD_MTIA_BLADE0_PWROK_N","PWREN_MTIA_BLADE6_HSC_EN_N",
+	"PWRGD_MTIA_BLADE1_PWROK_N","PWREN_MTIA_BLADE7_HSC_EN_N",
+	"PWRGD_MTIA_BLADE2_PWROK_N","PWREN_MTIA_BLADE8_HSC_EN_N",
+	"PWRGD_MTIA_BLADE3_PWROK_N","PWREN_MTIA_BLADE9_HSC_EN_N",
 	/*E0 - E7*/
-	"PWRGD_MTIA_BLADE4_PWROK_L_BUF","PWREN_MTIA_BLADE10_HSC_EN",
-	"PWRGD_MTIA_BLADE5_PWROK_L_BUF","PWREN_MTIA_BLADE11_HSC_EN",
-	"PWRGD_MTIA_BLADE6_PWROK_L_BUF","PWREN_MTIA_BLADE12_HSC_EN",
-	"PWRGD_MTIA_BLADE7_PWROK_L_BUF","PWREN_MTIA_BLADE13_HSC_EN",
-	"PWRGD_MTIA_BLADE8_PWROK_L_BUF","PWREN_MTIA_BLADE14_HSC_EN",
-	"PWRGD_MTIA_BLADE9_PWROK_L_BUF","PWREN_MTIA_BLADE15_HSC_EN",
-	"PWRGD_MTIA_BLADE10_PWROK_L_BUF","PWREN_NW_BLADE0_HSC_EN",
-	"PWRGD_MTIA_BLADE11_PWROK_L_BUF","PWREN_NW_BLADE1_HSC_EN",
+	"PWRGD_MTIA_BLADE4_PWROK_N","PWREN_MTIA_BLADE10_HSC_EN_N",
+	"PWRGD_MTIA_BLADE5_PWROK_N","PWREN_MTIA_BLADE11_HSC_EN_N",
+	"PWRGD_MTIA_BLADE6_PWROK_N","PWREN_MTIA_BLADE12_HSC_EN_N",
+	"PWRGD_MTIA_BLADE7_PWROK_N","PWREN_MTIA_BLADE13_HSC_EN_N",
+	"PWRGD_MTIA_BLADE8_PWROK_N","PWREN_MTIA_BLADE14_HSC_EN_N",
+	"PWRGD_MTIA_BLADE9_PWROK_N","PWREN_MTIA_BLADE15_HSC_EN_N",
+	"PWRGD_MTIA_BLADE10_PWROK_N","PWREN_NW_BLADE0_HSC_EN_N",
+	"PWRGD_MTIA_BLADE11_PWROK_N","PWREN_NW_BLADE1_HSC_EN_N",
 	/*F0 - F7*/
-	"PWRGD_MTIA_BLADE12_PWROK_L_BUF","PWREN_NW_BLADE2_HSC_EN",
-	"PWRGD_MTIA_BLADE13_PWROK_L_BUF","PWREN_NW_BLADE3_HSC_EN",
-	"PWRGD_MTIA_BLADE14_PWROK_L_BUF","PWREN_NW_BLADE4_HSC_EN",
-	"PWRGD_MTIA_BLADE15_PWROK_L_BUF","PWREN_NW_BLADE5_HSC_EN",
-	"PWRGD_NW_BLADE0_PWROK_L_BUF","PWREN_FCB_TOP_L_EN",
-	"PWRGD_NW_BLADE1_PWROK_L_BUF","PWREN_FCB_TOP_R_EN",
-	"PWRGD_NW_BLADE2_PWROK_L_BUF","PWREN_FCB_MIDDLE_L_EN",
-	"PWRGD_NW_BLADE3_PWROK_L_BUF","PWREN_FCB_MIDDLE_R_EN",
+	"PWRGD_MTIA_BLADE12_PWROK_N","PWREN_NW_BLADE2_HSC_EN_N",
+	"PWRGD_MTIA_BLADE13_PWROK_N","PWREN_NW_BLADE3_HSC_EN_N",
+	"PWRGD_MTIA_BLADE14_PWROK_N","PWREN_NW_BLADE4_HSC_EN_N",
+	"PWRGD_MTIA_BLADE15_PWROK_N","PWREN_NW_BLADE5_HSC_EN_N",
+	"PWRGD_NW_BLADE0_PWROK_N","PWREN_FCB_TOP_0_EN_N",
+	"PWRGD_NW_BLADE1_PWROK_N","PWREN_FCB_TOP_1_EN_N",
+	"PWRGD_NW_BLADE2_PWROK_N","PWREN_FCB_MIDDLE_0_EN_N",
+	"PWRGD_NW_BLADE3_PWROK_N","PWREN_FCB_MIDDLE_1_EN_N",
 	/*G0 - G7*/
-	"PWRGD_NW_BLADE4_PWROK_L_BUF","PWREN_FCB_BOTTOM_L_EN",
-	"PWRGD_NW_BLADE5_PWROK_L_BUF","PWREN_FCB_BOTTOM_R_EN",
-	"PWRGD_FCB_TOP_0_PWROK_L_BUF","FM_CMM_AC_CYCLE_N",
-	"PWRGD_FCB_TOP_1_PWROK_L_BUF","MGMT_SFP_TX_DIS",
-	"PWRGD_FCB_MIDDLE_0_PWROK_L_BUF","",
-	"PWRGD_FCB_MIDDLE_1_PWROK_L_BUF","RST_I2CRST_MTIA_BLADE0_1_N",
-	"PWRGD_FCB_BOTTOM_0_PWROK_L_BUF","RST_I2CRST_MTIA_BLADE2_3_N",
-	"PWRGD_FCB_BOTTOM_1_PWROK_L_BUF","RST_I2CRST_MTIA_BLADE4_5_N",
+	"PWRGD_NW_BLADE4_PWROK_N","PWREN_FCB_BOTTOM_1_EN_N",
+	"PWRGD_NW_BLADE5_PWROK_N","PWREN_FCB_BOTTOM_0_EN_N",
+	"PWRGD_FCB_TOP_0_PWROK_N","FM_CMM_AC_CYCLE_N",
+	"PWRGD_FCB_TOP_1_PWROK_N","MGMT_SFP_TX_DIS",
+	"PWRGD_FCB_MIDDLE_0_PWROK_N","FM_MDIO_SW_SEL",
+	"PWRGD_FCB_MIDDLE_1_PWROK_N","FM_P24V_SMPWR_EN",
+	"PWRGD_FCB_BOTTOM_1_PWROK_N","",
+	"PWRGD_FCB_BOTTOM_0_PWROK_N","",
 	/*H0 - H7*/
-	"LEAK_DETECT_MTIA_BLADE0_N_BUF","RST_I2CRST_MTIA_BLADE6_7_N",
-	"LEAK_DETECT_MTIA_BLADE1_N_BUF","RST_I2CRST_MTIA_BLADE8_9_N",
-	"LEAK_DETECT_MTIA_BLADE2_N_BUF","RST_I2CRST_MTIA_BLADE10_11_N",
-	"LEAK_DETECT_MTIA_BLADE3_N_BUF","RST_I2CRST_MTIA_BLADE12_13_N",
-	"LEAK_DETECT_MTIA_BLADE4_N_BUF","RST_I2CRST_MTIA_BLADE14_15_N",
-	"LEAK_DETECT_MTIA_BLADE5_N_BUF","RST_I2CRST_NW_BLADE0_1_2_N",
-	"LEAK_DETECT_MTIA_BLADE6_N_BUF","RST_I2CRST_NW_BLADE3_4_5_N",
-	"LEAK_DETECT_MTIA_BLADE7_N_BUF","RST_I2CRST_FCB_N",
+	"LEAK_DETECT_MTIA_BLADE0_N","",
+	"LEAK_DETECT_MTIA_BLADE1_N","",
+	"LEAK_DETECT_MTIA_BLADE2_N","",
+	"LEAK_DETECT_MTIA_BLADE3_N","",
+	"LEAK_DETECT_MTIA_BLADE4_N","",
+	"LEAK_DETECT_MTIA_BLADE5_N","",
+	"LEAK_DETECT_MTIA_BLADE6_N","",
+	"LEAK_DETECT_MTIA_BLADE7_N","",
 	/*I0 - I7*/
-	"LEAK_DETECT_MTIA_BLADE8_N_BUF","RST_I2CRST_FCB_B_L_N",
-	"LEAK_DETECT_MTIA_BLADE9_N_BUF","RST_I2CRST_FCB_B_R_N",
-	"LEAK_DETECT_MTIA_BLADE10_N_BUF","RST_I2CRST_FCB_M_L_N",
-	"LEAK_DETECT_MTIA_BLADE11_N_BUF","RST_I2CRST_FCB_M_R_N",
-	"LEAK_DETECT_MTIA_BLADE12_N_BUF","RST_I2CRST_FCB_T_L_N",
-	"LEAK_DETECT_MTIA_BLADE13_N_BUF","RST_I2CRST_FCB_T_R_N",
-	"LEAK_DETECT_MTIA_BLADE14_N_BUF","BMC_READY",
-	"LEAK_DETECT_MTIA_BLADE15_N_BUF","wFM_88E6393X_BIN_UPDATE_EN_N",
+	"LEAK_DETECT_MTIA_BLADE8_N","RST_I2CRST_FCB_BOTTOM_1_N",
+	"LEAK_DETECT_MTIA_BLADE9_N","RST_I2CRST_FCB_BOTTOM_0_N",
+	"LEAK_DETECT_MTIA_BLADE10_N","RST_I2CRST_FCB_MIDDLE_0_N",
+	"LEAK_DETECT_MTIA_BLADE11_N","RST_I2CRST_FCB_MIDDLE_1_N",
+	"LEAK_DETECT_MTIA_BLADE12_N","RST_I2CRST_FCB_TOP_0_N",
+	"LEAK_DETECT_MTIA_BLADE13_N","RST_I2CRST_FCB_TOP_1_N",
+	"LEAK_DETECT_MTIA_BLADE14_N","BMC_READY",
+	"LEAK_DETECT_MTIA_BLADE15_N","FM_88E6393X_BIN_UPDATE_EN_N",
 	/*J0 - J7*/
-	"LEAK_DETECT_NW_BLADE0_N_BUF","WATER_VALVE_CLOSED_N",
-	"LEAK_DETECT_NW_BLADE1_N_BUF","",
-	"LEAK_DETECT_NW_BLADE2_N_BUF","",
-	"LEAK_DETECT_NW_BLADE3_N_BUF","",
-	"LEAK_DETECT_NW_BLADE4_N_BUF","",
-	"LEAK_DETECT_NW_BLADE5_N_BUF","",
-	"MTIA_BLADE0_STATUS_LED","",
-	"MTIA_BLADE1_STATUS_LED","",
+	"LEAK_DETECT_NW_BLADE0_N","WATER_VALVE_CLOSED_N",
+	"LEAK_DETECT_NW_BLADE1_N","",
+	"LEAK_DETECT_NW_BLADE2_N","",
+	"LEAK_DETECT_NW_BLADE3_N","",
+	"LEAK_DETECT_NW_BLADE4_N","",
+	"LEAK_DETECT_NW_BLADE5_N","",
+	"PWRGD_MTIA_BLADE0_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE1_HSC_PWROK_N","",
 	/*K0 - K7*/
-	"MTIA_BLADE2_STATUS_LED","",
-	"MTIA_BLADE3_STATUS_LED","",
-	"MTIA_BLADE4_STATUS_LED","",
-	"MTIA_BLADE5_STATUS_LED","",
-	"MTIA_BLADE6_STATUS_LED","",
-	"MTIA_BLADE7_STATUS_LED","",
-	"MTIA_BLADE8_STATUS_LED","",
-	"MTIA_BLADE9_STATUS_LED","",
+	"PWRGD_MTIA_BLADE2_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE3_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE4_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE5_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE6_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE7_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE8_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE9_HSC_PWROK_N","",
 	/*L0 - L7*/
-	"MTIA_BLADE10_STATUS_LED","",
-	"MTIA_BLADE11_STATUS_LED","",
-	"MTIA_BLADE12_STATUS_LED","",
-	"MTIA_BLADE13_STATUS_LED","",
-	"MTIA_BLADE14_STATUS_LED","",
-	"MTIA_BLADE15_STATUS_LED","",
-	"NW_BLADE0_STATUS_LED","",
-	"NW_BLADE1_STATUS_LED","",
+	"PWRGD_MTIA_BLADE10_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE11_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE12_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE13_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE14_HSC_PWROK_N","",
+	"PWRGD_MTIA_BLADE15_HSC_PWROK_N","",
+	"PWRGD_NW_BLADE0_HSC_PWROK_N","",
+	"PWRGD_NW_BLADE1_HSC_PWROK_N","",
 	/*M0 - M7*/
-	"NW_BLADE2_STATUS_LED","",
-	"NW_BLADE3_STATUS_LED","",
-	"NW_BLADE4_STATUS_LED","",
-	"NW_BLADE5_STATUS_LED","",
+	"PWRGD_NW_BLADE2_HSC_PWROK_N","",
+	"PWRGD_NW_BLADE3_HSC_PWROK_N","",
+	"PWRGD_NW_BLADE4_HSC_PWROK_N","",
+	"PWRGD_NW_BLADE5_HSC_PWROK_N","",
 	"RPU_READY","",
 	"IT_GEAR_RPU_LINK_N","",
 	"IT_GEAR_LEAK","",
@@ -750,28 +750,28 @@ &sgpiom0 {
 	/*N0 - N7*/
 	"VALVE_STS0","",
 	"VALVE_STS1","",
-	"VALVE_STS2","",
-	"VALVE_STS3","",
-	"CR_TOGGLE_BOOT_BUF_N","",
-	"CMM_LC_RDY_LED_N","",
-	"CMM_LC_UNRDY_LED_N","",
+	"PCA9555_IRQ0_N","",
+	"PCA9555_IRQ1_N","",
+	"CR_TOGGLE_BOOT_N","",
+	"IRQ_FCB_TOP0_N","",
+	"IRQ_FCB_TOP1_N","",
 	"CMM_CABLE_CARTRIDGE_PRSNT_BOT_N","",
 	/*O0 - O7*/
 	"CMM_CABLE_CARTRIDGE_PRSNT_TOP_N","",
 	"BOT_BCB_CABLE_PRSNT_N","",
 	"TOP_BCB_CABLE_PRSNT_N","",
-	"CHASSIS0_LEAK_Q_N","",
-	"CHASSIS1_LEAK_Q_N","",
-	"LEAK0_DETECT","",
-	"LEAK1_DETECT","",
-	"MGMT_SFP_PRSNT_N","",
+	"IRQ_FCB_MID0_N","",
+	"IRQ_FCB_MID1_N","",
+	"CHASSIS_LEAK0_DETECT_N","",
+	"CHASSIS_LEAK1_DETECT_N","",
+	"VALVE_RMON_A_1","",
 	/*P0 - P7*/
-	"MGMT_SFP_TX_FAULT","",
-	"MGMT_SFP_RX_LOS","",
-	"","",
-	"","",
-	"","",
-	"","",
-	"","",
-	"","";
+	"VALVE_RMON_A_2","",
+	"VALVE_RMON_B_1","",
+	"VALVE_RMON_B_2","",
+	"RPU_READY_SPARE","",
+	"IT_GEAR_LEAK_SPARE","",
+	"IT_GEAR_RPU_LINK_SPARE_N","",
+	"IRQ_FCB_BOT0_N","",
+	"IRQ_FCB_BOT0_N","";
 };
Signature · 1 line
2.34.1
author
#17 lore raw

PATCH 15/17 ARM: dts: aspeed: minerva: Switch the i2c bus number

In reply to Yang Chen

From: Yang Chen <[email protected]>

Switch the i2c bus number to map the i2c tag according to the hardware design.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +2 -2
index ba67422a49b2..8dd2bbb15576 100644
@@ -405,7 +405,7 @@ temperature-sensor at 4b {
 			};
 		};
 
-		imux20: i2c at 4 {
+		imux20: i2c at 5 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <4>;
@@ -451,7 +451,7 @@ temperature-sensor at 4b {
 			};
 		};
 
-		imux21: i2c at 5 {
+		imux21: i2c at 4 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <5>;
Signature · 1 line
2.34.1
author
#18 lore raw

PATCH 16/17 ARM: dts: aspeed: minerva: remove unused power device

In reply to Yang Chen

Remove unused power device.

---
 .../boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts    | 10 ----------
 1 file changed, 10 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +0 -10
index 8dd2bbb15576..288d4ba06b99 100644
@@ -165,16 +165,6 @@ power-monitor at 41 {
 		shunt-resistor = <1000>;
 	};
 
-	power-monitor at 67 {
-		compatible = "adi,ltc2945";
-		reg = <0x67>;
-	};
-
-	power-monitor at 68 {
-		compatible = "adi,ltc2945";
-		reg = <0x68>;
-	};
-
 	power-monitor at 43 {
 		compatible = "infineon,xdp710";
 		reg = <0x43>;
Signature · 1 line
2.34.1
author
#19 lore raw

PATCH 17/17 ARM: dts: aspeed: minerva: add ltc4287 device

In reply to Yang Chen

Enable LTC4287 device on i2c-0.

---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +6 -0
index 288d4ba06b99..896e84cd03de 100644
@@ -165,6 +165,12 @@ power-monitor at 41 {
 		shunt-resistor = <1000>;
 	};
 
+	power-monitor at 44 {
+		compatible = "lltc,ltc4287";
+		reg = <0x44>;
+		shunt-resistor-micro-ohms = <2000>;
+	};
+
 	power-monitor at 43 {
 		compatible = "infineon,xdp710";
 		reg = <0x43>;
Signature · 1 line
2.34.1
#20 lore raw
In reply to Yang Chen
Quoted 22 lines · Yang Chen

Revise the Linux device tree entry related to Facebook platform Minerva specific devices connected to the Aspeed AST2600 BMC.

Yang Chen (17):
ARM: dts: aspeed: minerva: change the address of tmp75
ARM: dts: aspeed: minerva: Add spi-gpio
ARM: dts: aspeed: minerva: change aliases for uart
ARM: dts: aspeed: minerva: add eeprom on i2c bus
ARM: dts: aspeed: minerva: change RTC reference
ARM: dts: aspeed: minerva: enable mdio3
ARM: dts: aspeed: minerva: remove unused bus and device
ARM: dts: aspeed: minerva: Define the LEDs node name
ARM: dts: aspeed: minerva: Add adc sensors for fan board
ARM: dts: aspeed: minerva: add linename of two pins
ARM: dts: aspeed: minerva: enable ehci0 for USB
ARM: dts: aspeed: minerva: add tmp75 sensor
ARM: dts: minerva: add power monitor xdp710
ARM: dts: aspeed: minerva: revise sgpio line name
ARM: dts: aspeed: minerva: Switch the i2c bus number
ARM: dts: aspeed: minerva: remove unused power device
ARM: dts: aspeed: minerva: add ltc4287 device

Quoted 8 lines
 .../aspeed/aspeed-bmc-facebook-minerva.dts    | 516 +++++++++++++-----
 1 file changed, 373 insertions(+), 143 deletions(-)

--
2.34.1

My bot found new DTB warnings on the .dts files added or changed in this series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date:

  pip3 install dtschema --upgrade

New warnings running 'make CHECK_DTBS=y aspeed/aspeed-bmc-facebook-minerva.dtb' for 20240625121835.751013-1-yangchen.openbmc at gmail.com:

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: /: spi-gpio: {'status': ['okay'], 'compatible': ['spi-gpio'], '#address-cells': 1, '#size-cells': 0, 'gpio-sck': [61, 203, 0], 'gpio-mosi': [61, 204, 0], 'gpio-miso': [61, 205, 0], 'num-chipselects': 1, 'cs-gpios': [[61, 200, 1]], 'tpmdev at 0': {'compatible': ['infineon,slb9670', 'tcg,tpm_tis-spi'], 'spi-max-frequency': 33000000, 'reg': [[0]]}} is not of type 'array'
from schema $id: http://devicetree.org/schemas/gpio/gpio-consumer.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: $nodename:0: 'spi-gpio' does not match '^spi(@.*|-([0-9]|[1-9][0-9]+))?$'
from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: gpio-sck: False schema does not allow [61, 203, 0]
from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: gpio-miso: False schema does not allow [61, 205, 0]
from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: gpio-mosi: False schema does not allow [61, 204, 0]
from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: 'sck-gpios' is a required property
from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: spi-gpio: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'gpio-miso', 'gpio-mosi', 'gpio-sck', 'tpmdev at 0' were unexpected)
from schema $id: http://devicetree.org/schemas/spi/spi-gpio.yaml#
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dtb: tpmdev at 0: $nodename:0: 'tpmdev at 0' does not match '^tpm(@[0-9a-f]+)?$'
from schema $id: http://devicetree.org/schemas/tpm/tcg,tpm_tis-spi.yaml#