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

Commit 61dd6d29 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: Trigger PCIe1 enumeration from endpoint"

parents 125aa701 bd2865a3

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

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 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 +23,8 @@ Example: 
	wil6210: qcom,wil6210 {

		compatible = "qcom,wil6210";

		qcom,smmu-support;

		qcom,pcie-parent = <&pcie1>;

		qcom,wigig-en = <&tlmm 94 0>;

		qcom,msm-bus,name = "wil6210";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

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

+4 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,6 @@ 


		perst-gpio = <&tlmm 130 0>;

		wake-gpio = <&tlmm 132 0>;

		qcom,ep-gpio = <&tlmm 94 0>;



		gdsc-smmu-supply = <&gdsc_aggre0_noc>;

		gdsc-vdd-supply = <&gdsc_pcie_1>;
@@ -1570,6 +1569,8 @@ 


		iommus = <&anoc0_smmu>;



		qcom,ep-wakeirq;



		qcom,ep-latency = <10>;



		linux,pci-domain = <1>;
@@ -2341,6 +2342,8 @@ 


	wil6210: qcom,wil6210 {

		compatible = "qcom,wil6210";

		qcom,pcie-parent = <&pcie1>;

		qcom,wigig-en = <&tlmm 94 0>;

		qcom,msm-bus,name = "wil6210";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

drivers/platform/msm/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -156,6 +156,18 @@ config QPNP_HAPTIC 
	  on the Qualcomm Technologies' QPNP PMICs. It uses the android

	  timed-output framework.



config MSM_11AD

	tristate "Platform driver for 11ad chip"

	depends on PCI

	depends on PCI_MSM

	default n

	---help---

	  This module adds required platform support for wireless adapter based on

	  Qualcomm Technologies, Inc. 11ad chip, integrated into MSM platform



	  If you choose to build it as a module, it will be called

	  msm_11ad_proxy.



source "drivers/platform/msm/spmi/Kconfig"



endmenu

drivers/platform/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ obj-$(CONFIG_IPA) += ipa/ 
obj-$(CONFIG_QPNP_HAPTIC) += qpnp-haptic.o

obj-$(CONFIG_USB_BAM) += usb_bam.o

obj-$(CONFIG_MSM_AVTIMER) += avtimer.o

obj-$(CONFIG_MSM_11AD) += msm_11ad/

drivers/platform/msm/msm_11ad/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MSM_11AD) += msm_11ad_proxy.o



msm_11ad_proxy-y := msm_11ad.o

subdir-ccflags-y += -D__CHECK_ENDIAN__



# need to locate wil_platform.h

WIL_11AD_PATH = drivers/net/wireless/ath/wil6210

subdir-ccflags-y += -I$(WIL_11AD_PATH)