* [PATCH u-boot v2019.04-aspeed-openbmc v2 0/2] Rename Rainier to P10 BMC
@ 2022-06-06 0:04 Joel Stanley
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 1/2] ARM: dts: " Joel Stanley
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation Joel Stanley
0 siblings, 2 replies; 8+ messages in thread
From: Joel Stanley @ 2022-06-06 0:04 UTC (permalink / raw)
To: zweiss, eajames, openbmc
Joel Stanley (2):
ARM: dts: Rename Rainier to P10 BMC
ARM: dts: ast2600: Fix indentation
arch/arm/dts/Makefile | 2 +-
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-rainier.dts => ast2600-p10bmc.dts} | 4 ++--
arch/arm/dts/ast2600-tacoma.dts | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
rename arch/arm/dts/{ast2600-rainier.dts => ast2600-p10bmc.dts} (94%)
--
2.35.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH u-boot v2019.04-aspeed-openbmc v2 1/2] ARM: dts: Rename Rainier to P10 BMC
2022-06-06 0:04 [PATCH u-boot v2019.04-aspeed-openbmc v2 0/2] Rename Rainier to P10 BMC Joel Stanley
@ 2022-06-06 0:04 ` Joel Stanley
2022-06-06 13:32 ` Eddie James
2022-06-06 20:09 ` Zev Weiss
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation Joel Stanley
1 sibling, 2 replies; 8+ messages in thread
From: Joel Stanley @ 2022-06-06 0:04 UTC (permalink / raw)
To: zweiss, eajames, openbmc
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%)
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] 8+ messages in thread
* [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation
2022-06-06 0:04 [PATCH u-boot v2019.04-aspeed-openbmc v2 0/2] Rename Rainier to P10 BMC Joel Stanley
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 1/2] ARM: dts: " Joel Stanley
@ 2022-06-06 0:04 ` Joel Stanley
2022-06-06 13:32 ` Eddie James
2022-06-06 20:06 ` Zev Weiss
1 sibling, 2 replies; 8+ messages in thread
From: Joel Stanley @ 2022-06-06 0:04 UTC (permalink / raw)
To: zweiss, eajames, openbmc
These lines were mistakenly added with space indentation instead of
tabs.
Fixes: ba6ce6626286 ("aspeed: Add machine names")
Reported-by: Zev Weiss <zweiss@equinix.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
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 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
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";
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH u-boot v2019.04-aspeed-openbmc v2 1/2] ARM: dts: Rename Rainier to P10 BMC
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 1/2] ARM: dts: " Joel Stanley
@ 2022-06-06 13:32 ` Eddie James
2022-06-06 20:09 ` Zev Weiss
1 sibling, 0 replies; 8+ messages in thread
From: Eddie James @ 2022-06-06 13:32 UTC (permalink / raw)
To: Joel Stanley, zweiss, openbmc
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";
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation Joel Stanley
@ 2022-06-06 13:32 ` Eddie James
2022-06-06 20:06 ` Zev Weiss
1 sibling, 0 replies; 8+ messages in thread
From: Eddie James @ 2022-06-06 13:32 UTC (permalink / raw)
To: Joel Stanley, zweiss, openbmc
On 6/5/22 19:04, Joel Stanley wrote:
> These lines were mistakenly added with space indentation instead of
> tabs.
Reviewed-by: Eddie James <eajames@linux.ibm.com>
>
> Fixes: ba6ce6626286 ("aspeed: Add machine names")
> Reported-by: Zev Weiss <zweiss@equinix.com>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
> 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 ++--
> 5 files changed, 10 insertions(+), 10 deletions(-)
>
> 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";
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation Joel Stanley
2022-06-06 13:32 ` Eddie James
@ 2022-06-06 20:06 ` Zev Weiss
2022-06-06 23:01 ` Joel Stanley
1 sibling, 1 reply; 8+ messages in thread
From: Zev Weiss @ 2022-06-06 20:06 UTC (permalink / raw)
To: Joel Stanley; +Cc: openbmc, eajames
On Sun, Jun 05, 2022 at 05:04:34PM PDT, Joel Stanley wrote:
>These lines were mistakenly added with space indentation instead of
>tabs.
>
>Fixes: ba6ce6626286 ("aspeed: Add machine names")
>Reported-by: Zev Weiss <zweiss@equinix.com>
>Signed-off-by: Joel Stanley <joel@jms.id.au>
>---
> 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 ++--
> 5 files changed, 10 insertions(+), 10 deletions(-)
>
Looks like this doesn't fix up all the files that got spacified in
ba6ce6626286; shall we also cover these while we're at it?
ast2400-evb
ast2500-evb
ast2600a0-evb
ast2600a1-evb
Zev
>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";
>--
>2.35.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH u-boot v2019.04-aspeed-openbmc v2 1/2] ARM: dts: Rename Rainier to P10 BMC
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 1/2] ARM: dts: " Joel Stanley
2022-06-06 13:32 ` Eddie James
@ 2022-06-06 20:09 ` Zev Weiss
1 sibling, 0 replies; 8+ messages in thread
From: Zev Weiss @ 2022-06-06 20:09 UTC (permalink / raw)
To: Joel Stanley; +Cc: openbmc, eajames
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>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation
2022-06-06 20:06 ` Zev Weiss
@ 2022-06-06 23:01 ` Joel Stanley
0 siblings, 0 replies; 8+ messages in thread
From: Joel Stanley @ 2022-06-06 23:01 UTC (permalink / raw)
To: Zev Weiss; +Cc: openbmc, eajames
On Mon, 6 Jun 2022 at 20:06, Zev Weiss <zweiss@equinix.com> wrote:
>
> On Sun, Jun 05, 2022 at 05:04:34PM PDT, Joel Stanley wrote:
> >These lines were mistakenly added with space indentation instead of
> >tabs.
> >
> >Fixes: ba6ce6626286 ("aspeed: Add machine names")
> >Reported-by: Zev Weiss <zweiss@equinix.com>
> >Signed-off-by: Joel Stanley <joel@jms.id.au>
> >---
> > 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 ++--
> > 5 files changed, 10 insertions(+), 10 deletions(-)
> >
>
> Looks like this doesn't fix up all the files that got spacified in
> ba6ce6626286; shall we also cover these while we're at it?
>
> ast2400-evb
> ast2500-evb
> ast2600a0-evb
> ast2600a1-evb
Thanks. I did a "vim arch/arm/boot/dts/ast2600-*" which obviously
missed those four.
>
>
> Zev
>
> >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";
> >--
> >2.35.1
> >
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-06-06 23:02 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-06 0:04 [PATCH u-boot v2019.04-aspeed-openbmc v2 0/2] Rename Rainier to P10 BMC Joel Stanley
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 1/2] ARM: dts: " Joel Stanley
2022-06-06 13:32 ` Eddie James
2022-06-06 20:09 ` Zev Weiss
2022-06-06 0:04 ` [PATCH u-boot v2019.04-aspeed-openbmc v2 2/2] ARM: dts: ast2600: Fix indentation Joel Stanley
2022-06-06 13:32 ` Eddie James
2022-06-06 20:06 ` Zev Weiss
2022-06-06 23:01 ` Joel Stanley
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.