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

[Andrew Jeffery <andrew@codeconstruct.com.au>]

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