Skip to content

Commit

Permalink
arm64: dts: qcom: use GPIO flags for tlmm
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
Krzysztof Kozlowski authored and Bjorn Andersson committed Aug 29, 2022
1 parent a64f7d4 commit 36c9d01
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm64/boot/dts/qcom/msm8994.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

/ {
Expand Down Expand Up @@ -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";
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm64/boot/dts/qcom/msm8996.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>;

Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/qcom/sdm845-db845c.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/sm8250-mtp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down

0 comments on commit 36c9d01

Please sign in to comment.