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

Commit 77380686 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ethernet: device tree and defconfig changes for neutrino"

parents 98acd6e7 5a2d5f3d

Documentation/devicetree/bindings/net/neutrino_avb.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* Neutrino Ethernet *

This driver implements Ethernet driver for Neutrino ethernet controller

Required properties:

  - compatible: Should be "qcom,ntn_avb"

  - ntn-rst-gpio: Neutrino reset GPIO

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

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

  - vdd-ntn-io-supply:  Neutrino IO power supply

  - vdd-ntn-phy-supply: Ethernet Phy power supply

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

  - pinctrl-names: should contain GPIO details

  - pinctrl-0: Neutrino reset GPIO [this is from MSM]

  - ntn-rst-delay-msec: dealy (msec) required after PCIe reset for stabilization

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

Example:

	qcom,ntn_avb {

		compatible = "qcom,ntn_avb";

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

		vdd-ntn-hsic-supply = <&pm8994_l25>;

		vdd-ntn-pci-supply = <&pm8994_s4>;

		vdd-ntn-io-supply = <&pm8994_s4>;

		vdd-ntn-phy-supply = <&pm8994_l9>;

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

		pinctrl-names = "default";

		pinctrl-0 = <&ntn_default>;

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

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

	};

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+21 −5
Original line number Diff line number Diff line
@@ -522,6 +522,19 @@ 
};



&soc {

	qcom,ntn_avb {

		compatible = "qcom,ntn_avb";



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



		vdd-ntn-hsic-supply = <&pm8994_l25>;

		vdd-ntn-pci-supply = <&pm8994_s4>;

		vdd-ntn-io-supply = <&pm8994_s4>;



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

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

	};



	qcom,cnss {

		wlan-bootstrap-gpio = <&tlmm 46 0>;

		wlan-en-gpio = <&pm8994_gpios 8 0>;
@@ -743,9 +756,12 @@ 
		status = "okay";

	};



	gpio@cc00 { /* GPIO 13 */

	gpio@cc00 { /* GPIO 13 - NTN_RST */

		qcom,mode = <1>; /* DIGITAL OUT */

		qcom,output-type = <0>; /* CMOS logic */

		qcom,pull = <5>;

		qcom,vin-sel = <2>; /* 1.8 */

		qcom,out-strength = <1>;

		qcom,src-sel = <0>; /* GPIO */

		qcom,master-en = <1>; /* Enable GPIO */

		status = "okay";

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+19 −6
Original line number Diff line number Diff line
@@ -478,6 +478,19 @@ 
};



&soc {

	qcom,ntn_avb {

		compatible = "qcom,ntn_avb";



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



		vdd-ntn-hsic-supply = <&pm8994_l25>;

		vdd-ntn-pci-supply = <&pm8994_s4>;

		vdd-ntn-io-supply = <&pm8994_s4>;



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

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

	};



	i2c@75ba000 {

		synaptics@20 {

			compatible = "synaptics,dsx";
@@ -762,14 +775,14 @@ 
		status = "okay";

	};



	gpio@cc00 { /* GPIO 13 - HPH_EN0 */

		qcom,mode = <1>;

		qcom,output-type = <0>;

	gpio@cc00 { /* GPIO 13 - NTN_RST */

		qcom,mode = <1>; /* DIGITAL OUT */

		qcom,output-type = <0>; /* CMOS logic */

		qcom,pull = <5>;

		qcom,vin-sel = <2>;

		qcom,vin-sel = <2>; /* 1.8 */

		qcom,out-strength = <1>;

		qcom,src-sel = <2>;

		qcom,master-en = <1>;

		qcom,src-sel = <0>; /* GPIO */

		qcom,master-en = <1>; /* Enable GPIO */

		status = "okay";

	};

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

+19 −6
Original line number Diff line number Diff line
@@ -457,6 +457,19 @@ 
};



&soc {

	qcom,ntn_avb {

		compatible = "qcom,ntn_avb";



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



		vdd-ntn-hsic-supply = <&pm8994_l25>;

		vdd-ntn-pci-supply = <&pm8994_s4>;

		vdd-ntn-io-supply = <&pm8994_s4>;



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

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

	};



	i2c@75ba000 {

		synaptics@20 {

			compatible = "synaptics,dsx";
@@ -785,14 +798,14 @@ 
		status = "okay";

	};



	gpio@cc00 { /* GPIO 13 - HPH_EN0 */

		qcom,mode = <1>;

		qcom,output-type = <0>;

	gpio@cc00 { /* GPIO 13 - NTN_RST */

		qcom,mode = <1>; /* DIGITAL OUT */

		qcom,output-type = <0>; /* CMOS logic */

		qcom,pull = <5>;

		qcom,vin-sel = <2>;

		qcom,vin-sel = <2>; /* 1.8 */

		qcom,out-strength = <1>;

		qcom,src-sel = <2>;

		qcom,master-en = <1>;

		qcom,src-sel = <0>; /* GPIO */

		qcom,master-en = <1>; /* Enable GPIO */

		status = "okay";

	};

arch/arm64/configs/msm-auto-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ CONFIG_L2TP_V3=y 
CONFIG_L2TP_IP=y

CONFIG_L2TP_ETH=y

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=y

CONFIG_NET_SCH_PRIO=y
@@ -320,6 +321,7 @@ CONFIG_SOUNDWIRE=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_MSM8996=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y