ARM: dts: aspeed: Align GPIO hog name with bindings

Bindings expect GPIO hog names to end with 'hog' suffix, so correct it
to fix dtbs_check warnings like:

  aspeed-bmc-lenovo-hr630.dtb: pin_gpio_b5: $nodename:0: 'pin_gpio_b5' does not match '^.+-hog(-[0-9]+)?$'

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Ninad Palsule <ninad@linux.ibm.com>
Link: https://patch.msgid.link/20250116090009.87338-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts
index 31c5d319aa0a9f2a3d44db2db4448d63916cd8f3..2637025997678ffcb479428ae191a0e4f16488bb 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts
@@ -825,7 +825,7 @@
                line-name = "ocp-aux-pwren";
        };
 
-       bmc-ready {
+       bmc-ready-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AC, 5) GPIO_ACTIVE_HIGH>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
index 29c68c37e7f5aa8c281910cd39dd27c84ccd567d..9605ccade1555fa403996269029a7450eec2915b 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
@@ -201,13 +201,13 @@
 };
 
 &gpio {
-       pin_gpio_c7 {
+       pin-gpio-c7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "BIOS_SPI_MUX_S";
        };
-       pin_gpio_d1 {
+       pin-gpio-d1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts
index bb2e6ef609afa4ca57957f72b7e56ea3fecd021c..93190f4e696cac9fb11409026470b8d2d66929ea 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts
@@ -182,7 +182,7 @@
                        "CK_33M_BMC", "LFRAME", "SERIRQ", "S_PLTRST";
 
        /* Assert BMC_READY so BIOS doesn't sit around waiting for it */
-       bmc-ready {
+       bmc-ready-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(J, 0) GPIO_ACTIVE_LOW>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts
index 3f03a198a1a8fcd4e66b39171dfc7864fee18ddc..54a5509b04f1fac0de30eb962a7f647b2b3a4e00 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts
@@ -915,14 +915,14 @@
 };
 
 &gpio {
-       pin_gpio_i3 {
+       pin-gpio-i3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(I, 3) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "NCSI_BMC_R_SEL";
        };
 
-       pin_gpio_b6 {
+       pin-gpio-b6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 6) GPIO_ACTIVE_HIGH>;
                output-low;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts
index b6bfdaea08e6320a55c114599bd6dc116c60f316..cce8d0416dc82760ad9b58bf034259a19d6a4660 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts
@@ -395,7 +395,7 @@
         * back to one causes a power output glitch, so install a hog to keep
         * it at one as a failsafe to ensure nothing accidentally touches it.
         */
-       doom-guardrail {
+       doom-guardrail-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(E, 0) GPIO_ACTIVE_LOW>;
                output-low;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
index 7364adc6b80d60801215de27e23bc3bf18964f28..2f5d4075a64ade61ac780c95fb9456cbf52ee45e 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
@@ -155,7 +155,7 @@
                /*Y0-Y7*/       "","","","","","","","",
                /*Z0-Z7*/       "","","","","","","","";
 
-       usb_power {
+       usb-power-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(O, 3) GPIO_ACTIVE_LOW>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
index 9961508ee872fbfec7b6fd6f6bda380509e2c5f1..4d9e2cd11f44ab596b62713ec4a467061056046f 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
@@ -312,7 +312,7 @@
        /*Y0-Y7*/       "","","","","","","","",
        /*Z0-Z7*/   "","","","","","","","";
 
-       usb_power {
+       usb-power-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(O, 3) GPIO_ACTIVE_LOW>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
index 638a2c1c78927018de92f4922ef2934e68a1d5ac..757421bc360599c0100d17b893fb6a4ef626d9ef 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
@@ -224,14 +224,14 @@
        /*Y0-Y7*/       "","","","","","","","",
        /*Z0-Z7*/       "","","","","","","","";
 
-       i2c3_mux_oe_n {
+       i2c3-mux-oe-n-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(G, 6) GPIO_ACTIVE_LOW>;
                output-high;
                line-name = "I2C3_MUX_OE_N";
        };
 
-       usb_power {
+       usb-power-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(O, 3) GPIO_ACTIVE_LOW>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts
index ddbcbc64e2356bc800d7d06d11069ce748d2c3a9..4ad0f44af1abb1e0d0ca587a4229f858f2a982ab 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts
@@ -405,161 +405,161 @@
 
 &gpio {
 
-       pin_gpio_b5 {
+       pin-gpio-b5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 5) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "IRQ_BMC_PCH_SMI_LPC_N";
        };
 
-       pin_gpio_f0 {
+       pin-gpio-f0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 0) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "IRQ_BMC_PCH_NMI_R";
        };
 
-       pin_gpio_f3 {
+       pin-gpio-f3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "I2C_BUS0_RST_OUT_N";
        };
 
-       pin_gpio_f4 {
+       pin-gpio-f4-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 4) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "FM_SKT0_FAULT_LED";
        };
 
-       pin_gpio_f5 {
+       pin-gpio-f5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 5) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "FM_SKT1_FAULT_LED";
        };
 
-       pin_gpio_g4 {
+       pin-gpio-g4-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(G, 4) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "FAN_PWR_CTL_N";
        };
 
-       pin_gpio_g7 {
+       pin-gpio-g7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(G, 7) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "RST_BMC_PCIE_I2CMUX_N";
        };
 
-       pin_gpio_h2 {
+       pin-gpio-h2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "PSU1_FFS_N_R";
        };
 
-       pin_gpio_h3 {
+       pin-gpio-h3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "PSU2_FFS_N_R";
        };
 
-       pin_gpio_i3 {
+       pin-gpio-i3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(I, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_INTRUDED_COVER";
        };
 
-       pin_gpio_j2 {
+       pin-gpio-j2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(J, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_BIOS_UPDATE_N";
        };
 
-       pin_gpio_j3 {
+       pin-gpio-j3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(J, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "RST_BMC_HDD_I2CMUX_N";
        };
 
-       pin_gpio_s2 {
+       pin-gpio-s2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_VGA_SW";
        };
 
-       pin_gpio_s4 {
+       pin-gpio-s4-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(S, 4) GPIO_ACTIVE_HIGH>;
                output;
                line-name = "VBAT_EN_N";
        };
 
-       pin_gpio_s6 {
+       pin-gpio-s6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(S, 6) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "PU_BMC_GPIOS6";
        };
 
-       pin_gpio_y0 {
+       pin-gpio-y0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(Y, 0) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "BMC_NCSI_MUX_CTL_S0";
        };
 
-       pin_gpio_y1 {
+       pin-gpio-y1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(Y, 1) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "BMC_NCSI_MUX_CTL_S1";
        };
 
-       pin_gpio_z0 {
+       pin-gpio-z0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(Z, 0) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "I2C_RISER2_INT_N";
        };
 
-       pin_gpio_z2 {
+       pin-gpio-z2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(Z, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "I2C_RISER2_RESET_N";
        };
 
-       pin_gpio_z3 {
+       pin-gpio-z3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "FM_BMC_PCH_SCI_LPC_N";
        };
 
-       pin_gpio_z7 {
+       pin-gpio-z7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(Z, 7) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "BMC_POST_CMPLT_N";
        };
 
-       pin_gpio_aa0 {
+       pin-gpio-aa0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "HOST_BMC_USB_SEL";
        };
 
-       pin_gpio_aa5 {
+       pin-gpio-aa5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AA, 5) GPIO_ACTIVE_HIGH>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
index 6045b60b80da8de78aca19196d6e1fd7dfde62cd..de61eac54585b0d80c33f500a432fdfb0c2cf9cf 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
@@ -425,238 +425,238 @@
 
 &gpio {
 
-       pin_gpio_a1 {
+       pin-gpio-a1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(A, 1) GPIO_ACTIVE_LOW>;
                output-high;
                line-name = "BMC_EMMC_RST_N";
        };
 
-       pin_gpio_a3 {
+       pin-gpio-a3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(A, 3) GPIO_ACTIVE_LOW>;
                output-high;
                line-name = "PCH_PWROK_BMC_FPGA";
        };
 
-       pin_gpio_b5 {
+       pin-gpio-b5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 5) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "IRQ_BMC_PCH_SMI_LPC_N";
        };
 
-       pin_gpio_b7 {
+       pin-gpio-b7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 7) GPIO_ACTIVE_LOW>;
                output-low;
                line-name = "CPU_SM_WP";
        };
 
-       pin_gpio_e0 {
+       pin-gpio-e0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(E, 0) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "PDB_PSU_SEL";
        };
 
-       pin_gpio_e2 {
+       pin-gpio-e2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(E, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "LOCATOR_LED_N";
        };
 
-       pin_gpio_e5 {
+       pin-gpio-e5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(E, 5) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "FM_BMC_DBP_PRESENT_R1_N";
        };
 
-       pin_gpio_e6 {
+       pin-gpio-e6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(E, 6) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_ME_SECURITY_OVERRIDE_N";
        };
 
-       pin_gpio_f0 {
+       pin-gpio-f0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 0) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "IRQ_BMC_PCH_NMI_R";
        };
 
-       pin_gpio_f1 {
+       pin-gpio-f1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 1) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "CPU2_PROCDIS_BMC_N";
        };
 
-       pin_gpio_f2 {
+       pin-gpio-f2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "RM_THROTTLE_EN_N";
        };
 
-       pin_gpio_f3 {
+       pin-gpio-f3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 3) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "FM_PMBUS_ALERT_B_EN";
        };
 
-       pin_gpio_f4 {
+       pin-gpio-f4-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 4) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_FORCE_NM_THROTTLE_N";
        };
 
-       pin_gpio_f6 {
+       pin-gpio-f6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 6) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "FM_BMC_CPU_PWR_DEBUG_N";
        };
 
-       pin_gpio_g7 {
+       pin-gpio-g7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(G, 7) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_PCIE_I2C_MUX_RST_N";
        };
 
-       pin_gpio_h6 {
+       pin-gpio-h6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 6) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "FM_BMC_DBP_PRESENT_R2_N";
        };
 
-       pin_gpio_i3 {
+       pin-gpio-i3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(I, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "SPI_BMC_BIOS_WP_N";
        };
 
-       pin_gpio_j1 {
+       pin-gpio-j1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(J, 1) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_USB_SEL";
        };
 
-       pin_gpio_j2 {
+       pin-gpio-j2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(J, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "PDB_SMB_RST_N";
        };
 
-       pin_gpio_j3 {
+       pin-gpio-j3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(J, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "SPI_BMC_BIOS_HOLD_N";
        };
 
-       pin_gpio_l0 {
+       pin-gpio-l0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(L, 0) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "PDB_FAN_TACH_SEL";
        };
 
-       pin_gpio_l1 {
+       pin-gpio-l1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(L, 1) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "SYS_RESET_BMC_FPGA_N";
        };
 
-       pin_gpio_l4 {
+       pin-gpio-l4-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "FM_EFUSE_FAN_G1_EN";
        };
 
-       pin_gpio_l5 {
+       pin-gpio-l5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(L, 5) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "FM_EFUSE_FAN_G2_EN";
        };
 
-       pin_gpio_r6 {
+       pin-gpio-r6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(R, 6) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "CPU3_PROCDIS_BMC_N";
        };
 
-       pin_gpio_r7 {
+       pin-gpio-r7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "CPU4_PROCDIS_BMC_N";
        };
 
-       pin_gpio_s1 {
+       pin-gpio-s1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(S, 1) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "DBP_SYSPWROK_BMC";
        };
 
-       pin_gpio_s2 {
+       pin-gpio-s2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "PCH_RST_RSMRST_N";
        };
 
-       pin_gpio_s6 {
+       pin-gpio-s6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(S, 6) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_HW_STRAP_5";
        };
 
-       pin_gpio_z3 {
+       pin-gpio-z3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "FM_BMC_PCH_SCI_LPC_N";
        };
 
-       pin_gpio_aa0 {
+       pin-gpio-aa0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "FW_PSU_ALERT_EN_N";
        };
 
-       pin_gpio_aa4 {
+       pin-gpio-aa4-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AA, 4) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "DBP_CPU_PREQ_N";
        };
 
-       pin_gpio_ab3 {
+       pin-gpio-ab3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AB, 3) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "BMC_WDTRST";
        };
 
-       pin_gpio_ac6 {
+       pin-gpio-ac6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AC, 6) GPIO_ACTIVE_HIGH>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
index 370738572a55b2498fff31a4aabf336cc41e1eac..b875b6b450838b14d9f9bddfd9ab3bcea3750d5c 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
@@ -264,49 +264,49 @@
 };
 
 &gpio {
-       pin_gpio_b0 {
+       pin-gpio-b0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 0) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_HDD1_PWR_EN";
        };
 
-       pin_gpio_b5 {
+       pin-gpio-b5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 5) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "BMC_USB1_OCI2";
        };
 
-       pin_gpio_h5 {
+       pin-gpio-h5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_CP0_PERST_ENABLE_R";
        };
 
-       pin_gpio_z2 {
+       pin-gpio-z2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(Z, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "RST_PCA9546_U177_N";
        };
 
-       pin_gpio_aa6 {
+       pin-gpio-aa6-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AA, 6) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_CP0_RESET_N";
        };
 
-       pin_gpio_aa7 {
+       pin-gpio-aa7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AA, 7) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_TPM_RESET_N";
        };
 
-       pin_gpio_ab0 {
+       pin-gpio-ab0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(AB, 0) GPIO_ACTIVE_LOW>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
index b1d0ff85d397adf0cc4b5c75e04ff49a5419e2e2..1a7c61750d0ddfbeb00788711226bfeed3550409 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
@@ -248,27 +248,27 @@
        /*AB0-AB7*/     "","","","","","","","",
        /*AC0-AC7*/     "","","","","","","","";
 
-       func_mode0 {
+       func-mode0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
                output-low;
        };
-       func_mode1 {
+       func-mode1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
                output-low;
        };
-       func_mode2 {
+       func-mode2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(D, 5) GPIO_ACTIVE_HIGH>;
                output-low;
        };
-       seq_cont {
+       seq-cont-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(S, 7) GPIO_ACTIVE_HIGH>;
                output-low;
        };
-       ncsi_cfg {
+       ncsi-cfg-hog {
                gpio-hog;
                input;
                gpios = <ASPEED_GPIO(E, 1) GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
index 45631b47a7b394482a0ffe9c77157f9a92acd21c..123da82c04d54e1fa25893d850c253f9c3343c9b 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
@@ -209,140 +209,140 @@
 };
 
 &gpio {
-       pin_func_mode0 {
+       pin-func-mode0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(C, 4) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "func_mode0";
        };
 
-       pin_func_mode1 {
+       pin-func-mode1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(C, 5)  GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "func_mode1";
        };
 
-       pin_func_mode2 {
+       pin-func-mode2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "func_mode2";
        };
 
-       pin_gpio_a0 {
+       pin-gpio-a0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(A, 0) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "BMC_FAN_RESERVED_N";
        };
 
-       pin_gpio_a1 {
+       pin-gpio-a1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(A, 1) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "APSS_WDT_N";
        };
 
-       pin_gpio_b1 {
+       pin-gpio-b1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 1) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "APSS_BOOT_MODE";
        };
 
-       pin_gpio_b2 {
+       pin-gpio-b2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "APSS_RESET_N";
        };
 
-       pin_gpio_b7 {
+       pin-gpio-b7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(B, 7) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "SPIVID_STBY_RESET_N";
        };
 
-       pin_gpio_d1 {
+       pin-gpio-d1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_POWER_UP";
        };
 
-       pin_gpio_f1 {
+       pin-gpio-f1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 1) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "BMC_BATTERY_TEST";
        };
 
-       pin_gpio_f4 {
+       pin-gpio-f4-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 4) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "AST_HW_FAULT_N";
        };
 
-       pin_gpio_f5 {
+       pin-gpio-f5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 5) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "AST_SYS_FAULT_N";
        };
 
-       pin_gpio_f7 {
+       pin-gpio-f7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(F, 7) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_FULL_SPEED_N";
        };
 
-       pin_gpio_g3 {
+       pin-gpio-g3-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(G, 3) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "BMC_FAN_ERROR_N";
        };
 
-       pin_gpio_g4 {
+       pin-gpio-g4-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(G, 4) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "BMC_WDT_RST1_P";
        };
 
-       pin_gpio_g5 {
+       pin-gpio-g5-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(G, 5) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "BMC_WDT_RST2_P";
        };
 
-       pin_gpio_h0 {
+       pin-gpio-h0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 0) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "PE_SLOT_TEST_EN_N";
        };
 
-       pin_gpio_h1 {
+       pin-gpio-h1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
                input;
                line-name = "BMC_RTCRST_N";
        };
 
-       pin_gpio_h2 {
+       pin-gpio-h2-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "SYS_PWROK_BMC";
        };
 
-       pin_gpio_h7 {
+       pin-gpio-h7-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
                output-high;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
index 24df24ad9c80b1f377d82e57fa8ea899988548a7..e6b383f6e9776bb67e0c2d9dfe98bcc6564e131a 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
@@ -263,17 +263,17 @@
        /*AB0-AB7*/     "","","","","","","","",
        /*AC0-AC7*/     "","","","","","","","";
 
-       nic_func_mode0 {
+       nic-func-mode0-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
                output-low;
        };
-       nic_func_mode1 {
+       nic-func-mode1-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
                output-low;
        };
-       seq_cont {
+       seq-cont-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(S, 7) GPIO_ACTIVE_HIGH>;
                output-low;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
index 9904f0a58cfac61ed2479f439ab64fbaddb094cf..6ac7b0aa6e548da09fae7ba2d1512f1d6fcc2dc8 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
@@ -509,25 +509,25 @@
        /*AB0-AB7*/     "","","","","","","","",
        /*AC0-AC7*/     "","","","","","","","";
 
-       line_iso_u146_en {
+       line-iso-u146-en-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(O, 4) GPIO_ACTIVE_HIGH>;
                output-high;
        };
 
-       ncsi_mux_en_n {
+       ncsi-mux-en-n-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(P, 0) GPIO_ACTIVE_HIGH>;
                output-low;
        };
 
-       line_bmc_i2c2_sw_rst_n {
+       line-bmc-i2c2-sw-rst-n-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(P, 1) GPIO_ACTIVE_HIGH>;
                output-high;
        };
 
-       line_bmc_i2c5_sw_rst_n {
+       line-bmc-i2c5-sw-rst-n-hog {
                gpio-hog;
                gpios = <ASPEED_GPIO(P, 3) GPIO_ACTIVE_HIGH>;
                output-high;