Message ID | 20220606000434.1399583-3-joel@jms.id.au |
---|---|
State | New |
Headers | show |
Series | Rename Rainier to P10 BMC | expand |
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";
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 >
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 > >
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";
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(-)