ARM: dts: aspeed: minerva: Revise the SGPIO line name

Modify the SGPIO line names sent from the CMM CPLD in the DVT version and
map the blade and FCB numbers to match the silkscreen labels on the rack as
follows:

1. Change the compute blade numbering from 0-15 to 1-16.
2. Change the network blade numbering from 0-5 to 1-6.
3. Update the FCB numbering from TOP0/1, MID0/1, and BOT0/1 to FCB1-6.
4. Revise the SGPIO line name for DVT changed.

Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
Link: https://patch.msgid.link/20240924140215.2484170-2-yangchen.openbmc@gmail.com
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index 41e2246cfbd1caf5c5eabbf6ca2ac683f12e9676..38eb42aaa98b4aa51017f12317c80ac9b8bad9d2 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -627,7 +627,6 @@
        gpio-line-names =
        /*"input pin","output pin"*/
        /*A0 - A7*/
-       "PRSNT_MTIA_BLADE0_N","PWREN_MTIA_BLADE0_EN_N",
        "PRSNT_MTIA_BLADE1_N","PWREN_MTIA_BLADE1_EN_N",
        "PRSNT_MTIA_BLADE2_N","PWREN_MTIA_BLADE2_EN_N",
        "PRSNT_MTIA_BLADE3_N","PWREN_MTIA_BLADE3_EN_N",
@@ -635,8 +634,8 @@
        "PRSNT_MTIA_BLADE5_N","PWREN_MTIA_BLADE5_EN_N",
        "PRSNT_MTIA_BLADE6_N","PWREN_MTIA_BLADE6_EN_N",
        "PRSNT_MTIA_BLADE7_N","PWREN_MTIA_BLADE7_EN_N",
-       /*B0 - B7*/
        "PRSNT_MTIA_BLADE8_N","PWREN_MTIA_BLADE8_EN_N",
+       /*B0 - B7*/
        "PRSNT_MTIA_BLADE9_N","PWREN_MTIA_BLADE9_EN_N",
        "PRSNT_MTIA_BLADE10_N","PWREN_MTIA_BLADE10_EN_N",
        "PRSNT_MTIA_BLADE11_N","PWREN_MTIA_BLADE11_EN_N",
@@ -644,80 +643,80 @@
        "PRSNT_MTIA_BLADE13_N","PWREN_MTIA_BLADE13_EN_N",
        "PRSNT_MTIA_BLADE14_N","PWREN_MTIA_BLADE14_EN_N",
        "PRSNT_MTIA_BLADE15_N","PWREN_MTIA_BLADE15_EN_N",
+       "PRSNT_MTIA_BLADE16_N","PWREN_MTIA_BLADE16_EN_N",
        /*C0 - C7*/
-       "PRSNT_NW_BLADE0_N","PWREN_NW_BLADE0_EN_N",
        "PRSNT_NW_BLADE1_N","PWREN_NW_BLADE1_EN_N",
        "PRSNT_NW_BLADE2_N","PWREN_NW_BLADE2_EN_N",
        "PRSNT_NW_BLADE3_N","PWREN_NW_BLADE3_EN_N",
        "PRSNT_NW_BLADE4_N","PWREN_NW_BLADE4_EN_N",
        "PRSNT_NW_BLADE5_N","PWREN_NW_BLADE5_EN_N",
-       "PRSNT_FCB_TOP_0_N","PWREN_MTIA_BLADE0_HSC_EN_N",
-       "PRSNT_FCB_TOP_1_N","PWREN_MTIA_BLADE1_HSC_EN_N",
+       "PRSNT_NW_BLADE6_N","PWREN_NW_BLADE6_EN_N",
+       "PRSNT_FCB_1_N","PWREN_MTIA_BLADE1_HSC_EN_N",
+       "PRSNT_FCB_2_N","PWREN_MTIA_BLADE2_HSC_EN_N",
        /*D0 - D7*/
-       "PRSNT_FCB_MIDDLE_0_N","PWREN_MTIA_BLADE2_HSC_EN_N",
-       "PRSNT_FCB_MIDDLE_1_N","PWREN_MTIA_BLADE3_HSC_EN_N",
-       "PRSNT_FCB_BOTTOM_1_N","PWREN_MTIA_BLADE4_HSC_EN_N",
-       "PRSNT_FCB_BOTTOM_0_N","PWREN_MTIA_BLADE5_HSC_EN_N",
-       "PWRGD_MTIA_BLADE0_PWROK_N","PWREN_MTIA_BLADE6_HSC_EN_N",
+       "PRSNT_FCB_3_N","PWREN_MTIA_BLADE3_HSC_EN_N",
+       "PRSNT_FCB_4_N","PWREN_MTIA_BLADE4_HSC_EN_N",
+       "PRSNT_FCB_6_N","PWREN_MTIA_BLADE5_HSC_EN_N",
+       "PRSNT_FCB_5_N","PWREN_MTIA_BLADE6_HSC_EN_N",
        "PWRGD_MTIA_BLADE1_PWROK_N","PWREN_MTIA_BLADE7_HSC_EN_N",
        "PWRGD_MTIA_BLADE2_PWROK_N","PWREN_MTIA_BLADE8_HSC_EN_N",
        "PWRGD_MTIA_BLADE3_PWROK_N","PWREN_MTIA_BLADE9_HSC_EN_N",
-       /*E0 - E7*/
        "PWRGD_MTIA_BLADE4_PWROK_N","PWREN_MTIA_BLADE10_HSC_EN_N",
+       /*E0 - E7*/
        "PWRGD_MTIA_BLADE5_PWROK_N","PWREN_MTIA_BLADE11_HSC_EN_N",
        "PWRGD_MTIA_BLADE6_PWROK_N","PWREN_MTIA_BLADE12_HSC_EN_N",
        "PWRGD_MTIA_BLADE7_PWROK_N","PWREN_MTIA_BLADE13_HSC_EN_N",
        "PWRGD_MTIA_BLADE8_PWROK_N","PWREN_MTIA_BLADE14_HSC_EN_N",
        "PWRGD_MTIA_BLADE9_PWROK_N","PWREN_MTIA_BLADE15_HSC_EN_N",
-       "PWRGD_MTIA_BLADE10_PWROK_N","PWREN_NW_BLADE0_HSC_EN_N",
+       "PWRGD_MTIA_BLADE10_PWROK_N","PWREN_MTIA_BLADE16_HSC_EN_N",
        "PWRGD_MTIA_BLADE11_PWROK_N","PWREN_NW_BLADE1_HSC_EN_N",
-       /*F0 - F7*/
        "PWRGD_MTIA_BLADE12_PWROK_N","PWREN_NW_BLADE2_HSC_EN_N",
+       /*F0 - F7*/
        "PWRGD_MTIA_BLADE13_PWROK_N","PWREN_NW_BLADE3_HSC_EN_N",
        "PWRGD_MTIA_BLADE14_PWROK_N","PWREN_NW_BLADE4_HSC_EN_N",
        "PWRGD_MTIA_BLADE15_PWROK_N","PWREN_NW_BLADE5_HSC_EN_N",
-       "PWRGD_NW_BLADE0_PWROK_N","PWREN_FCB_TOP_0_EN_N",
-       "PWRGD_NW_BLADE1_PWROK_N","PWREN_FCB_TOP_1_EN_N",
-       "PWRGD_NW_BLADE2_PWROK_N","PWREN_FCB_MIDDLE_0_EN_N",
-       "PWRGD_NW_BLADE3_PWROK_N","PWREN_FCB_MIDDLE_1_EN_N",
+       "PWRGD_MTIA_BLADE16_PWROK_N","PWREN_NW_BLADE6_HSC_EN_N",
+       "PWRGD_NW_BLADE1_PWROK_N","PWREN_SGPIO_FCB_2_EN_N",
+       "PWRGD_NW_BLADE2_PWROK_N","PWREN_SGPIO_FCB_1_EN_N",
+       "PWRGD_NW_BLADE3_PWROK_N","PWREN_SGPIO_FCB_4_EN_N",
+       "PWRGD_NW_BLADE4_PWROK_N","PWREN_SGPIO_FCB_3_EN_N",
        /*G0 - G7*/
-       "PWRGD_NW_BLADE4_PWROK_N","PWREN_FCB_BOTTOM_1_EN_N",
-       "PWRGD_NW_BLADE5_PWROK_N","PWREN_FCB_BOTTOM_0_EN_N",
-       "PWRGD_FCB_TOP_0_PWROK_N","FM_CMM_AC_CYCLE_N",
-       "PWRGD_FCB_TOP_1_PWROK_N","MGMT_SFP_TX_DIS",
-       "PWRGD_FCB_MIDDLE_0_PWROK_N","FM_MDIO_SW_SEL",
-       "PWRGD_FCB_MIDDLE_1_PWROK_N","FM_P24V_SMPWR_EN",
-       "PWRGD_FCB_BOTTOM_1_PWROK_N","",
-       "PWRGD_FCB_BOTTOM_0_PWROK_N","",
+       "PWRGD_NW_BLADE5_PWROK_N","PWREN_SGPIO_FCB_5_EN_N",
+       "PWRGD_NW_BLADE6_PWROK_N","PWREN_SGPIO_FCB_6_EN_N",
+       "PWRGD_FCB_1","FM_BMC_RST_RTCRST_R",
+       "PWRGD_FCB_2","",
+       "PWRGD_FCB_3","FM_MDIO_SW_SEL",
+       "PWRGD_FCB_4","FM_P24V_SMPWR_EN",
+       "PWRGD_FCB_6","",
+       "PWRGD_FCB_5","",
        /*H0 - H7*/
-       "LEAK_DETECT_MTIA_BLADE0_N","",
        "LEAK_DETECT_MTIA_BLADE1_N","",
        "LEAK_DETECT_MTIA_BLADE2_N","",
        "LEAK_DETECT_MTIA_BLADE3_N","",
        "LEAK_DETECT_MTIA_BLADE4_N","",
        "LEAK_DETECT_MTIA_BLADE5_N","",
        "LEAK_DETECT_MTIA_BLADE6_N","",
-       "LEAK_DETECT_MTIA_BLADE7_N","",
+       "LEAK_DETECT_MTIA_BLADE7_N","ERR_INJECT_CMM_PWR_FAIL_N",
+       "LEAK_DETECT_MTIA_BLADE8_N","",
        /*I0 - I7*/
-       "LEAK_DETECT_MTIA_BLADE8_N","RST_I2CRST_FCB_BOTTOM_1_N",
-       "LEAK_DETECT_MTIA_BLADE9_N","RST_I2CRST_FCB_BOTTOM_0_N",
-       "LEAK_DETECT_MTIA_BLADE10_N","RST_I2CRST_FCB_MIDDLE_0_N",
-       "LEAK_DETECT_MTIA_BLADE11_N","RST_I2CRST_FCB_MIDDLE_1_N",
-       "LEAK_DETECT_MTIA_BLADE12_N","RST_I2CRST_FCB_TOP_0_N",
-       "LEAK_DETECT_MTIA_BLADE13_N","RST_I2CRST_FCB_TOP_1_N",
-       "LEAK_DETECT_MTIA_BLADE14_N","BMC_READY",
-       "LEAK_DETECT_MTIA_BLADE15_N","FM_88E6393X_BIN_UPDATE_EN_N",
+       "LEAK_DETECT_MTIA_BLADE9_N","RST_I2CRST_FCB_5_N",
+       "LEAK_DETECT_MTIA_BLADE10_N","RST_I2CRST_FCB_6_N",
+       "LEAK_DETECT_MTIA_BLADE11_N","RST_I2CRST_FCB_4_N",
+       "LEAK_DETECT_MTIA_BLADE12_N","RST_I2CRST_FCB_3_N",
+       "LEAK_DETECT_MTIA_BLADE13_N","RST_I2CRST_FCB_2_N",
+       "LEAK_DETECT_MTIA_BLADE14_N","RST_I2CRST_FCB_1_N",
+       "LEAK_DETECT_MTIA_BLADE15_N","BMC_READY",
+       "LEAK_DETECT_MTIA_BLADE16_N","FM_88E6393X_BIN_UPDATE_EN_N",
        /*J0 - J7*/
-       "LEAK_DETECT_NW_BLADE0_N","WATER_VALVE_CLOSED_N",
-       "LEAK_DETECT_NW_BLADE1_N","",
+       "LEAK_DETECT_NW_BLADE1_N","WATER_VALVE_CLOSED_N",
        "LEAK_DETECT_NW_BLADE2_N","",
        "LEAK_DETECT_NW_BLADE3_N","",
        "LEAK_DETECT_NW_BLADE4_N","",
        "LEAK_DETECT_NW_BLADE5_N","",
-       "PWRGD_MTIA_BLADE0_HSC_PWROK_N","",
+       "LEAK_DETECT_NW_BLADE6_N","",
        "PWRGD_MTIA_BLADE1_HSC_PWROK_N","",
-       /*K0 - K7*/
        "PWRGD_MTIA_BLADE2_HSC_PWROK_N","",
+       /*K0 - K7*/
        "PWRGD_MTIA_BLADE3_HSC_PWROK_N","",
        "PWRGD_MTIA_BLADE4_HSC_PWROK_N","",
        "PWRGD_MTIA_BLADE5_HSC_PWROK_N","",
@@ -725,49 +724,50 @@
        "PWRGD_MTIA_BLADE7_HSC_PWROK_N","",
        "PWRGD_MTIA_BLADE8_HSC_PWROK_N","",
        "PWRGD_MTIA_BLADE9_HSC_PWROK_N","",
-       /*L0 - L7*/
        "PWRGD_MTIA_BLADE10_HSC_PWROK_N","",
+       /*L0 - L7*/
        "PWRGD_MTIA_BLADE11_HSC_PWROK_N","",
        "PWRGD_MTIA_BLADE12_HSC_PWROK_N","",
        "PWRGD_MTIA_BLADE13_HSC_PWROK_N","",
        "PWRGD_MTIA_BLADE14_HSC_PWROK_N","",
        "PWRGD_MTIA_BLADE15_HSC_PWROK_N","",
-       "PWRGD_NW_BLADE0_HSC_PWROK_N","",
+       "PWRGD_MTIA_BLADE16_HSC_PWROK_N","",
        "PWRGD_NW_BLADE1_HSC_PWROK_N","",
-       /*M0 - M7*/
        "PWRGD_NW_BLADE2_HSC_PWROK_N","",
+       /*M0 - M7*/
        "PWRGD_NW_BLADE3_HSC_PWROK_N","",
        "PWRGD_NW_BLADE4_HSC_PWROK_N","",
        "PWRGD_NW_BLADE5_HSC_PWROK_N","",
+       "PWRGD_NW_BLADE6_HSC_PWROK_N","",
        "RPU_READY","",
        "IT_GEAR_RPU_LINK_N","",
        "IT_GEAR_LEAK","",
        "WATER_VALVE_CLOSED_N","",
        /*N0 - N7*/
-       "VALVE_STS0","",
-       "VALVE_STS1","",
-       "PCA9555_IRQ0_N","",
+       "VALVE_STATUS_0","",
+       "VALVE_STATUS_1","",
        "PCA9555_IRQ1_N","",
+       "PCA9555_IRQ2_N","",
        "CR_TOGGLE_BOOT_N","",
-       "IRQ_FCB_TOP0_N","",
-       "IRQ_FCB_TOP1_N","",
+       "IRQ_FCB_1_N","",
+       "IRQ_FCB_2_N","",
        "CMM_CABLE_CARTRIDGE_PRSNT_BOT_N","",
        /*O0 - O7*/
        "CMM_CABLE_CARTRIDGE_PRSNT_TOP_N","",
        "BOT_BCB_CABLE_PRSNT_N","",
        "TOP_BCB_CABLE_PRSNT_N","",
-       "IRQ_FCB_MID0_N","",
-       "IRQ_FCB_MID1_N","",
+       "IRQ_FCB_3_N","",
+       "IRQ_FCB_4_N","",
        "CHASSIS_LEAK0_DETECT_N","",
        "CHASSIS_LEAK1_DETECT_N","",
-       "VALVE_RMON_A_1","",
+       "PCA9555_IRQ3_N","",
        /*P0 - P7*/
-       "VALVE_RMON_A_2","",
-       "VALVE_RMON_B_1","",
-       "VALVE_RMON_B_2","",
+       "PCA9555_IRQ4_N","",
+       "PCA9555_IRQ5_N","",
+       "CMM_AC_PWR_BTN_N","",
        "RPU_READY_SPARE","",
        "IT_GEAR_LEAK_SPARE","",
        "IT_GEAR_RPU_LINK_SPARE_N","",
-       "IRQ_FCB_BOT0_N","",
-       "IRQ_FCB_BOT0_N","";
+       "IRQ_FCB_6_N","",
+       "IRQ_FCB_5_N","";
 };