Commit 36c9d012 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220802153947.44457-4-krzysztof.kozlowski@linaro.org
parent a64f7d41

arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ &sdhc2 { 


	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>;

arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ &sdhc1 { 
&sdhc2 {

	status = "okay";



	cd-gpios = <&tlmm 100 0>;

	cd-gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>;

	vmmc-supply = <&pm8994_l21>;

	vqmmc-supply = <&pm8994_l13>;

};

arch/arm64/boot/dts/qcom/msm8994.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -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 @@ sdhc2: mmc@f98a4900 { 
			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";

		};

arch/arm64/boot/dts/qcom/msm8996.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -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 @@ wcd9335: codec@1{ 
					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>;

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

+2 −2
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ &wcd9340{ 
	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 @@ camera@60 { 
		reg = <0x60>;



		// CAM3_RST_N

		enable-gpios = <&tlmm 21 0>;

		enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&cam3_default>;