ARM: dts: qcom-msm8974*: Clean up old GPIO declarations

Remove unneeded level of nesting, as it does not match the current DTS
style.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-21-konrad.dybcio@somainline.org

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 7e4e723f1dc34c519a7868c5784de8bf718fdf2b..52b3f055e834d53eb4a12a356303009292a2278b 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -573,12 +573,10 @@
        };
 
        mpu6515_pin: mpu6515 {
-               irq {
-                       pins = "gpio73";
-                       function = "gpio";
-                       bias-disable;
-                       input-enable;
-               };
+               pins = "gpio73";
+               function = "gpio";
+               bias-disable;
+               input-enable;
        };
 
        touch_pin: touch {
@@ -601,13 +599,10 @@
        };
 
        panel_pin: panel {
-               te {
-                       pins = "gpio12";
-                       function = "mdp_vsync";
-
-                       drive-strength = <2>;
-                       bias-disable;
-               };
+               pins = "gpio12";
+               function = "mdp_vsync";
+               drive-strength = <2>;
+               bias-disable;
        };
 
        bt_pin: bt {

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 c2e423d2a21e70611df6a72acbc3e733b8af725a..1120972ae4d2845eb2ee8ff3353fee409140486f 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -375,14 +375,11 @@
 
 &tlmm {
        ts_int_pin: touch-int {
-               pin {
-                       pins = "gpio61";
-                       function = "gpio";
-
-                       drive-strength = <2>;
-                       bias-disable;
-                       input-enable;
-               };
+               pins = "gpio61";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-disable;
+               input-enable;
        };
 
        sdc1_on: sdc1-on {

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
index c8151a665ea7b2601e80434cbcb9b2806057c38e..edf374da352a5b8c97477a45fc76190c648248d8 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
@@ -778,50 +778,37 @@
        };
 
        i2c_touchkey_pins: i2c-touchkey {
-               mux {
-                       pins = "gpio95", "gpio96";
-                       function = "gpio";
-                       input-enable;
-                       bias-pull-up;
-               };
+               pins = "gpio95", "gpio96";
+               function = "gpio";
+               input-enable;
+               bias-pull-up;
        };
 
        i2c_led_gpioex_pins: i2c-led-gpioex {
-               mux {
-                       pins = "gpio120", "gpio121";
-                       function = "gpio";
-                       input-enable;
-                       bias-pull-down;
-               };
+               pins = "gpio120", "gpio121";
+               function = "gpio";
+               input-enable;
+               bias-pull-down;
        };
 
        gpioex_pin: gpioex {
-               res {
-                       pins = "gpio145";
-                       function = "gpio";
-
-                       bias-pull-up;
-                       drive-strength = <2>;
-               };
+               pins = "gpio145";
+               function = "gpio";
+               bias-pull-up;
+               drive-strength = <2>;
        };
 
        wifi_pin: wifi {
-               int {
-                       pins = "gpio92";
-                       function = "gpio";
-
-                       input-enable;
-                       bias-pull-down;
-               };
+               pins = "gpio92";
+               function = "gpio";
+               input-enable;
+               bias-pull-down;
        };
 
        panel_te_pin: panel {
-               te {
-                       pins = "gpio12";
-                       function = "mdp_vsync";
-
-                       drive-strength = <2>;
-                       bias-disable;
-               };
+               pins = "gpio12";
+               function = "mdp_vsync";
+               drive-strength = <2>;
+               bias-disable;
        };
 };