From: Tao Ren <[email protected]>
The patch series adds the initial version of device tree for Facebook
Galaxy100 (AST2400) BMC.
Patch #1 adds common dtsi to minimize duplicated device entries across
Facebook Network AST2400 BMC device trees.
Patch #2 simplfies Wedge40 device tree by using the common dtsi.
Patch #3 simplfies Wedge100 device tree by using the common dtsi.
Patch #4 adds the initial version of device tree for Facebook Galaxy100
BMC.
Tao Ren (4):
ARM: dts: aspeed: Common dtsi for Facebook AST2400 Network BMCs
ARM: dts: aspeed: wedge40: Use common dtsi
ARM: dts: aspeed: wedge100: Use common dtsi
ARM: dts: aspeed: Add Facebook Galaxy100 (AST2400) BMC
arch/arm/boot/dts/Makefile | 1 +
.../dts/aspeed-bmc-facebook-galaxy100.dts | 57 +++++++++
.../boot/dts/aspeed-bmc-facebook-wedge100.dts | 120 +++---------------
.../boot/dts/aspeed-bmc-facebook-wedge40.dts | 112 +---------------
.../dts/ast2400-facebook-netbmc-common.dtsi | 117 +++++++++++++++++
5 files changed, 191 insertions(+), 216 deletions(-)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts
create mode 100644 arch/arm/boot/dts/ast2400-facebook-netbmc-common.dtsi
--
2.17.1
From: Tao Ren <[email protected]>
Simplify the Wedge100 device tree by using the common dtsi.
In addition this enables the second firmware flash, and turns on the
"i2c-mux-idle-disconnect" flag for I2C switch 7-0070.
Signed-off-by: Tao Ren <[email protected]>
---
.../boot/dts/aspeed-bmc-facebook-wedge100.dts | 120 +++---------------
1 file changed, 15 insertions(+), 105 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts
index 322587b7b67d..39c6be91d53f 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts
@@ -2,36 +2,16 @@
// Copyright (c) 2018 Facebook Inc.
/dts-v1/;
-#include "aspeed-g4.dtsi"
+#include "ast2400-facebook-netbmc-common.dtsi"
/ {
model = "Facebook Wedge 100 BMC";
compatible = "facebook,wedge100-bmc", "aspeed,ast2400";
- aliases {
- /*
- * Override the default uart aliases to avoid breaking
- * the legacy applications.
- */
- serial0 = &uart5;
- serial1 = &uart1;
- serial2 = &uart3;
- serial3 = &uart4;
- };
-
chosen {
stdout-path = &uart3;
bootargs = "console=ttyS2,9600n8 root=/dev/ram rw";
};
-
- memory@40000000 {
- reg = <0x40000000 0x20000000>;
- };
-};
-
-&wdt1 {
- status = "okay";
- aspeed,reset-type = "system";
};
&wdt2 {
@@ -40,108 +20,38 @@
};
&fmc {
- status = "okay";
- flash@0 {
+ flash@1 {
status = "okay";
m25p,fast-read;
- label = "fmc0";
-#include "facebook-bmc-flash-layout.dtsi"
+ label = "spi0.1";
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ flash1@0 {
+ reg = <0x0 0x2000000>;
+ label = "flash1";
+ };
+ };
};
};
-&uart1 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_txd1_default
- &pinctrl_rxd1_default>;
-};
-
-&uart3 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_txd3_default
- &pinctrl_rxd3_default>;
-};
-
-&uart4 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_txd4_default
- &pinctrl_rxd4_default>;
-};
-
-&uart5 {
- status = "okay";
-};
-
-&mac1 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
-};
-
-&i2c0 {
- status = "okay";
-};
-
-&i2c1 {
- status = "okay";
-};
-
-&i2c2 {
- status = "okay";
-};
-
-&i2c3 {
- status = "okay";
-};
-
-&i2c4 {
- status = "okay";
-};
-
-&i2c5 {
- status = "okay";
-};
-
-&i2c6 {
- status = "okay";
-};
-
&i2c7 {
- status = "okay";
-
i2c-switch@70 {
compatible = "nxp,pca9548";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x70>;
+ i2c-mux-idle-disconnect;
};
};
-&i2c8 {
- status = "okay";
-};
-
&i2c9 {
status = "okay";
};
-&i2c10 {
- status = "okay";
-};
-
-&i2c11 {
- status = "okay";
-};
-
-&i2c12 {
- status = "okay";
-};
-
-&i2c13 {
- status = "okay";
-};
&vhub {
status = "okay";
--
2.17.1
From: Tao Ren <[email protected]>
Add initial version of device tree for Facebook Galaxy100 (AST2400) BMC.
Signed-off-by: Tao Ren <[email protected]>
---
arch/arm/boot/dts/Makefile | 1 +
.../dts/aspeed-bmc-facebook-galaxy100.dts | 57 +++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 21477ef5c5c9..1917cd47204a 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1383,6 +1383,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-arm-stardragon4800-rep2.dtb \
aspeed-bmc-bytedance-g220a.dtb \
aspeed-bmc-facebook-cmm.dtb \
+ aspeed-bmc-facebook-galaxy100.dtb \
aspeed-bmc-facebook-minipack.dtb \
aspeed-bmc-facebook-tiogapass.dtb \
aspeed-bmc-facebook-wedge40.dtb \
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts
new file mode 100644
index 000000000000..dcf213472749
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright (c) 2020 Facebook Inc.
+/dts-v1/;
+
+#include "ast2400-facebook-netbmc-common.dtsi"
+
+/ {
+ model = "Facebook Galaxy 100 BMC";
+ compatible = "facebook,galaxy100-bmc", "aspeed,ast2400";
+
+ chosen {
+ stdout-path = &uart5;
+ bootargs = "console=ttyS0,9600n8 root=/dev/ram rw";
+ };
+
+ ast-adc-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&adc 3>, <&adc 4>, <&adc 8>, <&adc 9>;
+ };
+};
+
+&wdt2 {
+ status = "okay";
+ aspeed,reset-type = "system";
+};
+
+&fmc {
+ flash@1 {
+ status = "okay";
+ m25p,fast-read;
+ label = "spi0.1";
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ flash1@0 {
+ reg = <0x0 0x2000000>;
+ label = "flash1";
+ };
+ };
+ };
+};
+
+
+&i2c9 {
+ status = "okay";
+};
+
+&vhub {
+ status = "okay";
+};
+
+&adc {
+ status = "okay";
+};
--
2.17.1
From: Tao Ren <[email protected]>
Simplify the Wedge40 device tree by using the common dtsi.
Signed-off-by: Tao Ren <[email protected]>
---
.../boot/dts/aspeed-bmc-facebook-wedge40.dts | 112 +-----------------
1 file changed, 1 insertion(+), 111 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
index 8c426ba2f8ab..2dcfeae3c92a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
@@ -2,137 +2,27 @@
// Copyright (c) 2018 Facebook Inc.
/dts-v1/;
-#include "aspeed-g4.dtsi"
+#include "ast2400-facebook-netbmc-common.dtsi"
/ {
model = "Facebook Wedge 40 BMC";
compatible = "facebook,wedge40-bmc", "aspeed,ast2400";
- aliases {
- /*
- * Override the default uart aliases to avoid breaking
- * the legacy applications.
- */
- serial0 = &uart5;
- serial1 = &uart1;
- serial2 = &uart3;
- serial3 = &uart4;
- };
-
chosen {
stdout-path = &uart3;
bootargs = "console=ttyS2,9600n8 root=/dev/ram rw";
};
- memory@40000000 {
- reg = <0x40000000 0x20000000>;
- };
-
ast-adc-hwmon {
compatible = "iio-hwmon";
io-channels = <&adc 5>, <&adc 6>, <&adc 7>, <&adc 8>, <&adc 9>;
};
};
-&wdt1 {
- status = "okay";
- aspeed,reset-type = "system";
-};
-
&wdt2 {
status = "disabled";
};
-&fmc {
- status = "okay";
- flash@0 {
- status = "okay";
- m25p,fast-read;
- label = "spi0.0";
-#include "facebook-bmc-flash-layout.dtsi"
- };
-};
-
-&uart1 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_txd1_default
- &pinctrl_rxd1_default>;
-};
-
-&uart3 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_txd3_default
- &pinctrl_rxd3_default>;
-};
-
-&uart4 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_txd4_default
- &pinctrl_rxd4_default
- &pinctrl_ndts4_default>;
-};
-
-&uart5 {
- status = "okay";
-};
-
-&mac1 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
-};
-
-&i2c0 {
- status = "okay";
-};
-
-&i2c1 {
- status = "okay";
-};
-
-&i2c2 {
- status = "okay";
-};
-
-&i2c3 {
- status = "okay";
-};
-
-&i2c4 {
- status = "okay";
-};
-
-&i2c5 {
- status = "okay";
-};
-
-&i2c6 {
- status = "okay";
-};
-
-&i2c7 {
- status = "okay";
-};
-
-&i2c8 {
- status = "okay";
-};
-
-&i2c11 {
- status = "okay";
-};
-
-&i2c12 {
- status = "okay";
-};
-
-&vhub {
- status = "okay";
-};
-
&adc {
status = "okay";
};
--
2.17.1
On Wed, Nov 11, 2020 at 11:34:10PM +0000, Joel Stanley wrote:
> On Wed, 11 Nov 2020 at 23:23, <[email protected]> wrote:
> >
> > From: Tao Ren <[email protected]>
> >
> > The patch series adds the initial version of device tree for Facebook
> > Galaxy100 (AST2400) BMC.
> >
> > Patch #1 adds common dtsi to minimize duplicated device entries across
> > Facebook Network AST2400 BMC device trees.
> >
> > Patch #2 simplfies Wedge40 device tree by using the common dtsi.
> >
> > Patch #3 simplfies Wedge100 device tree by using the common dtsi.
> >
> > Patch #4 adds the initial version of device tree for Facebook Galaxy100
> > BMC.
>
> Nice. They look good to me.
>
> Reviewed-by: Joel Stanley <[email protected]>
Thanks a lot for the quick review, Joel.
> Is there another person familiar with the design you would like to
> review before I merge?
Patrick Williams sometimes helps reviewing my patches although he doesn't
work on Network BMCs. Let me see if he has bandwidth this time :)
Cheers,
Tao
On Wed, 11 Nov 2020 at 23:23, <[email protected]> wrote:
>
> From: Tao Ren <[email protected]>
>
> The patch series adds the initial version of device tree for Facebook
> Galaxy100 (AST2400) BMC.
>
> Patch #1 adds common dtsi to minimize duplicated device entries across
> Facebook Network AST2400 BMC device trees.
>
> Patch #2 simplfies Wedge40 device tree by using the common dtsi.
>
> Patch #3 simplfies Wedge100 device tree by using the common dtsi.
>
> Patch #4 adds the initial version of device tree for Facebook Galaxy100
> BMC.
Nice. They look good to me.
Reviewed-by: Joel Stanley <[email protected]>
Is there another person familiar with the design you would like to
review before I merge?
>
> Tao Ren (4):
> ARM: dts: aspeed: Common dtsi for Facebook AST2400 Network BMCs
> ARM: dts: aspeed: wedge40: Use common dtsi
> ARM: dts: aspeed: wedge100: Use common dtsi
> ARM: dts: aspeed: Add Facebook Galaxy100 (AST2400) BMC
>
> arch/arm/boot/dts/Makefile | 1 +
> .../dts/aspeed-bmc-facebook-galaxy100.dts | 57 +++++++++
> .../boot/dts/aspeed-bmc-facebook-wedge100.dts | 120 +++---------------
> .../boot/dts/aspeed-bmc-facebook-wedge40.dts | 112 +---------------
> .../dts/ast2400-facebook-netbmc-common.dtsi | 117 +++++++++++++++++
> 5 files changed, 191 insertions(+), 216 deletions(-)
> create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts
> create mode 100644 arch/arm/boot/dts/ast2400-facebook-netbmc-common.dtsi
>
> --
> 2.17.1
>
On Wed, Nov 11, 2020 at 11:34:10PM +0000, Joel Stanley wrote:
> On Wed, 11 Nov 2020 at 23:23, <[email protected]> wrote:
> >
> > From: Tao Ren <[email protected]>
> >
> > The patch series adds the initial version of device tree for Facebook
> > Galaxy100 (AST2400) BMC.
> >
> > Patch #1 adds common dtsi to minimize duplicated device entries across
> > Facebook Network AST2400 BMC device trees.
> >
> > Patch #2 simplfies Wedge40 device tree by using the common dtsi.
> >
> > Patch #3 simplfies Wedge100 device tree by using the common dtsi.
> >
> > Patch #4 adds the initial version of device tree for Facebook Galaxy100
> > BMC.
>
> Nice. They look good to me.
>
> Reviewed-by: Joel Stanley <[email protected]>
>
> Is there another person familiar with the design you would like to
> review before I merge?
Also,
Reviewed-by: Patrick Williams <[email protected]>
--
Patrick Williams
On Wed, Nov 11, 2020 at 09:18:28PM -0600, Patrick Williams wrote:
> On Wed, Nov 11, 2020 at 11:34:10PM +0000, Joel Stanley wrote:
> > On Wed, 11 Nov 2020 at 23:23, <[email protected]> wrote:
> > >
> > > From: Tao Ren <[email protected]>
> > >
> > > The patch series adds the initial version of device tree for Facebook
> > > Galaxy100 (AST2400) BMC.
> > >
> > > Patch #1 adds common dtsi to minimize duplicated device entries across
> > > Facebook Network AST2400 BMC device trees.
> > >
> > > Patch #2 simplfies Wedge40 device tree by using the common dtsi.
> > >
> > > Patch #3 simplfies Wedge100 device tree by using the common dtsi.
> > >
> > > Patch #4 adds the initial version of device tree for Facebook Galaxy100
> > > BMC.
> >
> > Nice. They look good to me.
> >
> > Reviewed-by: Joel Stanley <[email protected]>
> >
> > Is there another person familiar with the design you would like to
> > review before I merge?
>
> Also,
>
> Reviewed-by: Patrick Williams <[email protected]>
>
> --
> Patrick Williams
Thank you Patrick!
Cheers,
Tao
On Thu, 12 Nov 2020 at 03:18, Patrick Williams <[email protected]> wrote:
>
> On Wed, Nov 11, 2020 at 11:34:10PM +0000, Joel Stanley wrote:
> > On Wed, 11 Nov 2020 at 23:23, <[email protected]> wrote:
> > >
> > > From: Tao Ren <[email protected]>
> > >
> > > The patch series adds the initial version of device tree for Facebook
> > > Galaxy100 (AST2400) BMC.
> > >
> > > Patch #1 adds common dtsi to minimize duplicated device entries across
> > > Facebook Network AST2400 BMC device trees.
> > >
> > > Patch #2 simplfies Wedge40 device tree by using the common dtsi.
> > >
> > > Patch #3 simplfies Wedge100 device tree by using the common dtsi.
> > >
> > > Patch #4 adds the initial version of device tree for Facebook Galaxy100
> > > BMC.
> >
> > Nice. They look good to me.
> >
> > Reviewed-by: Joel Stanley <[email protected]>
> >
> > Is there another person familiar with the design you would like to
> > review before I merge?
>
> Also,
>
> Reviewed-by: Patrick Williams <[email protected]>
Thanks. I have merged them into the aspeed tree for 5.11.
Cheers,
Joel
On Thu, Nov 12, 2020 at 05:49:30AM +0000, Joel Stanley wrote:
> On Thu, 12 Nov 2020 at 03:18, Patrick Williams <[email protected]> wrote:
> >
> > On Wed, Nov 11, 2020 at 11:34:10PM +0000, Joel Stanley wrote:
> > > On Wed, 11 Nov 2020 at 23:23, <[email protected]> wrote:
> > > >
> > > > From: Tao Ren <[email protected]>
> > > >
> > > > The patch series adds the initial version of device tree for Facebook
> > > > Galaxy100 (AST2400) BMC.
> > > >
> > > > Patch #1 adds common dtsi to minimize duplicated device entries across
> > > > Facebook Network AST2400 BMC device trees.
> > > >
> > > > Patch #2 simplfies Wedge40 device tree by using the common dtsi.
> > > >
> > > > Patch #3 simplfies Wedge100 device tree by using the common dtsi.
> > > >
> > > > Patch #4 adds the initial version of device tree for Facebook Galaxy100
> > > > BMC.
> > >
> > > Nice. They look good to me.
> > >
> > > Reviewed-by: Joel Stanley <[email protected]>
> > >
> > > Is there another person familiar with the design you would like to
> > > review before I merge?
> >
> > Also,
> >
> > Reviewed-by: Patrick Williams <[email protected]>
>
> Thanks. I have merged them into the aspeed tree for 5.11.
>
> Cheers,
>
> Joel
Thank you Joel.
BTW, I sent out another 2 patches for AST2500 dts earlier this week; not
sure if they were successfully delivered; if not, I will resend them
earlier next week.
Cheers,
Tao