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

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

Merge "Revert "cnss: Configure wlan gpio""

parents feac593d 213023e4

Documentation/devicetree/bindings/cnss/cnss-wlan.txt

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ Optional properties: 
  - vdd-wlan-en-supply: WLAN_EN fixed regulator specified by QCA6174 specifications.

  - qcom,wlan-en-vreg-support: Boolean property to decide the whether the WLAN_EN pin

				is a gpio or fixed regulator.

  - qcom,enable-bootstrap-gpio: Boolean property to decide whether wlan bootstrap

                                 gpio should be enabled or not in this platform.



Example:

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

+1 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ 


	qcom,cnss {

		compatible = "qcom,cnss";

		wlan-en-gpio = <&tlmm_pinmux 95 0>;

		vdd-wlan-supply = <&wlan_vreg>;

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

		vdd-wlan-sp2t-supply = <&pmd9635_l12>;

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

+1 −0
Original line number Diff line number Diff line
@@ -879,6 +879,7 @@ 


	cnss_pcie: qcom,cnss {

		compatible = "qcom,cnss";

		wlan-en-gpio = <&tlmm_pinmux 95 0>;

		vdd-wlan-supply = <&rome_vreg>;

		vdd-wlan-xtal-supply = <&pmdcalifornium_l5>;

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

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

+1 −0
Original line number Diff line number Diff line
@@ -2226,6 +2226,7 @@ 


	qcom,cnss {

		compatible = "qcom,cnss";

		wlan-bootstrap-gpio = <&tlmm 46 0>;

		vdd-wlan-en-supply = <&wlan_en_vreg>;

		vdd-wlan-supply = <&rome_vreg>;

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

drivers/net/wireless/cnss/cnss_pci.c

+268 −198

File changed.

Preview size limit exceeded, changes collapsed.