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

Commit 49ccf3da 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 bd4d7e0d 3224a1ca
Loading
Loading
Loading
Loading
+6 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,11 @@
This driver implements Ethernet driver for Neutrino ethernet controller
This driver implements Ethernet driver for Neutrino ethernet controller
Required properties:
Required properties:
  - compatible: Should be "qcom,ntn_avb"
  - compatible: Should be "qcom,ntn_avb"
  - ntn-rst-delay-msec: delay (msec) required after PCIe reset for stabilization
  - ntn-rc-num: PCIe root complex number on which Neutrino is connected

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
@@ -25,4 +30,5 @@ Example:
		pinctrl-0 = <&ntn_default>;
		pinctrl-0 = <&ntn_default>;
		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>;
	};
	};
+9 −1
Original line number Original line Diff line number Diff line
@@ -454,7 +454,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>;
@@ -465,6 +465,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 {