From: Tao Ren <taoren@fb.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>,
<devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>,
<openbmc@lists.ozlabs.org>
Cc: Tao Ren <taoren@fb.com>
Subject: [PATCH 4/4] ARM: dts: aspeed: yamp: include dtsi for common network BMC devices
Date: Mon, 21 Oct 2019 12:48:20 -0700 [thread overview]
Message-ID: <20191021194820.293556-5-taoren@fb.com> (raw)
In-Reply-To: <20191021194820.293556-1-taoren@fb.com>
The patch simplifies Yamp device tree by including dtsi to define
devices which are common to Facebook AST2500 Network BMC platforms.
Below is the summary of changes comparing with previous dts version:
- enabling the second firmware flash.
- enabling the emmc device in slot #1.
Signed-off-by: Tao Ren <taoren@fb.com>
---
.../arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 62 ++-----------------
1 file changed, 5 insertions(+), 57 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts
index 4e09a9cf32b7..b184fa1abb60 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts
@@ -2,7 +2,7 @@
// Copyright (c) 2018 Facebook Inc.
/dts-v1/;
-#include "aspeed-g5.dtsi"
+#include "facebook-netbmc-ast2500-common.dtsi"
/ {
model = "Facebook YAMP 100 BMC";
@@ -23,47 +23,6 @@
stdout-path = &uart5;
bootargs = "console=ttyS0,9600n8 root=/dev/ram rw";
};
-
- memory@80000000 {
- reg = <0x80000000 0x20000000>;
- };
-};
-
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
-/*
- * Update reset type to "system" (full chip) to fix warm reboot hang issue
- * when reset type is set to default ("soc", gated by reset mask registers).
- */
-&wdt1 {
- status = "okay";
- aspeed,reset-type = "system";
-};
-
-/*
- * wdt2 is not used by Yamp.
- */
-&wdt2 {
- status = "disabled";
-};
-
-&fmc {
- status = "okay";
- flash@0 {
- status = "okay";
- m25p,fast-read;
- label = "bmc";
-#include "facebook-bmc-flash-layout.dtsi"
- };
-};
-
-&uart1 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_txd1_default
- &pinctrl_rxd1_default>;
};
&uart2 {
@@ -73,17 +32,6 @@
&pinctrl_rxd2_default>;
};
-&uart3 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_txd3_default
- &pinctrl_rxd3_default>;
-};
-
-&uart5 {
- status = "okay";
-};
-
&mac0 {
status = "okay";
use-ncsi;
@@ -92,6 +40,10 @@
pinctrl-0 = <&pinctrl_rmii1_default>;
};
+&mac1 {
+ status = "disabled";
+};
+
&i2c0 {
status = "okay";
};
@@ -154,7 +106,3 @@
&i2c13 {
status = "okay";
};
-
-&vhub {
- status = "okay";
-};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-21 19:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 19:48 [PATCH 0/4] ARM: dts: aspeed: add dtsi for Facebook AST2500 Network BMCs Tao Ren
2019-10-21 19:48 ` [PATCH 1/4] " Tao Ren
2019-11-01 10:12 ` Joel Stanley
2019-11-01 17:42 ` Tao Ren
2019-10-21 19:48 ` [PATCH 2/4] ARM: dts: aspeed: cmm: include dtsi for common network BMC devices Tao Ren
2019-10-21 19:48 ` [PATCH 3/4] ARM: dts: aspeed: minipack: " Tao Ren
2019-10-21 19:48 ` Tao Ren [this message]
2019-11-01 10:08 ` [PATCH 0/4] ARM: dts: aspeed: add dtsi for Facebook AST2500 Network BMCs Joel Stanley
2019-11-01 17:40 ` Tao Ren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191021194820.293556-5-taoren@fb.com \
--to=taoren@fb.com \
--cc=andrew@aj.id.au \
--cc=devicetree@vger.kernel.org \
--cc=joel@jms.id.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=openbmc@lists.ozlabs.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox