* [PATCH u-boot v2019.04-aspeed-openbmc v3 1/2] ARM: dts: Rename Rainier to P10 BMC
2022-06-06 23:08 [PATCH u-boot v2019.04-aspeed-openbmc v3 0/2] Rename Rainier to P10 BMC Joel Stanley
@ 2022-06-06 23:09 ` Joel Stanley
2022-06-06 23:09 ` [PATCH u-boot v2019.04-aspeed-openbmc v3 2/2] ARM: dts: ast2600: Fix indentation Joel Stanley
1 sibling, 0 replies; 4+ messages in thread
From: Joel Stanley @ 2022-06-06 23:09 UTC (permalink / raw)
To: openbmc, eajames, Zev Weiss
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>
Reviewed-by: Zev Weiss <zweiss@equinix.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
--
v3: Add r-b
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";
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH u-boot v2019.04-aspeed-openbmc v3 2/2] ARM: dts: ast2600: Fix indentation
2022-06-06 23:08 [PATCH u-boot v2019.04-aspeed-openbmc v3 0/2] Rename Rainier to P10 BMC Joel Stanley
2022-06-06 23:09 ` [PATCH u-boot v2019.04-aspeed-openbmc v3 1/2] ARM: dts: " Joel Stanley
@ 2022-06-06 23:09 ` Joel Stanley
2022-06-06 23:29 ` Zev Weiss
1 sibling, 1 reply; 4+ messages in thread
From: Joel Stanley @ 2022-06-06 23:09 UTC (permalink / raw)
To: openbmc, eajames, Zev Weiss
These lines were mistakenly added with space indentation instead of
tabs.
Fixes: ba6ce6626286 ("aspeed: Add machine names")
Reported-by: Zev Weiss <zweiss@equinix.com>
Reviewed-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
v3: Also fix ast2400-evb, ast2500-evb, ast2600a0-evb and ast2600a1-evb
arch/arm/dts/ast2400-evb.dts | 4 ++--
arch/arm/dts/ast2500-evb.dts | 4 ++--
arch/arm/dts/ast2600-evb.dts | 4 ++--
arch/arm/dts/ast2600-fpga.dts | 4 ++--
arch/arm/dts/ast2600-ncsi.dts | 4 ++--
arch/arm/dts/ast2600-p10bmc.dts | 4 ++--
arch/arm/dts/ast2600-tacoma.dts | 4 ++--
arch/arm/dts/ast2600a0-evb.dts | 4 ++--
arch/arm/dts/ast2600a1-evb.dts | 4 ++--
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/arm/dts/ast2400-evb.dts b/arch/arm/dts/ast2400-evb.dts
index 2ba15d17deda..96a73c32d4e3 100644
--- a/arch/arm/dts/ast2400-evb.dts
+++ b/arch/arm/dts/ast2400-evb.dts
@@ -3,8 +3,8 @@
#include "ast2400-u-boot.dtsi"
/ {
- model = "AST2400 EVB";
- compatible = "aspeed,ast2400-evb", "aspeed,ast2400";
+ model = "AST2400 EVB";
+ compatible = "aspeed,ast2400-evb", "aspeed,ast2400";
memory {
device_type = "memory";
diff --git a/arch/arm/dts/ast2500-evb.dts b/arch/arm/dts/ast2500-evb.dts
index f668eec5c137..1dcad9ed76b9 100644
--- a/arch/arm/dts/ast2500-evb.dts
+++ b/arch/arm/dts/ast2500-evb.dts
@@ -3,8 +3,8 @@
#include "ast2500-u-boot.dtsi"
/ {
- model = "AST2500 EVB";
- compatible = "aspeed,ast2500-evb", "aspeed,ast2500";
+ model = "AST2500 EVB";
+ compatible = "aspeed,ast2500-evb", "aspeed,ast2500";
memory {
device_type = "memory";
diff --git a/arch/arm/dts/ast2600-evb.dts b/arch/arm/dts/ast2600-evb.dts
index 3aeef78df22d..515afa83af69 100644
--- a/arch/arm/dts/ast2600-evb.dts
+++ b/arch/arm/dts/ast2600-evb.dts
@@ -3,8 +3,8 @@
#include "ast2600-u-boot.dtsi"
/ {
- model = "AST2600 EVB";
- compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
+ model = "AST2600 EVB";
+ compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
memory {
device_type = "memory";
diff --git a/arch/arm/dts/ast2600-fpga.dts b/arch/arm/dts/ast2600-fpga.dts
index be0788d92473..069a41185597 100644
--- a/arch/arm/dts/ast2600-fpga.dts
+++ b/arch/arm/dts/ast2600-fpga.dts
@@ -3,8 +3,8 @@
#include "ast2600-u-boot.dtsi"
/ {
- model = "AST2600 FPGA";
- compatible = "aspeed,ast2600-fpga", "aspeed,ast2600";
+ model = "AST2600 FPGA";
+ compatible = "aspeed,ast2600-fpga", "aspeed,ast2600";
memory {
device_type = "memory";
diff --git a/arch/arm/dts/ast2600-ncsi.dts b/arch/arm/dts/ast2600-ncsi.dts
index f55294cdf95e..dbe888a945e3 100644
--- a/arch/arm/dts/ast2600-ncsi.dts
+++ b/arch/arm/dts/ast2600-ncsi.dts
@@ -3,8 +3,8 @@
#include "ast2600-u-boot.dtsi"
/ {
- model = "AST2600 EVB w/ NCSI";
- compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
+ model = "AST2600 EVB w/ NCSI";
+ compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
memory {
device_type = "memory";
diff --git a/arch/arm/dts/ast2600-p10bmc.dts b/arch/arm/dts/ast2600-p10bmc.dts
index d1d78d5c3545..aa9edcd66507 100755
--- a/arch/arm/dts/ast2600-p10bmc.dts
+++ b/arch/arm/dts/ast2600-p10bmc.dts
@@ -5,8 +5,8 @@
#include "ast2600-u-boot.dtsi"
/ {
- model = "IBM P10 BMC";
- compatible = "ibm,everest-bmc", "ibm,rainier-bmc", "ibm,p10bmc", "aspeed,ast2600";
+ model = "IBM P10 BMC";
+ compatible = "ibm,everest-bmc", "ibm,rainier-bmc", "ibm,p10bmc", "aspeed,ast2600";
memory {
device_type = "memory";
diff --git a/arch/arm/dts/ast2600-tacoma.dts b/arch/arm/dts/ast2600-tacoma.dts
index 67b3e3013c6b..76f987052140 100755
--- a/arch/arm/dts/ast2600-tacoma.dts
+++ b/arch/arm/dts/ast2600-tacoma.dts
@@ -5,8 +5,8 @@
#include "ast2600-u-boot.dtsi"
/ {
- model = "Tacoma";
- compatible = "ibm,tacoma-bmc", "aspeed,ast2600";
+ model = "Tacoma";
+ compatible = "ibm,tacoma-bmc", "aspeed,ast2600";
memory {
device_type = "memory";
diff --git a/arch/arm/dts/ast2600a0-evb.dts b/arch/arm/dts/ast2600a0-evb.dts
index b242215536a5..859808a10d7a 100644
--- a/arch/arm/dts/ast2600a0-evb.dts
+++ b/arch/arm/dts/ast2600a0-evb.dts
@@ -3,8 +3,8 @@
#include "ast2600-u-boot.dtsi"
/ {
- model = "AST2600 EVB";
- compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
+ model = "AST2600 EVB";
+ compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
memory {
device_type = "memory";
diff --git a/arch/arm/dts/ast2600a1-evb.dts b/arch/arm/dts/ast2600a1-evb.dts
index 6bd498d471e2..a5576a004f2d 100644
--- a/arch/arm/dts/ast2600a1-evb.dts
+++ b/arch/arm/dts/ast2600a1-evb.dts
@@ -3,8 +3,8 @@
#include "ast2600-u-boot.dtsi"
/ {
- model = "AST2600 EVB";
- compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
+ model = "AST2600 EVB";
+ compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
memory {
device_type = "memory";
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread