| Message ID | 20220602025030.90710-1-joel@jms.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | [u-boot,v2019.04-aspeed-openbmc] ARM: dts: Rename Rainier to P10 BMC | expand |
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 >
On Thu, 2 Jun 2022 at 06:22, Zev Weiss <zweiss@equinix.com> wrote: > > 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.) Yep > > > 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. Thanks for pointing that out. I'll send a patch. > > > > > memory { device_type = "memory"; > >-- 2.35.1 > >
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 \ 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"; memory { device_type = "memory";
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%)