status = "disabled";
                };
 
-               pm6150_gpio: gpios@c000 {
+               pm6150_gpio: gpio@c000 {
                        compatible = "qcom,pm6150-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                        status = "disabled";
                };
 
-               pm6150l_gpio: gpios@c000 {
+               pm6150l_gpio: gpio@c000 {
                        compatible = "qcom,pm6150l-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                        };
                };
 
-               pm6350_gpios: gpios@c000 {
+               pm6350_gpios: gpio@c000 {
                        compatible = "qcom,pm6350-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                        };
                };
 
-               pm660_gpios: gpios@c000 {
+               pm660_gpios: gpio@c000 {
                        compatible = "qcom,pm660-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                        #thermal-sensor-cells = <0>;
                };
 
-               pm660l_gpios: gpios@c000 {
+               pm660l_gpios: gpio@c000 {
                        compatible = "qcom,pm660l-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                        #thermal-sensor-cells = <0>;
                };
 
-               pm7325_gpios: gpios@8800 {
+               pm7325_gpios: gpio@8800 {
                        compatible = "qcom,pm7325-gpio", "qcom,spmi-gpio";
                        reg = <0x8800>;
                        gpio-controller;
 
                #address-cells = <1>;
                #size-cells = <0>;
 
-               pm8005_gpio: gpios@c000 {
+               pm8005_gpio: gpio@c000 {
                        compatible = "qcom,pm8005-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                        #interrupt-cells = <2>;
                };
 
-               pm8916_gpios: gpios@c000 {
+               pm8916_gpios: gpio@c000 {
                        compatible = "qcom,pm8916-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                        };
                };
 
-               pm8994_gpios: gpios@c000 {
+               pm8994_gpios: gpio@c000 {
                        compatible = "qcom,pm8994-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                        interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
                };
 
-               pm8998_gpio: gpios@c000 {
+               pm8998_gpio: gpio@c000 {
                        compatible = "qcom,pm8998-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                #address-cells = <1>;
                #size-cells = <0>;
 
-               pmi8994_gpios: gpios@c000 {
+               pmi8994_gpios: gpio@c000 {
                        compatible = "qcom,pmi8994-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;
 
                #address-cells = <1>;
                #size-cells = <0>;
 
-               pmi8998_gpio: gpios@c000 {
+               pmi8998_gpio: gpio@c000 {
                        compatible = "qcom,pmi8998-gpio", "qcom,spmi-gpio";
                        reg = <0xc000>;
                        gpio-controller;