Merge commit '81fd23e2b3ccf71c807e671444e8accaba98ca53' of https://git.pengutronix...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / aspeed-bmc-ampere-mtjade.dts

diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
index 8f5ec22..57b0c45 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
@@ -9,7 +9,7 @@
 
        chosen {
                stdout-path = &uart5;
-               bootargs = "console=ttyS4,115200 earlyprintk";
+               bootargs = "console=ttyS4,115200 earlycon";
        };
 
        memory@80000000 {
@@ -110,6 +110,30 @@
                        linux,code = <ASPEED_GPIO(Q, 5)>;
                };
 
+               psu1_vin_good {
+                       label = "PSU1_VIN_GOOD";
+                       gpios = <&gpio ASPEED_GPIO(H, 4) GPIO_ACTIVE_LOW>;
+                       linux,code = <ASPEED_GPIO(H, 4)>;
+               };
+
+               psu2_vin_good {
+                       label = "PSU2_VIN_GOOD";
+                       gpios = <&gpio ASPEED_GPIO(H, 5) GPIO_ACTIVE_LOW>;
+                       linux,code = <ASPEED_GPIO(H, 5)>;
+               };
+
+               psu1_present {
+                       label = "PSU1_PRESENT";
+                       gpios = <&gpio ASPEED_GPIO(I, 0) GPIO_ACTIVE_LOW>;
+                       linux,code = <ASPEED_GPIO(I, 0)>;
+               };
+
+               psu2_present {
+                       label = "PSU2_PRESENT";
+                       gpios = <&gpio ASPEED_GPIO(I, 1) GPIO_ACTIVE_LOW>;
+                       linux,code = <ASPEED_GPIO(I, 1)>;
+               };
+
        };
 
        gpioA0mux: mux-controller {
@@ -280,7 +304,7 @@
                m25p,fast-read;
                label = "bmc";
                /* spi-max-frequency = <50000000>; */
-#include "openbmc-flash-layout.dtsi"
+#include "openbmc-flash-layout-64.dtsi"
        };
 };
 
@@ -332,6 +356,16 @@
        status = "okay";
 };
 
+&mac0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_rmii1_default>;
+       clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>,
+                <&syscon ASPEED_CLK_MAC1RCLK>;
+       clock-names = "MACCLK", "RCLK";
+       use-ncsi;
+};
+
 &mac1 {
        status = "okay";
        pinctrl-names = "default";
@@ -426,6 +460,19 @@
        status = "okay";
 };
 
+&i2c10 {
+       status = "okay";
+       adm1278@10 {
+               compatible = "adi,adm1278";
+               reg = <0x10>;
+       };
+
+       adm1278@11 {
+               compatible = "adi,adm1278";
+               reg = <0x11>;
+       };
+};
+
 &gfx {
        status = "okay";
        memory-region = <&gfx_memory>;
@@ -529,8 +576,9 @@
                        "S1_DDR_SAVE","","",
        /*G0-G7*/       "S0_FW_BOOT_OK","SHD_REQ_L","","S0_OVERTEMP_L","","",
                        "","",
-       /*H0-H7*/       "","","","","","","","",
-       /*I0-I7*/       "","","S1_BMC_SPECIAL_BOOT","","","","","",
+       /*H0-H7*/       "","","","","PSU1_VIN_GOOD","PSU2_VIN_GOOD","","",
+       /*I0-I7*/       "PSU1_PRESENT","PSU2_PRESENT","S1_BMC_SPECIAL_BOOT",
+                       "","","","","",
        /*J0-J7*/       "S0_HIGHTEMP_L","S0_FAULT_L","S0_SCP_AUTH_FAIL_L","",
                        "","","","",
        /*K0-K7*/       "","","","","","","","",
@@ -540,7 +588,8 @@
        /*O0-O7*/       "","","","","","","","",
        /*P0-P7*/       "","","","","","","","",
        /*Q0-Q7*/       "","","","","","UID_BUTTON","","",
-       /*R0-R7*/       "","","BMC_EXT_HIGHTEMP_L","","","RESET_BUTTON","","",
+       /*R0-R7*/       "","","BMC_EXT_HIGHTEMP_L","OCP_AUX_PWREN",
+                       "OCP_MAIN_PWREN","RESET_BUTTON","","",
        /*S0-S7*/       "","","","","","","","",
        /*T0-T7*/       "","","","","","","","",
        /*U0-U7*/       "","","","","","","","",