diff mbox series

ARM: dts: aspeed: g220a: Enable secondary flash

Message ID 20211210093623.2140640-1-yulei.sh@bytedance.com
State New
Headers show
Series ARM: dts: aspeed: g220a: Enable secondary flash | expand

Commit Message

Lei Yu Dec. 10, 2021, 9:36 a.m. UTC
Enable the secondary flash of the g220a's BMC and the wdt2.

Signed-off-by: Lei YU <yulei.sh@bytedance.com>
---
 arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Joel Stanley Dec. 22, 2021, 1:37 a.m. UTC | #1
Hi Lei,

On Fri, 10 Dec 2021 at 09:36, Lei YU <yulei.sh@bytedance.com> wrote:
>
> Enable the secondary flash of the g220a's BMC and the wdt2.
>
> Signed-off-by: Lei YU <yulei.sh@bytedance.com>

I've applied this and the layout patch for v5.17, and to the openbmc tree.

> ---
>  arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
> index 01dace8f5e5f..05f392f42960 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
> @@ -260,6 +260,13 @@ flash@0 {
>                 spi-max-frequency = <50000000>;
>  #include "openbmc-flash-layout-64.dtsi"
>         };
> +       flash@1 {
> +               status = "okay";
> +               label = "alt-bmc";
> +               m25p,fast-read;
> +               spi-max-frequency = <50000000>;
> +#include "openbmc-flash-layout-64-alt.dtsi"
> +       };
>  };
>
>  &spi1 {
> @@ -278,6 +285,10 @@ &adc {
>         status = "okay";
>  };
>
> +&wdt2 {
> +       aspeed,alt-boot;
> +};
> +
>  &gpio {
>         status = "okay";
>         gpio-line-names =
> --
> 2.25.1
>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
index 01dace8f5e5f..05f392f42960 100644
--- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
@@ -260,6 +260,13 @@  flash@0 {
 		spi-max-frequency = <50000000>;
 #include "openbmc-flash-layout-64.dtsi"
 	};
+	flash@1 {
+		status = "okay";
+		label = "alt-bmc";
+		m25p,fast-read;
+		spi-max-frequency = <50000000>;
+#include "openbmc-flash-layout-64-alt.dtsi"
+	};
 };
 
 &spi1 {
@@ -278,6 +285,10 @@  &adc {
 	status = "okay";
 };
 
+&wdt2 {
+	aspeed,alt-boot;
+};
+
 &gpio {
 	status = "okay";
 	gpio-line-names =