From: Zev Weiss <zweiss@equinix.com>
To: Joel Stanley <joel@jms.id.au>
Cc: "openbmc@lists.ozlabs.org" <openbmc@lists.ozlabs.org>,
"eajames@linux.ibm.com" <eajames@linux.ibm.com>
Subject: Re: [PATCH u-boot v2019.04-aspeed-openbmc] ARM: dts: Rename Rainier to P10 BMC
Date: Thu, 2 Jun 2022 06:22:41 +0000 [thread overview]
Message-ID: <20220602062241.GN11809@packtop> (raw)
In-Reply-To: <20220602025030.90710-1-joel@jms.id.au>
On Wed, Jun 01, 2022 at 07:50:29PM PDT, Joel Stanley wrote:
>The Rainier device tree is used for all IBM P10 BMCs, which includes
>both Rainier and Everest.
>
>Signed-off-by: Joel Stanley <joel@jms.id.au>
>---
> arch/arm/dts/Makefile | 2 +-
> arch/arm/dts/{ast2600-rainier.dts => ast2600-p10bmc.dts} | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
> rename arch/arm/dts/{ast2600-rainier.dts => ast2600-p10bmc.dts} (93%)
>
>diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>index 3515100c65ce..8d05d1e70310 100755
>--- a/arch/arm/dts/Makefile
>+++ b/arch/arm/dts/Makefile
>@@ -686,7 +686,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
> ast2600-intel.dtb \
> ast2600-ncsi.dtb \
> ast2600-pfr.dtb \
>- ast2600-rainier.dtb \
>+ ast2600-p10bmc.dtb \
Nit: to preserve the sorted order, should p10bmc be before pfr? (s6q is
before slt, anyway.)
> ast2600-s6q.dtb \
> ast2600-slt.dtb \
> ast2600-tacoma.dtb
>diff --git a/arch/arm/dts/ast2600-rainier.dts b/arch/arm/dts/ast2600-p10bmc.dts
>similarity index 93%
>rename from arch/arm/dts/ast2600-rainier.dts
>rename to arch/arm/dts/ast2600-p10bmc.dts
>index aa91b12ed399..d1d78d5c3545 100755
>--- a/arch/arm/dts/ast2600-rainier.dts
>+++ b/arch/arm/dts/ast2600-p10bmc.dts
>@@ -5,8 +5,8 @@
> #include "ast2600-u-boot.dtsi"
>
> / {
>- model = "Rainier";
>- compatible = "ibm,rainier-bmc", "aspeed,ast2600";
>+ model = "IBM P10 BMC";
>+ compatible = "ibm,everest-bmc", "ibm,rainier-bmc", "ibm,p10bmc", "aspeed,ast2600";
It's a bit orthogonal to the rest of the patch, but I notice these lines
are space indented instead of tabbed...could maybe fold that fixup into
this, but it looks like that happened on a bunch of the ast2x00 dts
files in commit ba6ce66262865, so a separate patch to fix them all might
be better.
>
> memory { device_type = "memory";
>-- 2.35.1
>
next prev parent reply other threads:[~2022-06-02 6:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-02 2:50 [PATCH u-boot v2019.04-aspeed-openbmc] ARM: dts: Rename Rainier to P10 BMC Joel Stanley
2022-06-02 6:22 ` Zev Weiss [this message]
2022-06-05 23:58 ` Joel Stanley
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=20220602062241.GN11809@packtop \
--to=zweiss@equinix.com \
--cc=eajames@linux.ibm.com \
--cc=joel@jms.id.au \
--cc=openbmc@lists.ozlabs.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.