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

Commit 5f2b9743 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: Add PCIERST-RESX property to Neutrino"

parents 92317fb0 7da9c712

Documentation/devicetree/bindings/net/neutrino_avb.txt

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ Optional properties: 
  - vdd-ntn-phy-supply: Ethernet PHY power supply

  - vdd-ntn-core-supply: Neutrino core power supply

  - ntn-supply-enable-gpio: GPIO used to control power supply to Neutrino

  - qcom,ntn-fw-load-delay-msec: Delay used after loading the firmware to SRAM

  - qcom,ntn-pcierst-resx: PCIe reset is connected to Neutrino RESX, this

			   means that Neutrino will stay on reset during

			   PCIe suspend

  - qcom,ntn-disable-phy: Use for devices that don't have a PHY chip



Example:

	qcom,ntn_avb {
@@ -34,4 +39,6 @@ Example: 
		ntn-supply-enable-gpio = <&pmd9635_gpios 3 0>;

		qcom,ntn-rst-delay-msec = <100>;

		qcom,ntn-rc-num = <1>;

		qcom,ntn-fw-load-delay-msec = <200>;

		qcom,ntn-pcierst-resx;

	};

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

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
		ntn-supply-enable-gpio = <&pmd9635_gpios 3 0>;

		qcom,ntn-rst-delay-msec = <100>;

		qcom,ntn-rc-num = <0>;

		qcom,ntn-fw-load-delay-msec = <200>;

		qcom,ntn-pcierst-resx;

	};

};

arch/arm/boot/dts/qcom/mdm9640-v2-mtp.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
		ntn-supply-enable-gpio = <&pmd9635_gpios 3 0>;

		qcom,ntn-rst-delay-msec = <100>;

		qcom,ntn-rc-num = <0>;

		qcom,ntn-fw-load-delay-msec = <200>;

		qcom,ntn-pcierst-resx;

	};

};