arm64: dts: qcom: use GPIO flags for tlmm

Use respective GPIO_ACTIVE_LOW/HIGH flags for tlmm GPIOs.  Include
gpio.h header if this is first usage of that flag.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220802153947.44457-4-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
index 567b331..92f2648 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
@@ -368,7 +368,7 @@
 
        bus-width = <4>;
 
-       cd-gpios = <&tlmm 38 0x1>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 
        vmmc-supply = <&vreg_l21a_2p95>;
        vqmmc-supply = <&vreg_l13a_2p95>;

diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
index f430d79..ff60b70 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -471,7 +471,7 @@
 &sdhc2 {
        status = "okay";
 
-       cd-gpios = <&tlmm 100 0>;
+       cd-gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>;
        vmmc-supply = <&pm8994_l21>;
        vqmmc-supply = <&pm8994_l13>;
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 8bc6c07..86ef009 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -6,6 +6,7 @@
 #include <dt-bindings/clock/qcom,gcc-msm8994.h>
 #include <dt-bindings/clock/qcom,mmcc-msm8994.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 
 / {
@@ -502,7 +503,7 @@
                        pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
                        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
 
-                       cd-gpios = <&tlmm 100 0>;
+                       cd-gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>;
                        bus-width = <4>;
                        status = "disabled";
                };

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 1663745..1e6b705 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -7,6 +7,7 @@
 #include <dt-bindings/clock/qcom,mmcc-msm8996.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/interconnect/qcom,msm8996.h>
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/soc/qcom,apr.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -3337,7 +3338,7 @@
                                        interrupt-names = "intr1", "intr2";
                                        interrupt-controller;
                                        #interrupt-cells = <1>;
-                                       reset-gpios = <&tlmm 64 0>;
+                                       reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;
 
                                        slim-ifc-dev = <&tasha_ifd>;
 

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 4573d2e..132417e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -1081,7 +1081,7 @@
        pinctrl-names = "default";
        clock-names = "extclk";
        clocks = <&rpmhcc RPMH_LN_BB_CLK2>;
-       reset-gpios = <&tlmm 64 0>;
+       reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;
        vdd-buck-supply = <&vreg_s4a_1p8>;
        vdd-buck-sido-supply = <&vreg_s4a_1p8>;
        vdd-tx-supply = <&vreg_s4a_1p8>;
@@ -1251,7 +1251,7 @@
                reg = <0x60>;
 
                // CAM3_RST_N
-               enable-gpios = <&tlmm 21 0>;
+               enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&cam3_default>;
 

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
index 82c27f9..0f470cf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
@@ -546,7 +546,7 @@
        pinctrl-names = "default";
        clock-names = "extclk";
        clocks = <&rpmhcc RPMH_LN_BB_CLK2>;
-       reset-gpios = <&tlmm 64 0>;
+       reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;
        vdd-buck-supply = <&vreg_s4a_1p8>;
        vdd-buck-sido-supply = <&vreg_s4a_1p8>;
        vdd-tx-supply = <&vreg_s4a_1p8>;

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index dba7c26..fc0505e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -126,7 +126,7 @@
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
 
-               gpio = <&tlmm 23 0>;
+               gpio = <&tlmm 23 GPIO_ACTIVE_HIGH>;
                regulator-always-on;
                regulator-boot-on;
                enable-active-high;
@@ -712,7 +712,7 @@
        pinctrl-names = "default";
        clock-names = "extclk";
        clocks = <&rpmhcc RPMH_LN_BB_CLK2>;
-       reset-gpios = <&tlmm 64 0>;
+       reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;
        vdd-buck-sido-supply = <&vreg_s4a_1p8>;
        vdd-buck-supply = <&vreg_s4a_1p8>;
        vdd-tx-supply = <&vreg_s4a_1p8>;

diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index a7af1be..be59a8b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -772,7 +772,7 @@
        pinctrl-names = "default";
        clock-names = "extclk";
        clocks = <&rpmhcc RPMH_LN_BB_CLK2>;
-       reset-gpios = <&tlmm 64 0>;
+       reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;
        vdd-buck-supply = <&vreg_s4a_1p8>;
        vdd-buck-sido-supply = <&vreg_s4a_1p8>;
        vdd-tx-supply = <&vreg_s4a_1p8>;

diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
index b0315ee..f954fe5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
@@ -704,7 +704,7 @@
        pinctrl-names = "default";
        clock-names = "extclk";
        clocks = <&rpmhcc RPMH_LN_BB_CLK2>;
-       reset-gpios = <&tlmm 64 0>;
+       reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;
        vdd-buck-supply = <&vreg_s4a_1p8>;
        vdd-buck-sido-supply = <&vreg_s4a_1p8>;
        vdd-tx-supply = <&vreg_s4a_1p8>;

diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 7ab3627..a102aa5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -635,7 +635,7 @@
        wcd938x: codec {
                compatible = "qcom,wcd9380-codec";
                #sound-dai-cells = <1>;
-               reset-gpios = <&tlmm 32 0>;
+               reset-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
                vdd-buck-supply = <&vreg_s4a_1p8>;
                vdd-rxtx-supply = <&vreg_s4a_1p8>;
                vdd-io-supply = <&vreg_s4a_1p8>;