Merge tag 'drm-next-2020-12-24' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / arch / arm / boot / dts / aspeed-bmc-facebook-wedge100.dts

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts
index 322587b..39c6be9 100644 (file)
--- 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";