diff mbox series

[u-boot,v2019.04-aspeed-openbmc,v2,1/2] ARM: dts: Rename Rainier to P10 BMC

Message ID 20220606000434.1399583-2-joel@jms.id.au
State New
Headers show
Series Rename Rainier to P10 BMC | expand

Commit Message

Joel Stanley June 6, 2022, 12:04 a.m. UTC
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>
--
v2: Preserve sort order in makefile

 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%)

Comments

Eddie James June 6, 2022, 1:32 p.m. UTC | #1
On 6/5/22 19:04, Joel Stanley wrote:
> The Rainier device tree is used for all IBM P10 BMCs, which includes
> both Rainier and Everest.


Reviewed-by: Eddie James <eajames@linux.ibm.com>


>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> --
> v2: Preserve sort order in makefile
>
>   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..8f876a0aa0d7 100755
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -685,8 +685,8 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
>   	ast2600-fpga.dtb \
>   	ast2600-intel.dtb \
>   	ast2600-ncsi.dtb \
> +	ast2600-p10bmc.dtb \
>   	ast2600-pfr.dtb \
> -	ast2600-rainier.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";
Zev Weiss June 6, 2022, 8:09 p.m. UTC | #2
On Sun, Jun 05, 2022 at 05:04:33PM 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>
>--
>v2: Preserve sort order in makefile
>
> 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%)
>

Reviewed-by: Zev Weiss <zweiss@equinix.com>
diff mbox series

Patch

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 3515100c65ce..8f876a0aa0d7 100755
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -685,8 +685,8 @@  dtb-$(CONFIG_ARCH_ASPEED) += \
 	ast2600-fpga.dtb \
 	ast2600-intel.dtb \
 	ast2600-ncsi.dtb \
+	ast2600-p10bmc.dtb \
 	ast2600-pfr.dtb \
-	ast2600-rainier.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";