ARM: dts: aspeed: yamp: Use common dtsi

Simplify the Yamp device tree by using the common dtsi.

In addition this enables the following the second firmware flash and the
eMMC device in slot #1.

Signed-off-by: Tao Ren <taoren@fb.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts
index ee175dd..5293359 100644 (file)
--- 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 "ast2500-facebook-netbmc-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;
@@ -95,6 +43,10 @@
        clock-names = "MACCLK", "RCLK";
 };
 
+&mac1 {
+       status = "disabled";
+};
+
 &i2c0 {
        status = "okay";
 };
@@ -157,7 +109,3 @@
 &i2c13 {
        status = "okay";
 };
-
-&vhub {
-       status = "okay";
-};