[PATCH linux dev-6.0 0/2] ARM: dts: aspeed: bletchley: Update Bletchley devicetree

[PATCH linux dev-6.0 0/2] ARM: dts: aspeed: bletchley: Update Bletchley devicetree

[Potin Lai]

Update Bletchley BMC devicetree.

Potin Lai (2):
  ARM: dts: aspeed: bletchley: rename flash1 label
  ARM: dts: aspeed: bletchley: enable wdtrst1

 arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

-- 
2.31.1

[PATCH linux dev-6.0 1/2] ARM: dts: aspeed: bletchley: rename flash1 label

[Potin Lai]

In OpenBMC, phosphor-software-manager use "alt-bmc" for secondary falsh
label.
Rename flash1 label to "alt-bmc" to support dual image feature inOpenBMC.

Signed-off-by: Potin Lai <potin.lai.pt@gmail.com>
---
 arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
index a619eec70633..791f83aaac50 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
@@ -307,7 +307,7 @@ flash@0 {
 	flash@1 {
 		status = "okay";
 		m25p,fast-read;
-		label = "flash1";
+		label = "alt-bmc";
 		spi-max-frequency = <50000000>;
 	};
 };
-- 
2.31.1

[PATCH linux dev-6.0 2/2] ARM: dts: aspeed: bletchley: enable wdtrst1

[Potin Lai]

Enable WDTRST1 external signal to send a reset pluse to peripherals while
BMC reset.

Signed-off-by: Potin Lai <potin.lai.pt@gmail.com>
---
 arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
index 791f83aaac50..050ed7e810fa 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
@@ -1064,3 +1064,14 @@ pinctrl_gpiov2_unbiased_default: gpiov2 {
 		bias-disable;
 	};
 };
+
+&wdt1 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_wdtrst1_default>;
+	aspeed,reset-type = "soc";
+	aspeed,external-signal;
+	aspeed,ext-push-pull;
+	aspeed,ext-active-high;
+	aspeed,ext-pulse-duration = <256>;
+};
-- 
2.31.1

Re: [PATCH linux dev-6.0 1/2] ARM: dts: aspeed: bletchley: rename flash1 label

[Joel Stanley]

On Mon, 26 Dec 2022 at 05:53, Potin Lai <potin.lai.pt@gmail.com> wrote:
>
> In OpenBMC, phosphor-software-manager use "alt-bmc" for secondary falsh
> label.
> Rename flash1 label to "alt-bmc" to support dual image feature inOpenBMC.
>
> Signed-off-by: Potin Lai <potin.lai.pt@gmail.com>

These two are in 6.1 so you're good to go.

Cheers,

Joel

> ---
>  arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
> index a619eec70633..791f83aaac50 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts
> @@ -307,7 +307,7 @@ flash@0 {
>         flash@1 {
>                 status = "okay";
>                 m25p,fast-read;
> -               label = "flash1";
> +               label = "alt-bmc";
>                 spi-max-frequency = <50000000>;
>         };
>  };
> --
> 2.31.1
>