[PATCH] ARM: dts: aspeed: yosemite4: adjust secondary flash name

[PATCH] ARM: dts: aspeed: yosemite4: adjust secondary flash name

[Patrick Williams]

Meta (Facebook) has a preference for all of our secondary flash
chips to be labelled "alt-bmc" for consistency of userspace tools
deal with updates.  Bletchley, Harma, Minerva, and Catalina all
follow this convention but for some reason Yosemite4 is different.

Adjust the label in the dts to match the other platforms.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
---
 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index 98477792aa00..e20816d9e077 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -112,7 +112,7 @@ flash@0 {
 	flash@1 {
 		status = "okay";
 		m25p,fast-read;
-		label = "bmc2";
+		label = "alt-bmc";
 		spi-rx-bus-width = <4>;
 		spi-max-frequency = <50000000>;
 	};
-- 
2.44.2

Re: [PATCH] ARM: dts: aspeed: yosemite4: adjust secondary flash name

[Andrew Jeffery]

Hi Patrick,

On Wed, 2024-12-18 at 16:24 -0500, Patrick Williams wrote:
> Meta (Facebook) has a preference for all of our secondary flash
> chips to be labelled "alt-bmc" for consistency of userspace tools
> deal with updates.  Bletchley, Harma, Minerva, and Catalina all
> follow this convention but for some reason Yosemite4 is different.
> 
> Adjust the label in the dts to match the other platforms.
> 
> Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
> ---
>  arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-
> yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-
> yosemite4.dts
> index 98477792aa00..e20816d9e077 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
> @@ -112,7 +112,7 @@ flash@0 {
>         flash@1 {
>                 status = "okay";
>                 m25p,fast-read;
> -               label = "bmc2";
> +               label = "alt-bmc";
>                 spi-rx-bus-width = <4>;
>                 spi-max-frequency = <50000000>;
>         };

I'm hitting conflicts (?) when I apply this on top of[1]. Do you mind
rebasing it?

[1]: https://github.com/amboar/linux/tree/for/bmc/aspeed/dt

Andrew

Re: [PATCH] ARM: dts: aspeed: yosemite4: adjust secondary flash name

[Patrick Williams]

[-- Attachment #1: Type: text/plain, Size: 758 bytes --]

On Tue, Jan 07, 2025 at 03:44:04PM +1030, Andrew Jeffery wrote:
> 
> >                 status = "okay";
> >                 m25p,fast-read;
> > -               label = "bmc2";
> > +               label = "alt-bmc";
> >                 spi-rx-bus-width = <4>;
> >                 spi-max-frequency = <50000000>;
> >         };
> 
> I'm hitting conflicts (?) when I apply this on top of[1]. Do you mind
> rebasing it?
> 
> [1]: https://github.com/amboar/linux/tree/for/bmc/aspeed/dt

Sure.  It looks like someone elsewhere changed the spi-rx-bus-width
which is causing the conflict.  I'll resent a rebase.

I'd like this backported to the openbmc tree also.  Not sure which
version is best for that tree right now.

-- 
Patrick Williams

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] ARM: dts: aspeed: yosemite4: adjust secondary flash name

[Andrew Jeffery]

On Tue, 2025-01-07 at 11:24 -0500, Patrick Williams wrote:
> On Tue, Jan 07, 2025 at 03:44:04PM +1030, Andrew Jeffery wrote:
> > 
> > >                 status = "okay";
> > >                 m25p,fast-read;
> > > -               label = "bmc2";
> > > +               label = "alt-bmc";
> > >                 spi-rx-bus-width = <4>;
> > >                 spi-max-frequency = <50000000>;
> > >         };
> > 
> > I'm hitting conflicts (?) when I apply this on top of[1]. Do you
> > mind
> > rebasing it?
> > 
> > [1]: https://github.com/amboar/linux/tree/for/bmc/aspeed/dt
> 
> Sure.  It looks like someone elsewhere changed the spi-rx-bus-width
> which is causing the conflict.  I'll resent a rebase.
> 
> I'd like this backported to the openbmc tree also.  Not sure which
> version is best for that tree right now.
> 

I've applied the rebased patch to both (the backport didn't conflict).

Andrew