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

Commit 5d1927ef 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 support for multiple neutrino on msm8996"

parents fd6b6c1e 14d6480c

Documentation/devicetree/bindings/net/neutrino_avb.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
  - ntn-rc-num: PCIe root complex number on which Neutrino is connected

  - ntn-rc-num: PCIe root complex number on which Neutrino is connected





Optional properties:

Optional properties:

  - ntn-bus-num: PCIe bus number on which Neutrino is connected

  - ntn-rst-gpio: Neutrino reset GPIO

  - ntn-rst-gpio: Neutrino reset GPIO

  - vdd-ntn-hsic-supply: Neutrino HSIC power supply

  - vdd-ntn-hsic-supply: Neutrino HSIC power supply

  - vdd-ntn-pci-supply: PCIe core power supply

  - vdd-ntn-pci-supply: PCIe core power supply
@@ -40,6 +41,7 @@ Example: 
		vdd-ntn-core-supply = <&pm8994_l19>;

		vdd-ntn-core-supply = <&pm8994_l19>;

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

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

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

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

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

	};

	};





	qcom,ntn_avb {

	qcom,ntn_avb {

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

+9 −1
Original line number Original line Diff line number Diff line
@@ -466,7 +466,7 @@ 
};

};





&soc {

&soc {

	qcom,ntn_avb {

	ntn1: ntn_avb@1 { /* Neutrno device on RC1*/

		compatible = "qcom,ntn_avb";

		compatible = "qcom,ntn_avb";





		ntn-rst-gpio = <&pm8994_gpios 13 0>;

		ntn-rst-gpio = <&pm8994_gpios 13 0>;
@@ -477,6 +477,14 @@ 




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

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

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

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

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

	};



	ntn2: ntn_avb@2 { /*Neutrino device on RC2*/

		compatible = "qcom,ntn_avb";

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

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

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

	};

	};





	i2c@75ba000 {

	i2c@75ba000 {