[PATCH v1 0/4] Revise Meta(Facebook) Harma BMC(AST2600)

[PATCH v1 0/4] Revise Meta(Facebook) Harma BMC(AST2600)

[Peter Yin]

Summary:
Revise linux device tree entry related to Meta(Facebook) Harma
specific devices connected to BMC(AST2600) SoC.

follow-up: https://lore.kernel.org/all/3a65d568540e9ca43d3bfc24cfe5f72d2bb12b3b.camel@codeconstruct.com.au/

v1
  - Patch 0001 - add new line between the child nodes
  - Patch 0002 - use power-monitor instead of power-sensor
  - Patch 0003 - dd sq52206 power monitor device
  - Patch 0004 - dd retimer sgpio

Base: tags/v6.17-rc3-39-g07d9df80082b

Peter Yin (4):
  ARM: dts: aspeed: harma: add new line between the child nodes
  ARM: dts: aspeed: harma: use power-monitor instead of power-sensor
  ARM: dts: aspeed: harma: add sq52206 power monitor device
  ARM: dts: aspeed: harma: add retimer sgpio

 .../dts/aspeed/aspeed-bmc-facebook-harma.dts  | 59 +++++++++++--------
 1 file changed, 36 insertions(+), 23 deletions(-)

-- 
2.43.0

[PATCH v1 1/4] ARM: dts: aspeed: harma: add new line between the child nodes

[Peter Yin]

Add new line between the child nodes of imux28 to match DTS
style.

Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 6 ++++++
 1 file changed, 6 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 23eaf47a38e8..41ae86180534 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -524,26 +524,32 @@ power-sensor@20 {
 				compatible = "mps,mp5990";
 				reg = <0x20>;
 			};
+
 			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>;
-- 
2.43.0

[PATCH v1 2/4] ARM: dts: aspeed: harma: use power-monitor instead of power-sensor

[Peter Yin]

Revise the node name from "power-sensor" to "power-monitor"
in the Harma device tree to follow Device Tree naming convention.

Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
 .../dts/aspeed/aspeed-bmc-facebook-harma.dts  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 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 41ae86180534..bcef91e6eb54 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -190,25 +190,25 @@ pwm@5e{
 		#size-cells = <0>;
 	};
 
-	power-sensor@40 {
+	power-monitor@40 {
 		compatible = "ti,ina238";
 		reg = <0x40>;
 		shunt-resistor = <1000>;
 	};
 
-	power-sensor@41 {
+	power-monitor@41 {
 		compatible = "ti,ina238";
 		reg = <0x41>;
 		shunt-resistor = <1000>;
 	};
 
-	power-sensor@44 {
+	power-monitor@44 {
 		compatible = "ti,ina238";
 		reg = <0x44>;
 		shunt-resistor = <1000>;
 	};
 
-	power-sensor@45 {
+	power-monitor@45 {
 		compatible = "ti,ina238";
 		reg = <0x45>;
 		shunt-resistor = <1000>;
@@ -264,25 +264,25 @@ pwm@5e{
 		#size-cells = <0>;
 	};
 
-	power-sensor@40 {
+	power-monitor@40 {
 		compatible = "ti,ina238";
 		reg = <0x40>;
 		shunt-resistor = <1000>;
 	};
 
-	power-sensor@41 {
+	power-monitor@41 {
 		compatible = "ti,ina238";
 		reg = <0x41>;
 		shunt-resistor = <1000>;
 	};
 
-	power-sensor@44 {
+	power-monitor@44 {
 		compatible = "ti,ina238";
 		reg = <0x44>;
 		shunt-resistor = <1000>;
 	};
 
-	power-sensor@45 {
+	power-monitor@45 {
 		compatible = "ti,ina238";
 		reg = <0x45>;
 		shunt-resistor = <1000>;
@@ -374,7 +374,7 @@ power-monitor@40 {
 		reg = <0x40>;
 	};
 
-	power-sensor@45 {
+	power-monitor@45 {
 		compatible = "ti,ina238";
 		reg = <0x45>;
 		shunt-resistor = <500>;
@@ -520,7 +520,7 @@ imux28: i2c@0 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0>;
-			power-sensor@20 {
+			power-monitor@20 {
 				compatible = "mps,mp5990";
 				reg = <0x20>;
 			};
-- 
2.43.0

[PATCH v1 3/4] ARM: dts: aspeed: harma: add sq52206 power monitor device

[Peter Yin]

Add the SQ52206 power monitor device and reorder the sequence.

Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
 .../dts/aspeed/aspeed-bmc-facebook-harma.dts  | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 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 bcef91e6eb54..fe72d47a7632 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -353,14 +353,15 @@ eeprom@52 {
 		reg = <0x52>;
 	};
 
-	power-monitor@69 {
-		compatible = "pmbus";
-		reg = <0x69>;
+	power-monitor@40 {
+		compatible = "infineon,xdp710";
+		reg = <0x40>;
 	};
 
-	temperature-sensor@49 {
-		compatible = "ti,tmp75";
-		reg = <0x49>;
+	power-monitor@41 {
+		compatible = "silergy,sq52206";
+		reg = <0x41>;
+		shunt-resistor = <500>;
 	};
 
 	power-monitor@44 {
@@ -369,16 +370,21 @@ power-monitor@44 {
 		shunt-resistor-micro-ohms = <250>;
 	};
 
-	power-monitor@40 {
-		compatible = "infineon,xdp710";
-		reg = <0x40>;
-	};
-
 	power-monitor@45 {
 		compatible = "ti,ina238";
 		reg = <0x45>;
 		shunt-resistor = <500>;
 	};
+
+	power-monitor@69 {
+		compatible = "pmbus";
+		reg = <0x69>;
+	};
+
+	temperature-sensor@49 {
+		compatible = "ti,tmp75";
+		reg = <0x49>;
+	};
 };
 
 &i2c5 {
-- 
2.43.0

Re: [PATCH v1 3/4] ARM: dts: aspeed: harma: add sq52206 power monitor device

[Andrew Jeffery]

On Wed, 2025-09-17 at 18:18 +0800, Peter Yin wrote:
> Add the SQ52206 power monitor device and reorder the sequence.
> 
> Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
> ---
>  .../dts/aspeed/aspeed-bmc-facebook-harma.dts  | 28 +++++++++++------
> --
>  1 file changed, 17 insertions(+), 11 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 bcef91e6eb54..fe72d47a7632 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> @@ -353,14 +353,15 @@ eeprom@52 {
>  		reg = <0x52>;
>  	};
>  
> -	power-monitor@69 {
> -		compatible = "pmbus";
> -		reg = <0x69>;
> +	power-monitor@40 {
> +		compatible = "infineon,xdp710";
> +		reg = <0x40>;
>  	};
>  
> -	temperature-sensor@49 {
> -		compatible = "ti,tmp75";
> -		reg = <0x49>;
> +	power-monitor@41 {
> +		compatible = "silergy,sq52206";
> +		reg = <0x41>;
> +		shunt-resistor = <500>;
>  	};
>  
>  	power-monitor@44 {
> @@ -369,16 +370,21 @@ power-monitor@44 {
>  		shunt-resistor-micro-ohms = <250>;
>  	};
>  
> -	power-monitor@40 {
> -		compatible = "infineon,xdp710";
> -		reg = <0x40>;
> -	};
> -
>  	power-monitor@45 {
>  		compatible = "ti,ina238";
>  		reg = <0x45>;
>  		shunt-resistor = <500>;
>  	};
> +
> +	power-monitor@69 {
> +		compatible = "pmbus";

I realise you're just moving this node, but I'm surprised it hasn't
caused trouble otherwise. This happens to work due to a quirk of I2C
device IDs in the kernel but it's not a documented compatible.

Compatible strings need to represent the physical device. Can you
please split out a patch either dropping this node, or replacing the
compatible string with something appropriate?

Andrew

Re: [PATCH v1 3/4] ARM: dts: aspeed: harma: add sq52206 power monitor device

[Peter Yin]

Andrew Jeffery <andrew@codeconstruct.com.au> 於 2025年9月22日 週一 上午11:36寫道：
>
> On Wed, 2025-09-17 at 18:18 +0800, Peter Yin wrote:
> > Add the SQ52206 power monitor device and reorder the sequence.
> >
> > Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
> > ---
> >  .../dts/aspeed/aspeed-bmc-facebook-harma.dts  | 28 +++++++++++------
> > --
> >  1 file changed, 17 insertions(+), 11 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 bcef91e6eb54..fe72d47a7632 100644
> > --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> > +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> > @@ -353,14 +353,15 @@ eeprom@52 {
> >               reg = <0x52>;
> >       };
> >
> > -     power-monitor@69 {
> > -             compatible = "pmbus";
> > -             reg = <0x69>;
> > +     power-monitor@40 {
> > +             compatible = "infineon,xdp710";
> > +             reg = <0x40>;
> >       };
> >
> > -     temperature-sensor@49 {
> > -             compatible = "ti,tmp75";
> > -             reg = <0x49>;
> > +     power-monitor@41 {
> > +             compatible = "silergy,sq52206";
> > +             reg = <0x41>;
> > +             shunt-resistor = <500>;
> >       };
> >
> >       power-monitor@44 {
> > @@ -369,16 +370,21 @@ power-monitor@44 {
> >               shunt-resistor-micro-ohms = <250>;
> >       };
> >
> > -     power-monitor@40 {
> > -             compatible = "infineon,xdp710";
> > -             reg = <0x40>;
> > -     };
> > -
> >       power-monitor@45 {
> >               compatible = "ti,ina238";
> >               reg = <0x45>;
> >               shunt-resistor = <500>;
> >       };
> > +
> > +     power-monitor@69 {
> > +             compatible = "pmbus";
>
> I realise you're just moving this node, but I'm surprised it hasn't
> caused trouble otherwise. This happens to work due to a quirk of I2C
> device IDs in the kernel but it's not a documented compatible.
>
> Compatible strings need to represent the physical device. Can you
> please split out a patch either dropping this node, or replacing the
> compatible string with something appropriate?
>
> Andrew

Ok, but this device BMR350 is not in the pmbus_id[] list.
I will add BMR350 to the pmbus_id[] list, and then fix the DTS
compatible string.

[PATCH v1 4/4] ARM: dts: aspeed: harma: add retimer sgpio

[Peter Yin]

Add irq-retimer0-0v9-alert and irq-retimer1-0v9-alert
for power fail monitor.

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 fe72d47a7632..37b5e2614a9a 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -828,9 +828,10 @@ &sgpiom0 {
 	"","",
 	"irq-pvddcore0-ocp-alert","",
 	"irq-pvddcore1-ocp-alert","",
-	"","",
+	"irq-retimer0-0v9-alert","",
 	/*O4-O7 line 232-239*/
-	"","","","","","","","",
+	"irq-retimer1-0v9-alert","",
+	"","","","","","",
 	/*P0-P3 line 240-247*/
 	"","","","","","","","",
 	/*P4-P7 line 248-255*/
-- 
2.43.0

Re: [PATCH v1 0/4] Revise Meta(Facebook) Harma BMC(AST2600)

[Andrew Jeffery]

Hi Peter,

On Wed, 2025-09-17 at 18:18 +0800, Peter Yin wrote:
> Summary:
> Revise linux device tree entry related to Meta(Facebook) Harma
> specific devices connected to BMC(AST2600) SoC.
> 
> follow-up:
> https://lore.kernel.org/all/3a65d568540e9ca43d3bfc24cfe5f72d2bb12b3b.camel@codeconstruct.com.au/
> 
> v1
>   - Patch 0001 - add new line between the child nodes
>   - Patch 0002 - use power-monitor instead of power-sensor
>   - Patch 0003 - dd sq52206 power monitor device
>   - Patch 0004 - dd retimer sgpio
> 
> Base: tags/v6.17-rc3-39-g07d9df80082b

Can you please rebase this on the aspeed/arm/dt branch of

https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git

Patch 2/4 fails to apply.

Cheers,

Andrew

Re: [PATCH v1 0/4] Revise Meta(Facebook) Harma BMC(AST2600)

[Peter Yin]

Andrew Jeffery <andrew@codeconstruct.com.au> 於 2025年9月22日 週一 上午11:31寫道：
>
> Hi Peter,
>
> On Wed, 2025-09-17 at 18:18 +0800, Peter Yin wrote:
> > Summary:
> > Revise linux device tree entry related to Meta(Facebook) Harma
> > specific devices connected to BMC(AST2600) SoC.
> >
> > follow-up:
> > https://lore.kernel.org/all/3a65d568540e9ca43d3bfc24cfe5f72d2bb12b3b.camel@codeconstruct.com.au/
> >
> > v1
> >   - Patch 0001 - add new line between the child nodes
> >   - Patch 0002 - use power-monitor instead of power-sensor
> >   - Patch 0003 - dd sq52206 power monitor device
> >   - Patch 0004 - dd retimer sgpio
> >
> > Base: tags/v6.17-rc3-39-g07d9df80082b
>
> Can you please rebase this on the aspeed/arm/dt branch of
>
> https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git
>
> Patch 2/4 fails to apply.
>
> Cheers,
>
> Andrew

I will fix it in the next version.