ARM: dts: qcom: align PMIC GPIO pin configuration with DT schema

DT schema expects PMIC GPIO pin configuration nodes to be named with
'-state' suffix.  Optional children should be either 'pinconf' or
followed with '-pins' suffix.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220507194913.261121-10-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
index 138d6478ac84e3cebaebc9f27e10e4ec4872364b..a104acbfee05b89db73b504919d7ab3f66136839 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
@@ -273,7 +273,7 @@
                                };
 
                                gpio@150 {
-                                       dragon_ethernet_gpios: ethernet-gpios {
+                                       dragon_ethernet_gpios: ethernet-state {
                                                pinconf {
                                                        pins = "gpio7";
                                                        function = "normal";
@@ -282,7 +282,7 @@
                                                        power-source = <PM8058_GPIO_S3>;
                                                };
                                        };
-                                       dragon_bmp085_gpios: bmp085-gpios {
+                                       dragon_bmp085_gpios: bmp085-state {
                                                pinconf {
                                                        pins = "gpio16";
                                                        function = "normal";
@@ -291,7 +291,7 @@
                                                        power-source = <PM8058_GPIO_S3>;
                                                };
                                        };
-                                       dragon_mpu3050_gpios: mpu3050-gpios {
+                                       dragon_mpu3050_gpios: mpu3050-state {
                                                pinconf {
                                                        pins = "gpio17";
                                                        function = "normal";
@@ -300,7 +300,7 @@
                                                        power-source = <PM8058_GPIO_S3>;
                                                };
                                        };
-                                       dragon_sdcc3_gpios: sdcc3-gpios {
+                                       dragon_sdcc3_gpios: sdcc3-state {
                                                pinconf {
                                                        pins = "gpio22";
                                                        function = "normal";
@@ -309,7 +309,7 @@
                                                        power-source = <PM8058_GPIO_S3>;
                                                };
                                        };
-                                       dragon_sdcc5_gpios: sdcc5-gpios {
+                                       dragon_sdcc5_gpios: sdcc5-state {
                                                pinconf {
                                                        pins = "gpio26";
                                                        function = "normal";
@@ -319,7 +319,7 @@
                                                        power-source = <PM8058_GPIO_S3>;
                                                };
                                        };
-                                       dragon_ak8975_gpios: ak8975-gpios {
+                                       dragon_ak8975_gpios: ak8975-state {
                                                pinconf {
                                                        pins = "gpio33";
                                                        function = "normal";
@@ -328,9 +328,9 @@
                                                        power-source = <PM8058_GPIO_S3>;
                                                };
                                        };
-                                       dragon_cm3605_gpios: cm3605-gpios {
+                                       dragon_cm3605_gpios: cm3605-state {
                                                /* Pin 34 connected to the proxy IRQ */
-                                               pinconf_gpio34 {
+                                               gpio34-pins {
                                                        pins = "gpio34";
                                                        function = "normal";
                                                        input-enable;
@@ -338,7 +338,7 @@
                                                        power-source = <PM8058_GPIO_S3>;
                                                };
                                                /* Pin 35 connected to ASET */
-                                               pinconf_gpio35 {
+                                               gpio35-pins {
                                                        pins = "gpio35";
                                                        function = "normal";
                                                        output-high;
@@ -346,7 +346,7 @@
                                                        power-source = <PM8058_GPIO_S3>;
                                                };
                                        };
-                                       dragon_veth_gpios: veth-gpios {
+                                       dragon_veth_gpios: veth-state {
                                                pinconf {
                                                        pins = "gpio40";
                                                        function = "normal";

diff --git a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
index e068a8d0adf0babffb3a3632cf07d758d6286ec7..7e57a0750320bdb5022de7cbd8fbd58baa5cb2f1 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
@@ -196,8 +196,8 @@
                qcom,ssbi@500000 {
                        pmic@0 {
                                gpio@150 {
-                                       wlan_default_gpios: wlan-gpios {
-                                               pios {
+                                       wlan_default_gpios: wlan-gpios-state {
+                                               pinconf {
                                                        pins = "gpio43";
                                                        function = "normal";
                                                        bias-disable;

diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
index 2638b380be20146657f6c291cb55d4ed49d87888..77e8412436465bcb2a3203d2178fef1fda5ae964 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
@@ -291,8 +291,8 @@
                qcom,ssbi@500000 {
                        pmic@0 {
                                gpio@150 {
-                                       wlan_default_gpios: wlan-gpios {
-                                               pios {
+                                       wlan_default_gpios: wlan-gpios-state {
+                                               pinconf {
                                                        pins = "gpio43";
                                                        function = "normal";
                                                        bias-disable;
@@ -300,8 +300,8 @@
                                                };
                                        };
 
-                                       notify_led: nled {
-                                               pios {
+                                       notify_led: nled-state {
+                                               pinconf {
                                                        pins = "gpio18";
                                                        function = "normal";
                                                        bias-disable;

diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
index 0cee62c7b8b0466020b9edb6946ffbb499bf980c..3cf79cc5b53931719a65406dcb6244288600aa05 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
@@ -334,7 +334,7 @@
                qcom,ssbi@500000 {
                        pmic@0 {
                                gpio@150 {
-                                       gpio_keys_pin_a: gpio-keys-pin-active {
+                                       gpio_keys_pin_a: gpio-keys-active-state {
                                                pins = "gpio3", "gpio4", "gpio29", "gpio35";
                                                function = "normal";
 

diff --git a/arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi
index 10ad929759ed798e85cbc7768b9b989984f4ccdc..49de1821ac3a81ee0800378381ef58065e704086 100644 (file)
--- a/arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi
+++ b/arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi
@@ -114,7 +114,7 @@
 };
 
 &pmicgpio {
-       usb_vbus_5v_pins: usb_vbus_5v_pins {
+       usb_vbus_5v_pins: usb-vbus-5v-state {
                pins = "gpio4";
                function = "normal";
                output-high;

diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
index 9493886a5c0dd7302b9daf6d20797ab9045ee19e..4d8fc8689d24706a4f69366767c1cb82a1109ab3 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -272,7 +272,7 @@
 };
 
 &pm8941_gpios {
-       gpio_keys_pin_a: gpio-keys-active {
+       gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio2", "gpio3";
                function = "normal";
 
@@ -280,7 +280,7 @@
                power-source = <PM8941_GPIO_S3>;
        };
 
-       fuelgauge_pin: fuelgauge-int {
+       fuelgauge_pin: fuelgauge-int-state {
                pins = "gpio9";
                function = "normal";
 
@@ -289,7 +289,7 @@
                power-source = <PM8941_GPIO_S3>;
        };
 
-       wlan_sleep_clk_pin: wl-sleep-clk {
+       wlan_sleep_clk_pin: wl-sleep-clk-state {
                pins = "gpio16";
                function = "func2";
 
@@ -297,7 +297,7 @@
                power-source = <PM8941_GPIO_S3>;
        };
 
-       wlan_regulator_pin: wl-reg-active {
+       wlan_regulator_pin: wl-reg-active-state {
                pins = "gpio17";
                function = "normal";
 

diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
index 1d21de46f85c7d4c2e7cf31d297b08c0970e466e..a4fec2d0d1583ff4c02d95c507011099c15605e4 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -163,7 +163,7 @@
 };
 
 &pm8941_gpios {
-       gpio_keys_pin_a: gpio-keys-active {
+       gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio2", "gpio3", "gpio4", "gpio5";
                function = "normal";
 

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
index 58cb2ce1e4dfed2c95a8b426ef97169367162ac7..1c9f04322672343919c42b37b3c18ee8d4fedb43 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
@@ -110,7 +110,7 @@
 };
 
 &pm8941_gpios {
-       gpio_keys_pin_a: gpio-keys-active {
+       gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio1", "gpio2", "gpio5";
                function = "normal";
 

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
index d6b2300a8223110fd1d6b0d44a8c4c3aacb800ac..90f7a399f40bf4be14f25667957d64d1b1d319bb 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
@@ -398,7 +398,7 @@
 };
 
 &pma8084_gpios {
-       gpio_keys_pin_a: gpio-keys-active {
+       gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio2", "gpio3", "gpio5";
                function = "normal";
 
@@ -406,7 +406,7 @@
                power-source = <PMA8084_GPIO_S4>;
        };
 
-       touchkey_pin: touchkey-int-pin {
+       touchkey_pin: touchkey-int-state {
                pins = "gpio6";
                function = "normal";
                bias-disable;
@@ -414,7 +414,7 @@
                power-source = <PMA8084_GPIO_S4>;
        };
 
-       touch_pin: touchscreen-int-pin {
+       touch_pin: touchscreen-int-state {
                pins = "gpio8";
                function = "normal";
                bias-disable;
@@ -422,7 +422,7 @@
                power-source = <PMA8084_GPIO_S4>;
        };
 
-       panel_en_pin: panel-en-pin {
+       panel_en_pin: panel-en-state {
                pins = "gpio14";
                function = "normal";
                bias-pull-up;
@@ -430,7 +430,7 @@
                qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
        };
 
-       wlan_sleep_clk_pin: wlan-sleep-clk-pin {
+       wlan_sleep_clk_pin: wlan-sleep-clk-state {
                pins = "gpio16";
                function = "func2";
 
@@ -439,7 +439,7 @@
                qcom,drive-strength = <PMIC_GPIO_STRENGTH_HIGH>;
        };
 
-       panel_rst_pin: panel-rst-pin {
+       panel_rst_pin: panel-rst-state {
                pins = "gpio17";
                function = "normal";
                bias-disable;
@@ -447,7 +447,7 @@
                qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
        };
 
-       fuelgauge_pin: fuelgauge-int-pin {
+       fuelgauge_pin: fuelgauge-int-state {
                pins = "gpio21";
                function = "normal";
                bias-disable;

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index 9bd8faea61a569a2d78680312fb1ae8cced1d877..e9bcd3b4ebb3abc8a48f921d28b5d58091ba212f 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -244,7 +244,7 @@
 };
 
 &pm8941_gpios {
-       gpio_keys_pin_a: gpio-keys-active {
+       gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio2", "gpio5";
                function = "normal";
 
@@ -252,7 +252,7 @@
                power-source = <PM8941_GPIO_S3>;
        };
 
-       bt_reg_on_pin: bt-reg-on {
+       bt_reg_on_pin: bt-reg-on-state {
                pins = "gpio16";
                function = "normal";
 
@@ -260,7 +260,7 @@
                power-source = <PM8941_GPIO_S3>;
        };
 
-       wlan_sleep_clk_pin: wl-sleep-clk {
+       wlan_sleep_clk_pin: wl-sleep-clk-state {
                pins = "gpio17";
                function = "func2";
 
@@ -268,7 +268,7 @@
                power-source = <PM8941_GPIO_S3>;
        };
 
-       wlan_regulator_pin: wl-reg-active {
+       wlan_regulator_pin: wl-reg-active-state {
                pins = "gpio18";
                function = "normal";
 
@@ -276,7 +276,7 @@
                power-source = <PM8941_GPIO_S3>;
        };
 
-       lcd_dcdc_en_pin_a: lcd-dcdc-en-active {
+       lcd_dcdc_en_pin_a: lcd-dcdc-en-active-state {
                pins = "gpio20";
                function = "normal";
 

diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
index cdd2bdb77b329c90a6a7708b02c01a1c28789c34..a68634397938f85cd3c436112ca7d233cc78e70a 100644 (file)
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -68,7 +68,7 @@
                        interrupt-controller;
                        #interrupt-cells = <2>;
 
-                       boost_bypass_n_pin: boost-bypass {
+                       boost_bypass_n_pin: boost-bypass-state {
                                pins = "gpio21";
                                function = "normal";
                        };