mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v3 0/2] Revise Meta(Facebook) Harma BMC(AST2600)
@ 2024-09-09  8:04 Peter Yin
  2024-09-09  8:04 ` [PATCH v3 1/2] ARM: dts: aspeed: Harma: add rtc device Peter Yin
  2024-09-09  8:04 ` [PATCH v3 2/2] ARM: dts: aspeed: Harma: revise sgpio line name Peter Yin
  0 siblings, 2 replies; 4+ messages in thread
From: Peter Yin @ 2024-09-09  8:04 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/799dbd97b09693fba6f837e73d4ef3421d604a8a.camel@codeconstruct.com.au/

v2->v3
  - Revise sgpio line name.

v1->v2
  - Fixed the mail and author.
  - Revise presence-cmm to sgpio.

v1
  - Patch 0001 - add rtc device
  - Patch 0002 - update sgpio line name


Peter Yin (2):
  ARM: dts: aspeed: Harma: add rtc device
  ARM: dts: aspeed: Harma: revise sgpio line name

 .../dts/aspeed/aspeed-bmc-facebook-harma.dts  | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v3 1/2] ARM: dts: aspeed: Harma: add rtc device
  2024-09-09  8:04 [PATCH v3 0/2] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
@ 2024-09-09  8:04 ` Peter Yin
  2024-09-09  8:04 ` [PATCH v3 2/2] ARM: dts: aspeed: Harma: revise sgpio line name Peter Yin
  1 sibling, 0 replies; 4+ messages in thread
From: Peter Yin @ 2024-09-09  8:04 UTC (permalink / raw)
  To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
	Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
	linux-kernel

Add "nxp,pcf8563" device and the slave address is 0x51.

Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 cf3f807a38fe..92068c65eae4 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -135,10 +135,6 @@ &mac3 {
 	use-ncsi;
 };
 
-&rtc {
-	status = "okay";
-};
-
 &fmc {
 	status = "okay";
 
@@ -506,6 +502,11 @@ imux31: i2c@3 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <3>;
+
+			rtc@51 {
+				compatible = "nxp,pcf8563";
+				reg = <0x51>;
+			};
 		};
 	};
 };
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v3 2/2] ARM: dts: aspeed: Harma: revise sgpio line name
  2024-09-09  8:04 [PATCH v3 0/2] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
  2024-09-09  8:04 ` [PATCH v3 1/2] ARM: dts: aspeed: Harma: add rtc device Peter Yin
@ 2024-09-09  8:04 ` Peter Yin
  2024-09-12  2:53   ` Andrew Jeffery
  1 sibling, 1 reply; 4+ messages in thread
From: Peter Yin @ 2024-09-09  8:04 UTC (permalink / raw)
  To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
	Andrew Jeffery, devicetree, linux-arm-kernel, linux-aspeed,
	linux-kernel

power-card-enable
power-fault-n
power-hsc-good
power-chassis-good

asic0-card-type-detection0-n
asic0-card-type-detection1-n
asic0-card-type-detection2-n
presence-cmm

uart-switch-button
uart-switch-lsb
uart-switch-msb

reset-control-cmos-clear

Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
 .../dts/aspeed/aspeed-bmc-facebook-harma.dts  | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 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 92068c65eae4..9cb511a846e3 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -393,12 +393,6 @@ gpio@31 {
 		reg = <0x31>;
 		gpio-controller;
 		#gpio-cells = <2>;
-
-		gpio-line-names =
-		"","","","",
-		"","","presence-cmm","",
-		"","","","",
-		"","","","";
 	};
 
 	// PTTV FRU
@@ -422,12 +416,6 @@ gpio@31 {
 		reg = <0x31>;
 		gpio-controller;
 		#gpio-cells = <2>;
-
-		gpio-line-names =
-		"","","","",
-		"","","presence-cmm","",
-		"","","","",
-		"","","","";
 	};
 
 	// Aegis FRU
@@ -566,7 +554,7 @@ &gpio0 {
 	/*B0-B7*/	"","","","",
 			"bmc-spi-mux-select-0","led-identify","","",
 	/*C0-C7*/	"reset-cause-platrst","","","","",
-			"cpu0-err-alert","","",
+			"power-hsc-good","power-chassis-good","",
 	/*D0-D7*/	"","","sol-uart-select","","","","","",
 	/*E0-E7*/	"","","","","","","","",
 	/*F0-F7*/	"","","","","","","","",
@@ -585,14 +573,16 @@ &gpio0 {
 	/*O0-O7*/	"","","","","","","","",
 	/*P0-P7*/	"power-button","power-host-control",
 			"reset-button","","led-power","","","",
-	/*Q0-Q7*/	"","","","","","power-chassis-control","","",
+	/*Q0-Q7*/
+			"","","","",
+			"","power-chassis-control","","uart-switch-button",
 	/*R0-R7*/	"","","","","","","","",
 	/*S0-S7*/	"","","","","","","","",
 	/*T0-T7*/	"","","","","","","","",
 	/*U0-U7*/	"","","","","","","led-identify-gate","",
 	/*V0-V7*/	"","","","",
 			"rtc-battery-voltage-read-enable","",
-			"power-chassis-good","",
+			"","",
 	/*W0-W7*/	"","","","","","","","",
 	/*X0-X7*/	"","","","","","","","",
 	/*Y0-Y7*/	"","","","","","","","",
@@ -673,7 +663,7 @@ &sgpiom0 {
 	"presence-asic-modules-0","rt-cpu0-p1-force-enable",
 	"presence-asic-modules-1","bios-debug-msg-disable",
 	"","uart-control-buffer-select",
-	"","ac-control-n",
+	"presence-cmm","ac-control-n",
 	/*G0-G3 line 96-103*/
 	"FM_CPU_CORETYPE2","",
 	"FM_CPU_CORETYPE1","",
@@ -685,7 +675,7 @@ &sgpiom0 {
 	"FM_BOARD_REV_ID2","",
 	"FM_BOARD_REV_ID1","",
 	/*H0-H3 line 112-119*/
-	"FM_BOARD_REV_ID0","",
+	"FM_BOARD_REV_ID0","reset-control-cmos-clear",
 	"","","","","","",
 	/*H4-H7 line 120-127*/
 	"","",
@@ -700,7 +690,7 @@ &sgpiom0 {
 	/*I4-I7 line 136-143*/
 	"","","","","","","","",
 	/*J0-J3 line 144-151*/
-	"","","","","","","","",
+	"","","power-card-enable","","","","","",
 	/*J4-J7 line 152-159*/
 	"SLOT_ID_BCB_0","",
 	"SLOT_ID_BCB_1","",
@@ -716,9 +706,15 @@ &sgpiom0 {
 	"cpu0-thermtrip-alert","",
 	"reset-cause-pcie","",
 	/*L4-L7 line 184-191*/
-	"pvdd11-ocp-alert","","","","","","","",
+	"pvdd11-ocp-alert","",
+	"power-fault-n","",
+	"asic0-card-type-detection0-n","",
+	"asic0-card-type-detection1-n","",
 	/*M0-M3 line 192-199*/
-	"","","","","","","","",
+	"asic0-card-type-detection2-n","",
+	"uart-switch-lsb","",
+	"uart-switch-msb","",
+	"","",
 	/*M4-M7 line 200-207*/
 	"","","","","","","","",
 	/*N0-N3 line 208-215*/
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v3 2/2] ARM: dts: aspeed: Harma: revise sgpio line name
  2024-09-09  8:04 ` [PATCH v3 2/2] ARM: dts: aspeed: Harma: revise sgpio line name Peter Yin
@ 2024-09-12  2:53   ` Andrew Jeffery
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Jeffery @ 2024-09-12  2:53 UTC (permalink / raw)
  To: Peter Yin, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Joel Stanley, devicetree, linux-arm-kernel, linux-aspeed,
	linux-kernel

On Mon, 2024-09-09 at 16:04 +0800, Peter Yin wrote:
> power-card-enable
> power-fault-n
> power-hsc-good
> power-chassis-good
> 
> asic0-card-type-detection0-n
> asic0-card-type-detection1-n
> asic0-card-type-detection2-n
> presence-cmm
> 
> uart-switch-button
> uart-switch-lsb
> uart-switch-msb
> 
> reset-control-cmos-clear

Can you please try to be more descriptive in the future? However, for
now, I've applied the series to be picked up through the BMC tree.

Andrew

> 
> Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
> ---
>  .../dts/aspeed/aspeed-bmc-facebook-harma.dts  | 36 +++++++++----------
>  1 file changed, 16 insertions(+), 20 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 92068c65eae4..9cb511a846e3 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
> @@ -393,12 +393,6 @@ gpio@31 {
>  		reg = <0x31>;
>  		gpio-controller;
>  		#gpio-cells = <2>;
> -
> -		gpio-line-names =
> -		"","","","",
> -		"","","presence-cmm","",
> -		"","","","",
> -		"","","","";
>  	};
>  
>  	// PTTV FRU
> @@ -422,12 +416,6 @@ gpio@31 {
>  		reg = <0x31>;
>  		gpio-controller;
>  		#gpio-cells = <2>;
> -
> -		gpio-line-names =
> -		"","","","",
> -		"","","presence-cmm","",
> -		"","","","",
> -		"","","","";
>  	};
>  
>  	// Aegis FRU
> @@ -566,7 +554,7 @@ &gpio0 {
>  	/*B0-B7*/	"","","","",
>  			"bmc-spi-mux-select-0","led-identify","","",
>  	/*C0-C7*/	"reset-cause-platrst","","","","",
> -			"cpu0-err-alert","","",
> +			"power-hsc-good","power-chassis-good","",
>  	/*D0-D7*/	"","","sol-uart-select","","","","","",
>  	/*E0-E7*/	"","","","","","","","",
>  	/*F0-F7*/	"","","","","","","","",
> @@ -585,14 +573,16 @@ &gpio0 {
>  	/*O0-O7*/	"","","","","","","","",
>  	/*P0-P7*/	"power-button","power-host-control",
>  			"reset-button","","led-power","","","",
> -	/*Q0-Q7*/	"","","","","","power-chassis-control","","",
> +	/*Q0-Q7*/
> +			"","","","",
> +			"","power-chassis-control","","uart-switch-button",
>  	/*R0-R7*/	"","","","","","","","",
>  	/*S0-S7*/	"","","","","","","","",
>  	/*T0-T7*/	"","","","","","","","",
>  	/*U0-U7*/	"","","","","","","led-identify-gate","",
>  	/*V0-V7*/	"","","","",
>  			"rtc-battery-voltage-read-enable","",
> -			"power-chassis-good","",
> +			"","",
>  	/*W0-W7*/	"","","","","","","","",
>  	/*X0-X7*/	"","","","","","","","",
>  	/*Y0-Y7*/	"","","","","","","","",
> @@ -673,7 +663,7 @@ &sgpiom0 {
>  	"presence-asic-modules-0","rt-cpu0-p1-force-enable",
>  	"presence-asic-modules-1","bios-debug-msg-disable",
>  	"","uart-control-buffer-select",
> -	"","ac-control-n",
> +	"presence-cmm","ac-control-n",
>  	/*G0-G3 line 96-103*/
>  	"FM_CPU_CORETYPE2","",
>  	"FM_CPU_CORETYPE1","",
> @@ -685,7 +675,7 @@ &sgpiom0 {
>  	"FM_BOARD_REV_ID2","",
>  	"FM_BOARD_REV_ID1","",
>  	/*H0-H3 line 112-119*/
> -	"FM_BOARD_REV_ID0","",
> +	"FM_BOARD_REV_ID0","reset-control-cmos-clear",
>  	"","","","","","",
>  	/*H4-H7 line 120-127*/
>  	"","",
> @@ -700,7 +690,7 @@ &sgpiom0 {
>  	/*I4-I7 line 136-143*/
>  	"","","","","","","","",
>  	/*J0-J3 line 144-151*/
> -	"","","","","","","","",
> +	"","","power-card-enable","","","","","",
>  	/*J4-J7 line 152-159*/
>  	"SLOT_ID_BCB_0","",
>  	"SLOT_ID_BCB_1","",
> @@ -716,9 +706,15 @@ &sgpiom0 {
>  	"cpu0-thermtrip-alert","",
>  	"reset-cause-pcie","",
>  	/*L4-L7 line 184-191*/
> -	"pvdd11-ocp-alert","","","","","","","",
> +	"pvdd11-ocp-alert","",
> +	"power-fault-n","",
> +	"asic0-card-type-detection0-n","",
> +	"asic0-card-type-detection1-n","",
>  	/*M0-M3 line 192-199*/
> -	"","","","","","","","",
> +	"asic0-card-type-detection2-n","",
> +	"uart-switch-lsb","",
> +	"uart-switch-msb","",
> +	"","",
>  	/*M4-M7 line 200-207*/
>  	"","","","","","","","",
>  	/*N0-N3 line 208-215*/


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-09-12  2:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-09  8:04 [PATCH v3 0/2] Revise Meta(Facebook) Harma BMC(AST2600) Peter Yin
2024-09-09  8:04 ` [PATCH v3 1/2] ARM: dts: aspeed: Harma: add rtc device Peter Yin
2024-09-09  8:04 ` [PATCH v3 2/2] ARM: dts: aspeed: Harma: revise sgpio line name Peter Yin
2024-09-12  2:53   ` Andrew Jeffery

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®