pinctrl: qcom: mark the `gpio` and `egpio` pins function as non-strict functions

Allow pins muxed to the "gpio" or "egpio" function to be requested as
GPIOs even if pinmux_ops say the controller should be strict.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/qcom/pinctrl-ipq5018.c b/drivers/pinctrl/qcom/pinctrl-ipq5018.c
index 10b99d5..cbf3485 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ipq5018.c
+++ b/drivers/pinctrl/qcom/pinctrl-ipq5018.c
@@ -630,7 +630,7 @@ static const struct pinfunction ipq5018_functions[] = {
        MSM_PIN_FUNCTION(eud_gpio),
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(led0),
        MSM_PIN_FUNCTION(led2),
        MSM_PIN_FUNCTION(mac0),

diff --git a/drivers/pinctrl/qcom/pinctrl-ipq5332.c b/drivers/pinctrl/qcom/pinctrl-ipq5332.c
index 1ac2fc0..239cbe7 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ipq5332.c
+++ b/drivers/pinctrl/qcom/pinctrl-ipq5332.c
@@ -692,7 +692,7 @@ static const struct pinfunction ipq5332_functions[] = {
        MSM_PIN_FUNCTION(dbg_out),
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(lock_det),
        MSM_PIN_FUNCTION(mac0),
        MSM_PIN_FUNCTION(mac1),

diff --git a/drivers/pinctrl/qcom/pinctrl-ipq5424.c b/drivers/pinctrl/qcom/pinctrl-ipq5424.c
index 7ff1f8a..67b452a 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ipq5424.c
+++ b/drivers/pinctrl/qcom/pinctrl-ipq5424.c
@@ -641,7 +641,7 @@ static const struct pinfunction ipq5424_functions[] = {
        MSM_PIN_FUNCTION(dbg_out),
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(i2c0_scl),
        MSM_PIN_FUNCTION(i2c0_sda),
        MSM_PIN_FUNCTION(i2c1_scl),

diff --git a/drivers/pinctrl/qcom/pinctrl-ipq6018.c b/drivers/pinctrl/qcom/pinctrl-ipq6018.c
index a4ba980..be177fb 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ipq6018.c
+++ b/drivers/pinctrl/qcom/pinctrl-ipq6018.c
@@ -891,7 +891,7 @@ static const struct pinfunction ipq6018_functions[] = {
        MSM_PIN_FUNCTION(dbg_out),
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(lpass_aud),
        MSM_PIN_FUNCTION(lpass_aud0),
        MSM_PIN_FUNCTION(lpass_aud1),

diff --git a/drivers/pinctrl/qcom/pinctrl-ipq8074.c b/drivers/pinctrl/qcom/pinctrl-ipq8074.c
index 482f132..e94de90 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ipq8074.c
+++ b/drivers/pinctrl/qcom/pinctrl-ipq8074.c
@@ -838,7 +838,7 @@ static const struct pinfunction ipq8074_functions[] = {
        MSM_PIN_FUNCTION(dbg_out),
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(ldo_en),
        MSM_PIN_FUNCTION(ldo_update),
        MSM_PIN_FUNCTION(led0),

diff --git a/drivers/pinctrl/qcom/pinctrl-ipq9574.c b/drivers/pinctrl/qcom/pinctrl-ipq9574.c
index 89c05d8..3ed093e 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ipq9574.c
+++ b/drivers/pinctrl/qcom/pinctrl-ipq9574.c
@@ -651,7 +651,7 @@ static const struct pinfunction ipq9574_functions[] = {
        MSM_PIN_FUNCTION(dwc_ddrphy),
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(mac),
        MSM_PIN_FUNCTION(mdc),
        MSM_PIN_FUNCTION(mdio),

diff --git a/drivers/pinctrl/qcom/pinctrl-mdm9607.c b/drivers/pinctrl/qcom/pinctrl-mdm9607.c
index 3e18ba1..cef3305 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-mdm9607.c
+++ b/drivers/pinctrl/qcom/pinctrl-mdm9607.c
@@ -861,7 +861,7 @@ static const struct pinfunction mdm9607_functions[] = {
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
        MSM_PIN_FUNCTION(gmac_mdio),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gsm0_tx),
        MSM_PIN_FUNCTION(lcd_rst),
        MSM_PIN_FUNCTION(ldo_en),

diff --git a/drivers/pinctrl/qcom/pinctrl-mdm9615.c b/drivers/pinctrl/qcom/pinctrl-mdm9615.c
index bea1ca3..729fe3d 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-mdm9615.c
+++ b/drivers/pinctrl/qcom/pinctrl-mdm9615.c
@@ -313,7 +313,7 @@ static const char * const cdc_mclk_groups[] = {
 };
 
 static const struct pinfunction mdm9615_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gsbi2_i2c),
        MSM_PIN_FUNCTION(gsbi3),
        MSM_PIN_FUNCTION(gsbi4),

diff --git a/drivers/pinctrl/qcom/pinctrl-milos.c b/drivers/pinctrl/qcom/pinctrl-milos.c
index d11a7bb..19abd52 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-milos.c
+++ b/drivers/pinctrl/qcom/pinctrl-milos.c
@@ -974,7 +974,7 @@ static const char *const wcn_sw_ctrl_groups[] = {
 };
 
 static const struct pinfunction milos_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(aoss_cti),
        MSM_PIN_FUNCTION(atest_char),
        MSM_PIN_FUNCTION(atest_usb),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8226.c b/drivers/pinctrl/qcom/pinctrl-msm8226.c
index f9a9573..a81aa09 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8226.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8226.c
@@ -483,7 +483,7 @@ static const struct pinfunction msm8226_functions[] = {
        MSM_PIN_FUNCTION(cci_i2c0),
        MSM_PIN_FUNCTION(gp0_clk),
        MSM_PIN_FUNCTION(gp1_clk),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(sdc3),
        MSM_PIN_FUNCTION(wlan),
 };

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8660.c b/drivers/pinctrl/qcom/pinctrl-msm8660.c
index 4dbc19f..5ded003 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8660.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8660.c
@@ -714,7 +714,7 @@ static const char * const ebi2_groups[] = {
 };
 
 static const struct pinfunction msm8660_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(cam_mclk),
        MSM_PIN_FUNCTION(dsub),
        MSM_PIN_FUNCTION(ext_gps),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8909.c b/drivers/pinctrl/qcom/pinctrl-msm8909.c
index 0aa4f77..544a52f 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8909.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8909.c
@@ -696,7 +696,7 @@ static const struct pinfunction msm8909_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp3_clk_a),
        MSM_PIN_FUNCTION(gcc_gp3_clk_b),
        MSM_PIN_FUNCTION(gcc_plltest),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gsm0_tx),
        MSM_PIN_FUNCTION(ldo_en),
        MSM_PIN_FUNCTION(ldo_update),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8916.c b/drivers/pinctrl/qcom/pinctrl-msm8916.c
index 0dfc6dd..b1b6934 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8916.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8916.c
@@ -743,7 +743,7 @@ static const struct pinfunction msm8916_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp2_clk_b),
        MSM_PIN_FUNCTION(gcc_gp3_clk_a),
        MSM_PIN_FUNCTION(gcc_gp3_clk_b),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gsm0_tx0),
        MSM_PIN_FUNCTION(gsm0_tx1),
        MSM_PIN_FUNCTION(gsm1_tx0),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8917.c b/drivers/pinctrl/qcom/pinctrl-msm8917.c
index 2e1a94a..f23d92d 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8917.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8917.c
@@ -1302,7 +1302,7 @@ static const struct pinfunction msm8917_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp3_clk_b),
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gsm0_tx),
        MSM_PIN_FUNCTION(key_focus),
        MSM_PIN_FUNCTION(key_snapshot),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8953.c b/drivers/pinctrl/qcom/pinctrl-msm8953.c
index 9563833..67db062 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8953.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8953.c
@@ -1533,7 +1533,7 @@ static const struct pinfunction msm8953_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp3_clk_b),
        MSM_PIN_FUNCTION(gcc_plltest),
        MSM_PIN_FUNCTION(gcc_tlmm),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gsm0_tx),
        MSM_PIN_FUNCTION(gsm1_tx),
        MSM_PIN_FUNCTION(gyro_int),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8960.c b/drivers/pinctrl/qcom/pinctrl-msm8960.c
index a937ea8..2fb1520 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8960.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8960.c
@@ -974,7 +974,7 @@ static const struct pinfunction msm8960_functions[] = {
        MSM_PIN_FUNCTION(gp_pdm_1b),
        MSM_PIN_FUNCTION(gp_pdm_2a),
        MSM_PIN_FUNCTION(gp_pdm_2b),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gsbi1),
        MSM_PIN_FUNCTION(gsbi1_spi_cs1_n),
        MSM_PIN_FUNCTION(gsbi1_spi_cs2a_n),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8976.c b/drivers/pinctrl/qcom/pinctrl-msm8976.c
index 3bcb033..345539b 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8976.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8976.c
@@ -812,7 +812,7 @@ static const char * const ss_switch_groups[] = {
 };
 
 static const struct pinfunction msm8976_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(blsp_spi1),
        MSM_PIN_FUNCTION(smb_int),
        MSM_PIN_FUNCTION(blsp_i2c1),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8994.c b/drivers/pinctrl/qcom/pinctrl-msm8994.c
index 7a3b6cb..94e042d 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8994.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8994.c
@@ -1071,7 +1071,7 @@ static const struct pinfunction msm8994_functions[] = {
        MSM_PIN_FUNCTION(uim2),
        MSM_PIN_FUNCTION(uim3),
        MSM_PIN_FUNCTION(uim4),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
 };
 
 static const struct msm_pingroup msm8994_groups[] = {

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8996.c b/drivers/pinctrl/qcom/pinctrl-msm8996.c
index d86d831..e5b5569 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8996.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8996.c
@@ -1532,7 +1532,7 @@ static const struct pinfunction msm8996_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp2_clk_b),
        MSM_PIN_FUNCTION(gcc_gp3_clk_a),
        MSM_PIN_FUNCTION(gcc_gp3_clk_b),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gsm_tx),
        MSM_PIN_FUNCTION(hdmi_cec),
        MSM_PIN_FUNCTION(hdmi_ddc),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8998.c b/drivers/pinctrl/qcom/pinctrl-msm8998.c
index 1daee81..b727593 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8998.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8998.c
@@ -1160,7 +1160,7 @@ static const char * const mss_lte_groups[] = {
 };
 
 static const struct pinfunction msm8998_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(adsp_ext),
        MSM_PIN_FUNCTION(agera_pll),
        MSM_PIN_FUNCTION(atest_char),

diff --git a/drivers/pinctrl/qcom/pinctrl-msm8x74.c b/drivers/pinctrl/qcom/pinctrl-msm8x74.c
index 8253aa2..202bec0 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm8x74.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8x74.c
@@ -778,7 +778,7 @@ static const char * const slimbus_groups[] = { "gpio70", "gpio71" };
 static const char * const hsic_ctl_groups[] = { "hsic_strobe", "hsic_data" };
 
 static const struct pinfunction msm8x74_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(cci_i2c0),
        MSM_PIN_FUNCTION(cci_i2c1),
        MSM_PIN_FUNCTION(uim1),

diff --git a/drivers/pinctrl/qcom/pinctrl-qcm2290.c b/drivers/pinctrl/qcom/pinctrl-qcm2290.c
index eeeec64..3820095 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-qcm2290.c
+++ b/drivers/pinctrl/qcom/pinctrl-qcm2290.c
@@ -870,11 +870,11 @@ static const struct pinfunction qcm2290_functions[] = {
        MSM_PIN_FUNCTION(ddr_pxi1),
        MSM_PIN_FUNCTION(ddr_pxi2),
        MSM_PIN_FUNCTION(ddr_pxi3),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gp_pdm0),
        MSM_PIN_FUNCTION(gp_pdm1),
        MSM_PIN_FUNCTION(gp_pdm2),

diff --git a/drivers/pinctrl/qcom/pinctrl-qcs404.c b/drivers/pinctrl/qcom/pinctrl-qcs404.c
index 54e3b44..0b8db2c 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-qcs404.c
+++ b/drivers/pinctrl/qcom/pinctrl-qcs404.c
@@ -1296,7 +1296,7 @@ static const char * const i2s_3_ws_a_groups[] = {
 };
 
 static const struct pinfunction qcs404_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(hdmi_tx),
        MSM_PIN_FUNCTION(hdmi_ddc),
        MSM_PIN_FUNCTION(blsp_uart_tx_a2),

diff --git a/drivers/pinctrl/qcom/pinctrl-qcs615.c b/drivers/pinctrl/qcom/pinctrl-qcs615.c
index 2a943bc..4dfa820 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-qcs615.c
+++ b/drivers/pinctrl/qcom/pinctrl-qcs615.c
@@ -819,7 +819,7 @@ static const char *const wsa_data_groups[] = {
 };
 
 static const struct pinfunction qcs615_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(adsp_ext),
        MSM_PIN_FUNCTION(agera_pll),
        MSM_PIN_FUNCTION(aoss_cti),

diff --git a/drivers/pinctrl/qcom/pinctrl-qcs8300.c b/drivers/pinctrl/qcom/pinctrl-qcs8300.c
index d6437e2..f1af1a6 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-qcs8300.c
+++ b/drivers/pinctrl/qcom/pinctrl-qcs8300.c
@@ -929,7 +929,7 @@ static const char *const vsense_trigger_groups[] = {
 };
 
 static const struct pinfunction qcs8300_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(aoss_cti),
        MSM_PIN_FUNCTION(atest_char),
        MSM_PIN_FUNCTION(atest_usb2),
@@ -949,7 +949,7 @@ static const struct pinfunction qcs8300_functions[] = {
        MSM_PIN_FUNCTION(edp0_hot),
        MSM_PIN_FUNCTION(edp0_lcd),
        MSM_PIN_FUNCTION(edp1_lcd),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(emac0_mcg0),
        MSM_PIN_FUNCTION(emac0_mcg1),
        MSM_PIN_FUNCTION(emac0_mcg2),

diff --git a/drivers/pinctrl/qcom/pinctrl-qdu1000.c b/drivers/pinctrl/qcom/pinctrl-qdu1000.c
index eacb89f..7c53569 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-qdu1000.c
+++ b/drivers/pinctrl/qcom/pinctrl-qdu1000.c
@@ -904,7 +904,7 @@ static const char * const vsense_trigger_groups[] = {
 };
 
 static const struct pinfunction qdu1000_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(cmo_pri),
        MSM_PIN_FUNCTION(si5518_int),
        MSM_PIN_FUNCTION(atest_char),

diff --git a/drivers/pinctrl/qcom/pinctrl-sa8775p.c b/drivers/pinctrl/qcom/pinctrl-sa8775p.c
index 1b62eb3..53f28b9 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sa8775p.c
+++ b/drivers/pinctrl/qcom/pinctrl-sa8775p.c
@@ -1181,7 +1181,7 @@ static const char * const vsense_trigger_groups[] = {
 };
 
 static const struct pinfunction sa8775p_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(atest_char),
        MSM_PIN_FUNCTION(atest_usb2),
        MSM_PIN_FUNCTION(audio_ref),
@@ -1217,7 +1217,7 @@ static const struct pinfunction sa8775p_functions[] = {
        MSM_PIN_FUNCTION(edp2_lcd),
        MSM_PIN_FUNCTION(edp3_hot),
        MSM_PIN_FUNCTION(edp3_lcd),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(emac0_mcg0),
        MSM_PIN_FUNCTION(emac0_mcg1),
        MSM_PIN_FUNCTION(emac0_mcg2),

diff --git a/drivers/pinctrl/qcom/pinctrl-sar2130p.c b/drivers/pinctrl/qcom/pinctrl-sar2130p.c
index 3dd1b5e..4a53f4e 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sar2130p.c
+++ b/drivers/pinctrl/qcom/pinctrl-sar2130p.c
@@ -1128,7 +1128,7 @@ static const char * const vsense_trigger_groups[] = {
 };
 
 static const struct pinfunction sar2130p_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(qup0),
        MSM_PIN_FUNCTION(ibi_i3c),
        MSM_PIN_FUNCTION(jitter_bist),

diff --git a/drivers/pinctrl/qcom/pinctrl-sc7180.c b/drivers/pinctrl/qcom/pinctrl-sc7180.c
index c43fe10..3eae514 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sc7180.c
+++ b/drivers/pinctrl/qcom/pinctrl-sc7180.c
@@ -903,7 +903,7 @@ static const struct pinfunction sc7180_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gp_pdm0),
        MSM_PIN_FUNCTION(gp_pdm1),
        MSM_PIN_FUNCTION(gp_pdm2),

diff --git a/drivers/pinctrl/qcom/pinctrl-sc7280.c b/drivers/pinctrl/qcom/pinctrl-sc7280.c
index 1b070e9..44e0960 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sc7280.c
+++ b/drivers/pinctrl/qcom/pinctrl-sc7280.c
@@ -1153,11 +1153,11 @@ static const struct pinfunction sc7280_functions[] = {
        MSM_PIN_FUNCTION(dp_lcd),
        MSM_PIN_FUNCTION(edp_hot),
        MSM_PIN_FUNCTION(edp_lcd),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(host2wlan_sol),
        MSM_PIN_FUNCTION(ibi_i3c),
        MSM_PIN_FUNCTION(jitter_bist),

diff --git a/drivers/pinctrl/qcom/pinctrl-sc8180x.c b/drivers/pinctrl/qcom/pinctrl-sc8180x.c
index ae5134f..d9f9e3d 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sc8180x.c
+++ b/drivers/pinctrl/qcom/pinctrl-sc8180x.c
@@ -1272,7 +1272,7 @@ static const struct pinfunction sc8180x_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp3),
        MSM_PIN_FUNCTION(gcc_gp4),
        MSM_PIN_FUNCTION(gcc_gp5),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gps),
        MSM_PIN_FUNCTION(grfc),
        MSM_PIN_FUNCTION(hs1_mi2s),

diff --git a/drivers/pinctrl/qcom/pinctrl-sc8280xp.c b/drivers/pinctrl/qcom/pinctrl-sc8280xp.c
index 6ccd7e5..cf8297e 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sc8280xp.c
+++ b/drivers/pinctrl/qcom/pinctrl-sc8280xp.c
@@ -1506,7 +1506,7 @@ static const struct pinfunction sc8280xp_functions[] = {
        MSM_PIN_FUNCTION(edp2_lcd),
        MSM_PIN_FUNCTION(edp3_lcd),
        MSM_PIN_FUNCTION(edp_hot),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(emac0_dll),
        MSM_PIN_FUNCTION(emac0_mcg0),
        MSM_PIN_FUNCTION(emac0_mcg1),
@@ -1527,7 +1527,7 @@ static const struct pinfunction sc8280xp_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp3),
        MSM_PIN_FUNCTION(gcc_gp4),
        MSM_PIN_FUNCTION(gcc_gp5),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(hs1_mi2s),
        MSM_PIN_FUNCTION(hs2_mi2s),
        MSM_PIN_FUNCTION(hs3_mi2s),

diff --git a/drivers/pinctrl/qcom/pinctrl-sdm660.c b/drivers/pinctrl/qcom/pinctrl-sdm660.c
index 1a78288..687d986 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sdm660.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdm660.c
@@ -1157,7 +1157,7 @@ static const struct pinfunction sdm660_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gps_tx_a),
        MSM_PIN_FUNCTION(gps_tx_b),
        MSM_PIN_FUNCTION(gps_tx_c),

diff --git a/drivers/pinctrl/qcom/pinctrl-sdm670.c b/drivers/pinctrl/qcom/pinctrl-sdm670.c
index 0fe1fa9..486b72e 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sdm670.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdm670.c
@@ -991,7 +991,7 @@ static const char * const mss_lte_groups[] = {
 };
 
 static const struct pinfunction sdm670_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(adsp_ext),
        MSM_PIN_FUNCTION(agera_pll),
        MSM_PIN_FUNCTION(atest_char),

diff --git a/drivers/pinctrl/qcom/pinctrl-sdm845.c b/drivers/pinctrl/qcom/pinctrl-sdm845.c
index 0446e29..4cf8575 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sdm845.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdm845.c
@@ -976,7 +976,7 @@ static const char * const tsif1_sync_groups[] = {
 };
 
 static const struct pinfunction sdm845_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(adsp_ext),
        MSM_PIN_FUNCTION(agera_pll),
        MSM_PIN_FUNCTION(atest_char),

diff --git a/drivers/pinctrl/qcom/pinctrl-sdx55.c b/drivers/pinctrl/qcom/pinctrl-sdx55.c
index 2c17bf8..79a7010 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sdx55.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdx55.c
@@ -796,7 +796,7 @@ static const struct pinfunction sdx55_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
        MSM_PIN_FUNCTION(gcc_plltest),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(i2s_mclk),
        MSM_PIN_FUNCTION(jitter_bist),
        MSM_PIN_FUNCTION(ldo_en),

diff --git a/drivers/pinctrl/qcom/pinctrl-sdx65.c b/drivers/pinctrl/qcom/pinctrl-sdx65.c
index 85b5c02..cc8a99a 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sdx65.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdx65.c
@@ -732,7 +732,7 @@ static const struct pinfunction sdx65_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
        MSM_PIN_FUNCTION(gcc_plltest),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(i2s_mclk),
        MSM_PIN_FUNCTION(jitter_bist),
        MSM_PIN_FUNCTION(ldo_en),

diff --git a/drivers/pinctrl/qcom/pinctrl-sdx75.c b/drivers/pinctrl/qcom/pinctrl-sdx75.c
index ab13a3a..4078d83 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sdx75.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdx75.c
@@ -852,7 +852,7 @@ static const struct pinfunction sdx75_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp2_clk),
        MSM_PIN_FUNCTION(gcc_gp3_clk),
        MSM_PIN_FUNCTION(gcc_plltest),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(i2s_mclk),
        MSM_PIN_FUNCTION(jitter_bist),
        MSM_PIN_FUNCTION(ldo_en),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm4450.c b/drivers/pinctrl/qcom/pinctrl-sm4450.c
index 1ecdf1a..d51e271 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm4450.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm4450.c
@@ -722,7 +722,7 @@ static const char * const wlan1_adc_dtest1_groups[] = {
 };
 
 static const struct pinfunction sm4450_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(atest_char),
        MSM_PIN_FUNCTION(atest_usb0),
        MSM_PIN_FUNCTION(audio_ref_clk),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm6115.c b/drivers/pinctrl/qcom/pinctrl-sm6115.c
index c273efa..0670068 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm6115.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm6115.c
@@ -687,7 +687,7 @@ static const struct pinfunction sm6115_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gp_pdm0),
        MSM_PIN_FUNCTION(gp_pdm1),
        MSM_PIN_FUNCTION(gp_pdm2),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm6125.c b/drivers/pinctrl/qcom/pinctrl-sm6125.c
index 5092f20..5d3d1e4 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm6125.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm6125.c
@@ -943,7 +943,7 @@ static const char * const dmic1_data_groups[] = {
 
 static const struct pinfunction sm6125_functions[] = {
        MSM_PIN_FUNCTION(qup00),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(qdss),
        MSM_PIN_FUNCTION(qup01),
        MSM_PIN_FUNCTION(qup02),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm6350.c b/drivers/pinctrl/qcom/pinctrl-sm6350.c
index ba4686c..220fb58 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm6350.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm6350.c
@@ -1048,7 +1048,7 @@ static const struct pinfunction sm6350_functions[] = {
        MSM_PIN_FUNCTION(gp_pdm0),
        MSM_PIN_FUNCTION(gp_pdm1),
        MSM_PIN_FUNCTION(gp_pdm2),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gps_tx),
        MSM_PIN_FUNCTION(ibi_i3c),
        MSM_PIN_FUNCTION(jitter_bist),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm6375.c b/drivers/pinctrl/qcom/pinctrl-sm6375.c
index 4903157..08b8ef6 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm6375.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm6375.c
@@ -1172,7 +1172,7 @@ static const struct pinfunction sm6375_functions[] = {
        MSM_PIN_FUNCTION(gp_pdm0),
        MSM_PIN_FUNCTION(gp_pdm1),
        MSM_PIN_FUNCTION(gp_pdm2),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(gps_tx),
        MSM_PIN_FUNCTION(ibi_i3c),
        MSM_PIN_FUNCTION(jitter_bist),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm7150.c b/drivers/pinctrl/qcom/pinctrl-sm7150.c
index 6e89966..78dd815 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm7150.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm7150.c
@@ -960,7 +960,7 @@ static const char * const wsa_data_groups[] = {
 };
 
 static const struct pinfunction sm7150_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(adsp_ext),
        MSM_PIN_FUNCTION(agera_pll),
        MSM_PIN_FUNCTION(aoss_cti),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm8150.c b/drivers/pinctrl/qcom/pinctrl-sm8150.c
index 794ed99..ad861cd 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm8150.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm8150.c
@@ -1217,7 +1217,7 @@ static const struct pinfunction sm8150_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(hs1_mi2s),
        MSM_PIN_FUNCTION(hs2_mi2s),
        MSM_PIN_FUNCTION(hs3_mi2s),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm8250.c b/drivers/pinctrl/qcom/pinctrl-sm8250.c
index fb6f005..6021d9f 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm8250.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm8250.c
@@ -1021,7 +1021,7 @@ static const struct pinfunction sm8250_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(ibi_i3c),
        MSM_PIN_FUNCTION(jitter_bist),
        MSM_PIN_FUNCTION(lpass_slimbus),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm8350.c b/drivers/pinctrl/qcom/pinctrl-sm8350.c
index c8a3f39..99949b5 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm8350.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm8350.c
@@ -1267,7 +1267,7 @@ static const struct pinfunction sm8350_functions[] = {
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(ibi_i3c),
        MSM_PIN_FUNCTION(jitter_bist),
        MSM_PIN_FUNCTION(lpass_slimbus),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm8450.c b/drivers/pinctrl/qcom/pinctrl-sm8450.c
index f2e52d5..9889fc5 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm8450.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm8450.c
@@ -1269,7 +1269,7 @@ static const char * const vsense_trigger_groups[] = {
 };
 
 static const struct pinfunction sm8450_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(aon_cam),
        MSM_PIN_FUNCTION(atest_char),
        MSM_PIN_FUNCTION(atest_usb),
@@ -1291,7 +1291,7 @@ static const struct pinfunction sm8450_functions[] = {
        MSM_PIN_FUNCTION(ddr_pxi2),
        MSM_PIN_FUNCTION(ddr_pxi3),
        MSM_PIN_FUNCTION(dp_hot),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm8550.c b/drivers/pinctrl/qcom/pinctrl-sm8550.c
index 1b4496c..10a6203 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm8550.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm8550.c
@@ -1340,7 +1340,7 @@ static const char *const vsense_trigger_mirnat_groups[] = {
 };
 
 static const struct pinfunction sm8550_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(aon_cci),
        MSM_PIN_FUNCTION(aoss_cti),
        MSM_PIN_FUNCTION(atest_char),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm8650.c b/drivers/pinctrl/qcom/pinctrl-sm8650.c
index 449a007..e2ae038 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm8650.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm8650.c
@@ -1328,7 +1328,7 @@ static const char *const vsense_trigger_mirnat_groups[] = {
 };
 
 static const struct pinfunction sm8650_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(aoss_cti),
        MSM_PIN_FUNCTION(atest_char),
        MSM_PIN_FUNCTION(atest_usb),
@@ -1359,7 +1359,7 @@ static const struct pinfunction sm8650_functions[] = {
        MSM_PIN_FUNCTION(ddr_pxi3),
        MSM_PIN_FUNCTION(do_not),
        MSM_PIN_FUNCTION(dp_hot),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),

diff --git a/drivers/pinctrl/qcom/pinctrl-sm8750.c b/drivers/pinctrl/qcom/pinctrl-sm8750.c
index 8516693..6f92f17 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sm8750.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm8750.c
@@ -1290,7 +1290,7 @@ static const char *const wcn_sw_ctrl_groups[] = {
 };
 
 static const struct pinfunction sm8750_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(aoss_cti),
        MSM_PIN_FUNCTION(atest_char),
        MSM_PIN_FUNCTION(atest_usb),
@@ -1319,7 +1319,7 @@ static const struct pinfunction sm8750_functions[] = {
        MSM_PIN_FUNCTION(ddr_pxi2),
        MSM_PIN_FUNCTION(ddr_pxi3),
        MSM_PIN_FUNCTION(dp_hot),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),
        MSM_PIN_FUNCTION(gcc_gp3),

diff --git a/drivers/pinctrl/qcom/pinctrl-x1e80100.c b/drivers/pinctrl/qcom/pinctrl-x1e80100.c
index d4b215f..bb36f40 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-x1e80100.c
+++ b/drivers/pinctrl/qcom/pinctrl-x1e80100.c
@@ -1407,7 +1407,7 @@ static const char * const vsense_trigger_groups[] = {
 };
 
 static const struct pinfunction x1e80100_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(RESOUT_GPIO),
        MSM_PIN_FUNCTION(aon_cci),
        MSM_PIN_FUNCTION(aoss_cti),