Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98760d8f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Properly configure GPIO 54 53"

parents e32562d8 c3cf4e05

arch/arm/boot/dts/qcom/msm8992-pinctrl.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -793,8 +793,8 @@ 
		};



		cnss_pins {

			qcom,pins = <&gp 112>, <&gp 113>;

			qcom,num-grp-pins = <2>;

			qcom,pins = <&gp 112>, <&gp 54>, <&gp 53>, <&gp 113>;

			qcom,num-grp-pins = <4>;

			qcom,pin-func = <0>;

			label = "cnss_pins";

			cnss_default: default {

arch/arm/boot/dts/qcom/msm8992.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,9 @@ 


	qcom,cnss {

		compatible = "qcom,cnss";

		wlan-bootstrap-gpio = <&msm_gpio 112 0>;

		wlan-bootstrap-gpio = <&msm_gpio 112 0>,

				      <&msm_gpio 54 0>,

				      <&msm_gpio 53 0>;

		wlan-en-gpio = <&msm_gpio 113 0>;

		vdd-wlan-supply = <&wlan_vreg>;

		vdd-wlan-io-supply = <&pm8994_s4>;