Merge "msm: pcie: expand PCIe boot option" (61bae6ef) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/devicetree/bindings/pci/msm_pcie.txt

+7 −3

Original line number	Diff line number	Diff line
		@@ -79,8 +79,12 @@ Optional Properties:
		PCIe port PHY.
		Should be specified in groups (offset, value, delay).
		- qcom,use-19p2mhz-aux-clk: The frequency of PCIe AUX clock is 19.2MHz.
		- qcom,ep-wakeirq: The endpoint will issue wake signal when it is up, and the
		root complex has the capability to enumerate the endpoint for this case.
		- qcom,boot-option: Bits that alter PCIe bus driver boot sequence.
		Below details what happens when each bit is set
		BIT(0): PCIe bus driver will not start enumeration during its probe.
		Clients will control when PCIe bus driver should do enumeration.
		BIT(1): PCIe bus driver will not start enumeration if it receives a WAKE
		interrupt.
		- qcom,msi-gicm-addr: MSI address for GICv2m.
		- qcom,msi-gicm-base: MSI IRQ base for GICv2m.
		- qcom,ext-ref-clk: The reference clock is external.
		@@ -263,7 +267,7 @@ Example:
		qcom,aux-clk-sync;
		qcom,n-fts = <0x50>;
		qcom,pcie-phy-ver = <1>;
		qcom,ep-wakeirq;
		qcom,boot-option = <0x1>;
		qcom,msi-gicm-addr = <0xf9040040>;
		qcom,msi-gicm-base = <0x160>;
		qcom,ext-ref-clk;

+2 −2

Original line number	Diff line number	Diff line
		@@ -974,14 +974,14 @@
		};

		&pcie1 {
		/delete-property/ qcom,ep-wakeirq;
		/delete-property/ qcom,boot-option;
		};

		&pcie2 {
		perst-gpio = <&tlmm 90 0>;
		wake-gpio = <&tlmm 54 0>;

		/delete-property/ qcom,ep-wakeirq;
		/delete-property/ qcom,boot-option;
		};

		&wsa881x_211 {

+3 −3

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1590,7 +1590,7 @@

		qcom,ep-latency = <10>;

		qcom,ep-wakeirq;
		qcom,boot-option = <0x1>;

		linux,pci-domain = <0>;

+1 −1