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

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

Merge "msm_11ad: change wigig_en to be an optional property"

parents 7ebb123c 0d7b8c20

Documentation/devicetree/bindings/arm/msm/wil6210.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ Required properties: 
- compatible: "qcom,wil6210"

- qcom,smmu-support: Boolean flag indicating whether PCIe has SMMU support

- qcom,pcie-parent: phandle for the PCIe root complex to which 11ad card is connected

- qcom,wigig-en: Enable GPIO connected to 11ad card

- Refer to "Documentation/devicetree/bindings/arm/msm/msm_bus.txt" for

  the below optional properties:

	- qcom,msm-bus,name
@@ -21,6 +20,7 @@ Required properties: 


Optional properties:

- qcom,sleep-clk-en: GPIO for sleep clock used for low power modes by 11ad card

- qcom,wigig-en: Enable GPIO connected to 11ad card



Example:

	wil6210: qcom,wil6210 {

arch/arm/boot/dts/qcom/apq8096-dragonboard.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -939,3 +939,7 @@ 
		drive-strength = <8>; /* 8 MA */

	};

};



&wil6210 {

	status = "ok";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -768,3 +768,7 @@ 
		reset-gpios = <&tlmm 79 0>;

	};

};



&wil6210 {

	status = "ok";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -625,3 +625,7 @@ 
		status = "okay";

	};

};



&wil6210 {

	status = "ok";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -657,3 +657,7 @@ 
		};

	};

};



&wil6210 {

	status = "ok";

};