From: Patrick Williams <patrick@stwcx.xyz>
To: Andrew Jeffery <andrew@codeconstruct.com.au>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>, Joel Stanley <joel@jms.id.au>
Subject: Re: [PATCH] ARM: dts: aspeed: yosemite4: adjust secondary flash name
Date: Tue, 7 Jan 2025 11:24:37 -0500 [thread overview]
Message-ID: <Z31VRZg2LTd36S4n@heinlein> (raw)
In-Reply-To: <e3279e0c41259f165a0cde0195b196f416ac566a.camel@codeconstruct.com.au>
[-- 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 --]
next prev parent reply other threads:[~2025-01-07 16:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-18 21:24 [PATCH] ARM: dts: aspeed: yosemite4: adjust secondary flash name Patrick Williams
2025-01-07 5:14 ` Andrew Jeffery
2025-01-07 16:24 ` Patrick Williams [this message]
2025-01-08 0:30 ` Andrew Jeffery
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z31VRZg2LTd36S4n@heinlein \
--to=patrick@stwcx.xyz \
--cc=andrew@codeconstruct.com.au \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=joel@jms.id.au \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.