arm64: dts: qcom: Use plural _gpios node label for PMIC gpios

The gpio node in PMIC dts'es define access to multiple GPIOs.  Most Qcom
PMICs were already using the plural _gpios label to point to this node,
but a few PMICs were left behind including the recently-pulled
pm(i)8950.

Rename it from *_gpio to *_gpios for pm6125, pm6150(l), pm8005,
pm(i)8950, and pm(i)8998.

Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221209220450.1793421-1-marijn.suijten@somainline.org

diff --git a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
index 310f7a2df1e83180652d1ae551737ea258a5e6ef..0e273938b59d2939e8163a4614e5164cefc569fd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
@@ -113,7 +113,7 @@
                            <&cam_snapshot_pin_a>;
                button-vol-up {
                        label = "Volume Up";
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_VOLUMEUP>;
                        gpio-key,wakeup;
@@ -122,7 +122,7 @@
 
                button-camera-snapshot {
                        label = "Camera Snapshot";
-                       gpios = <&pm8998_gpio 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 7 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_CAMERA>;
                        debounce-interval = <15>;
@@ -130,7 +130,7 @@
 
                button-camera-focus {
                        label = "Camera Focus";
-                       gpios = <&pm8998_gpio 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 8 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_CAMERA_FOCUS>;
                        debounce-interval = <15>;
@@ -338,7 +338,7 @@
        };
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        vol_up_pin_a: vol-up-active-state {
                pins = "gpio6";
                function = "normal";

diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
index 9fb1fb9b852983e5205971250879a17de0359425..d36b36af49d0b87786ca24646ae91b5f2614c777 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
@@ -23,7 +23,7 @@
                pinctrl-0 = <&button_backlight_default>;
 
                led-keypad-backlight {
-                       gpios = <&pmi8998_gpio 5 GPIO_ACTIVE_HIGH>;
+                       gpios = <&pmi8998_gpios 5 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_KBD_BACKLIGHT;
                        default-state = "off";
@@ -31,7 +31,7 @@
        };
 };
 
-&pmi8998_gpio {
+&pmi8998_gpios {
        button_backlight_default: button-backlight-state {
                pins = "gpio5";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
index 7d4a67d075010aa1bf8be6c29feae93c3fbd558d..ce03c7c239e53ddb90b276a79690553aa41477be 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
@@ -92,7 +92,7 @@
 
                button-vol-down {
                        label = "Volume down";
-                       gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEDOWN>;
                        debounce-interval = <15>;
                        wakeup-source;
@@ -100,7 +100,7 @@
 
                button-vol-up {
                        label = "Volume up";
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                        debounce-interval = <15>;
                        wakeup-source;
@@ -269,7 +269,7 @@
        };
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        vol_keys_default: vol-keys-state {
                pins = "gpio5", "gpio6";
                function = "normal";

diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
index 20fe0394a3c16c3b257bccdb51d3c398ac4d1fba..1868ad6494151b87806e7a9b9c52f5201e018ee6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
@@ -20,7 +20,7 @@
                regulator-max-microvolt = <1350000>;
                startup-delay-us = <0>;
                enable-active-high;
-               gpio = <&pmi8998_gpio 10 GPIO_ACTIVE_HIGH>;
+               gpio = <&pmi8998_gpios 10 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&disp_dvdd_en>;
        };
@@ -37,7 +37,7 @@
        qcom,soft-start-us = <200>;
 };
 
-&pmi8998_gpio {
+&pmi8998_gpios {
        disp_dvdd_en: disp-dvdd-en-active-state {
                pins = "gpio10";
                function = "normal";

diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
index 5da87baa2b23bbd3addf7cb0c3fc3b7fce33e251..1f64b70260fe05cb40392a9ab6d9c991cd8b7cc9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
@@ -25,7 +25,7 @@
                        pinctrl-names = "default";
                        clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
                        #clock-cells = <0>;
-                       enable-gpios = <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>;
+                       enable-gpios = <&pm8998_gpios 13 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -65,7 +65,7 @@
                regulator-name = "cam_vio_vreg";
                startup-delay-us = <0>;
                enable-active-high;
-               gpio = <&pmi8998_gpio 1 GPIO_ACTIVE_HIGH>;
+               gpio = <&pmi8998_gpios 1 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&cam_vio_default>;
                vin-supply = <&vreg_lvs1a_1p8>;
@@ -103,7 +103,7 @@
                            <&cam_snapshot_pin_a>;
                button-vol-down {
                        label = "Volume Down";
-                       gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_VOLUMEDOWN>;
                        gpio-key,wakeup;
@@ -112,7 +112,7 @@
 
                button-camera-snapshot {
                        label = "Camera Snapshot";
-                       gpios = <&pm8998_gpio 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 7 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_CAMERA>;
                        debounce-interval = <15>;
@@ -120,7 +120,7 @@
 
                button-camera-focus {
                        label = "Camera Focus";
-                       gpios = <&pm8998_gpio 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 8 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_CAMERA_FOCUS>;
                        debounce-interval = <15>;
@@ -187,7 +187,7 @@
 
        vibrator {
                compatible = "gpio-vibrator";
-               enable-gpios = <&pmi8998_gpio 5 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&pmi8998_gpios 5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&vib_default>;
        };
@@ -303,7 +303,7 @@
        };
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        vol_down_pin_a: vol-down-active-state {
                pins = "gpio5";
                function = PMIC_GPIO_FUNC_NORMAL;
@@ -335,7 +335,7 @@
        };
 };
 
-&pmi8998_gpio {
+&pmi8998_gpios {
        cam_vio_default: cam-vio-active-state {
                pins = "gpio1";
                function = PMIC_GPIO_FUNC_NORMAL;

diff --git a/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts b/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts
index b1aac7311ef964845ca6e47fc719c78b33f43f19..7956b151c7a4ca63429c0692d6396a527bc83a74 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts
@@ -133,7 +133,7 @@
 
                key-vol-up {
                        label = "Volume up";
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                        debounce-interval = <15>;
                        wakeup-source;
@@ -278,7 +278,7 @@
        };
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        vol_up_key_default: vol-up-key-default-state {
                pins = "gpio6";
                function = "normal";

diff --git a/arch/arm64/boot/dts/qcom/pm6125.dtsi b/arch/arm64/boot/dts/qcom/pm6125.dtsi
index 1c8ccda26ffb302c41436266227340307492dc9a..59092a551a161c395eb88349503487c2a8ec0fd8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm6125.dtsi
@@ -136,11 +136,11 @@
                        status = "disabled";
                };
 
-               pm6125_gpio: gpio@c000 {
+               pm6125_gpios: gpio@c000 {
                        compatible = "qcom,pm6125-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
-                       gpio-ranges = <&pm6125_gpio 0 0 9>;
+                       gpio-ranges = <&pm6125_gpios 0 0 9>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/pm6150.dtsi b/arch/arm64/boot/dts/qcom/pm6150.dtsi
index 3d91fb405ca2e4199416a2981b45122b32b06e85..2e6afa2961411bfc9092a724038fcd86d809a06c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm6150.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm6150.dtsi
@@ -88,11 +88,11 @@
                        status = "disabled";
                };
 
-               pm6150_gpio: gpio@c000 {
+               pm6150_gpios: gpio@c000 {
                        compatible = "qcom,pm6150-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
-                       gpio-ranges = <&pm6150_gpio 0 0 10>;
+                       gpio-ranges = <&pm6150_gpios 0 0 10>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/pm6150l.dtsi b/arch/arm64/boot/dts/qcom/pm6150l.dtsi
index 86e659fcbba6a9248294b0b270f1140974c35fb1..6f7aa67501e2702f5cf4408b3dc3855254f86700 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm6150l.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm6150l.dtsi
@@ -95,11 +95,11 @@
                        status = "disabled";
                };
 
-               pm6150l_gpio: gpio@c000 {
+               pm6150l_gpios: gpio@c000 {
                        compatible = "qcom,pm6150l-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
-                       gpio-ranges = <&pm6150l_gpio 0 0 12>;
+                       gpio-ranges = <&pm6150l_gpios 0 0 12>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/pm8005.dtsi b/arch/arm64/boot/dts/qcom/pm8005.dtsi
index 8d4b081b4e9dd6ce79f3afc6b9f6cc59fdd34c30..0f0ab2da8305587576968eec5172a388249611d9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8005.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8005.dtsi
@@ -11,11 +11,11 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               pm8005_gpio: gpio@c000 {
+               pm8005_gpios: gpio@c000 {
                        compatible = "qcom,pm8005-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
-                       gpio-ranges = <&pm8005_gpio 0 0 4>;
+                       gpio-ranges = <&pm8005_gpios 0 0 4>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/pm8950.dtsi b/arch/arm64/boot/dts/qcom/pm8950.dtsi
index 07c3896bd36fd0cc8b0b2b23ce199f34de2682dc..631761f989990813b45105727e79bc72f132fb62 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8950.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8950.dtsi
@@ -141,11 +141,11 @@
                        #interrupt-cells = <2>;
                };
 
-               pm8950_gpio: gpio@c000 {
+               pm8950_gpios: gpio@c000 {
                        compatible = "qcom,pm8950-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
-                       gpio-ranges = <&pm8950_gpio 0 0 8>;
+                       gpio-ranges = <&pm8950_gpios 0 0 8>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/pm8998.dtsi b/arch/arm64/boot/dts/qcom/pm8998.dtsi
index 6a5854333b2be5b1d563274b12838f733a61febe..adbba9f4089ab41f96512af921d12e1ab382457e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8998.dtsi
@@ -109,11 +109,11 @@
                        interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
                };
 
-               pm8998_gpio: gpio@c000 {
+               pm8998_gpios: gpio@c000 {
                        compatible = "qcom,pm8998-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
-                       gpio-ranges = <&pm8998_gpio 0 0 26>;
+                       gpio-ranges = <&pm8998_gpios 0 0 26>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/pmi8950.dtsi b/arch/arm64/boot/dts/qcom/pmi8950.dtsi
index 8008f02434a9e4e8d6c759e2b556dad5baa4a8f8..4891be3cd68a3ce082d4beab9384024dc89536d5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pmi8950.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmi8950.dtsi
@@ -67,11 +67,11 @@
                        #interrupt-cells = <2>;
                };
 
-               pmi8950_gpio: gpio@c000 {
+               pmi8950_gpios: gpio@c000 {
                        compatible = "qcom,pmi8950-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
-                       gpio-ranges = <&pmi8950_gpio 0 0 2>;
+                       gpio-ranges = <&pmi8950_gpios 0 0 2>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
index cd1caeae8281afeb5b13064ad2c4380d40a153c7..ffe587f281d8cdc81703d545b98b661e09b87853 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
@@ -9,11 +9,11 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               pmi8998_gpio: gpio@c000 {
+               pmi8998_gpios: gpio@c000 {
                        compatible = "qcom,pmi8998-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
-                       gpio-ranges = <&pmi8998_gpio 0 0 14>;
+                       gpio-ranges = <&pmi8998_gpios 0 0 14>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index b27b5f0e2b6b2dda81214043b8a27f25cc96e70a..c7a22c7976b7b16b13738a425a3ad41c09378d5d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -304,7 +304,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&disp_pins>;
 
-               reset-gpios = <&pm6150l_gpio 3 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&pm6150l_gpios 3 GPIO_ACTIVE_HIGH>;
 
                ports {
                        #address-cells = <1>;
@@ -485,7 +485,7 @@
 
 /* PINCTRL - additions to nodes defined in sc7180.dtsi */
 
-&pm6150l_gpio {
+&pm6150l_gpios {
        disp_pins: disp-state {
                pinconf {
                        pins = "gpio3";

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 670a7d174e5d7d7bf037157eaffa8ae8409b563b..edb56c4d55a21c47685a26f6aef406e53f9f95d0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -1159,11 +1159,11 @@ ap_spi_fp: &spi10 {
 
 /* PINCTRL - board-specific pinctrl */
 
-&pm6150_gpio {
+&pm6150_gpios {
        status = "disabled"; /* No GPIOs are connected */
 };
 
-&pm6150l_gpio {
+&pm6150l_gpios {
        gpio-line-names = "AP_SUSPEND",
                          "",
                          "",

diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index ca676e04687b0e7aeda9035594f9daf0c19754be..ab9bf52829104ab0b84e225fb1705462ef8c4ef7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -1096,7 +1096,7 @@ ap_ts_i2c: &i2c14 {
 };
 
 /* PINCTRL - board-specific pinctrl */
-&pm8005_gpio {
+&pm8005_gpios {
        gpio-line-names = "",
                          "",
                          "SLB",
@@ -1130,7 +1130,7 @@ ap_ts_i2c: &i2c14 {
        };
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        gpio-line-names = "",
                          "",
                          "SW_CTRL",

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index f41c6d600ea8c80a7baf74f0effb6f643452e30b..7c3efe3cbf5bed52257f02e8861dea432a84227f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -54,7 +54,7 @@
                key-vol-up {
                        label = "Volume Up";
                        linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -65,7 +65,7 @@
                        label = "green:user4";
                        function = LED_FUNCTION_INDICATOR;
                        color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>;
+                       gpios = <&pm8998_gpios 13 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "panic-indicator";
                        default-state = "off";
                };
@@ -74,7 +74,7 @@
                        label = "yellow:wlan";
                        function = LED_FUNCTION_WLAN;
                        color = <LED_COLOR_ID_YELLOW>;
-                       gpios = <&pm8998_gpio 9 GPIO_ACTIVE_HIGH>;
+                       gpios = <&pm8998_gpios 9 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tx";
                        default-state = "off";
                };
@@ -83,7 +83,7 @@
                        label = "blue:bt";
                        function = LED_FUNCTION_BLUETOOTH;
                        color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&pm8998_gpio 5 GPIO_ACTIVE_HIGH>;
+                       gpios = <&pm8998_gpios 5 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "bluetooth-power";
                        default-state = "off";
                };
@@ -148,7 +148,7 @@
                regulator-min-microvolt = <1200000>;
                regulator-max-microvolt = <1200000>;
                enable-active-high;
-               gpio = <&pm8998_gpio 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&pm8998_gpios 12 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&cam0_dvdd_1v2_en_default>;
                vin-supply = <&vbat>;
@@ -160,7 +160,7 @@
                regulator-min-microvolt = <2800000>;
                regulator-max-microvolt = <2800000>;
                enable-active-high;
-               gpio = <&pm8998_gpio 10 GPIO_ACTIVE_HIGH>;
+               gpio = <&pm8998_gpios 10 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&cam0_avdd_2v8_en_default>;
                vin-supply = <&vbat>;
@@ -559,7 +559,7 @@
        vdda-pll-supply = <&vreg_l26a_1p2>;
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        gpio-line-names =
                "NC",
                "NC",
@@ -1170,7 +1170,7 @@
        };
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
 
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
index 1eb423e4be24c867453b78cd703bd70e2ec46065..f54d3302fb8ae1838e424e6db4fe4c6f42a1a2f7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -132,7 +132,7 @@
                key-vol-up {
                        label = "Volume up";
                        linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -603,7 +603,7 @@
        };
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        vol_up_pin_a: vol-up-active-state {
                pins = "gpio6";
                function = "normal";

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 42cf4dd5ea284b492435a4a4b7c47051487d17ee..f5751f3244cb52e111fce26955b21f78d008c06f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -37,14 +37,14 @@
                key-vol-down {
                        label = "Volume down";
                        linux,code = <KEY_VOLUMEDOWN>;
-                       gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
                        debounce-interval = <15>;
                };
 
                key-vol-up {
                        label = "Volume up";
                        linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                        debounce-interval = <15>;
                };
        };
@@ -440,7 +440,7 @@
        firmware-name = "qcom/sdm845/oneplus6/mba.mbn", "qcom/sdm845/oneplus6/modem.mbn";
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        volume_down_gpio: pm8998-gpio5-state {
                pinconf {
                        pins = "gpio5";

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index bb77ccfdc68c08002378ec71fa3305c44adcd882..1934662c2bde20894155b39e95530c5c9ec4bc3c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -54,7 +54,7 @@
                key-vol-up {
                        label = "volume_up";
                        linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                        debounce-interval = <15>;
                };
        };
@@ -510,7 +510,7 @@
        firmware-name = "qcom/sdm845/axolotl/mba.mbn", "qcom/sdm845/axolotl/modem.mbn";
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        volume_up_gpio: pm8998-gpio6-state {
                pinconf {
                        pins = "gpio6";

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index 87dd0fc3674762bc9d4404a79f04c3bf94aa1733..df92e8d7bf303916759a8d25493d269dc1651044 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -21,7 +21,7 @@
 
                key-vol-down {
                        label = "volume_down";
-                       gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEDOWN>;
                        debounce-interval = <15>;
                        gpio-key,wakeup;

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index eb6b2b676eca4a2b16ce7fd5efa61581cae720da..ba5a37cb3c9ebf6b2fddd7f76227f8eb6d7b16e6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -46,7 +46,7 @@
                key-vol-up {
                        label = "Volume Up";
                        linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -304,7 +304,7 @@
        firmware-name = "qcom/sdm845/beryllium/ipa_fws.mbn";
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        vol_up_pin_a: vol-up-active-state {
                pins = "gpio6";
                function = "normal";

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 38ba809a95cd6066c5cc411ed64dbe336ee52620..46346f7146eda98769a3e14d4cc7a7b89e6d3d15 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -55,7 +55,7 @@
                key-vol-up {
                        label = "Volume Up";
                        linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
                        debounce-interval = <15>;
                };
        };
@@ -518,7 +518,7 @@
        status = "okay";
 };
 
-&pm8998_gpio {
+&pm8998_gpios {
        volume_up_gpio: pm8998-gpio6-state {
                pinconf {
                        qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;

diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
index 409cef1b4a02a5d5e92cb20759c0f9a521b5a382..4ce2d905d70e1c7e7df669036f6a9db8c38d689e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
@@ -46,7 +46,7 @@
                key-volume-up {
                        label = "Volume Up";
                        linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&pm6125_gpio 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&pm6125_gpios 5 GPIO_ACTIVE_LOW>;
                        debounce-interval = <15>;
                        linux,can-disable;
                        gpio-key,wakeup;
@@ -59,7 +59,7 @@
        status = "disabled";
 };
 
-&pm6125_gpio {
+&pm6125_gpios {
        vol_up_n: vol-up-n-state {
                pins = "gpio5";
                function = "normal";

diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
index 0de6c5b7f742efda553191ec14ab42aee83d5054..650819c028b61eeec9aafa1d4f5e712b36c1fc97 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
@@ -217,7 +217,7 @@
        };
 };
 
-&pm6125_gpio {
+&pm6125_gpios {
        camera_flash_therm: camera-flash-therm-state {
                pins = "gpio3";
                function = PMIC_GPIO_FUNC_NORMAL;