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

Commit 8eedca58 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: Enable second USB instance on SDM845" into msm-4.9

parents 08b91903 c2160c84

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+37 −0
Original line number Diff line number Diff line
@@ -130,6 +130,29 @@ 
};



/ {

	extcon_usb1: extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

		id-gpio = <&pmi8998_gpios 9 GPIO_ACTIVE_HIGH>;

		vbus-gpio = <&pmi8998_gpios 8 GPIO_ACTIVE_HIGH>;



		pinctrl-names = "default";

		pinctrl-0 = <&usb2_vbus_det_default

			     &usb2_id_det_default>;

	};



	usb1_vbus_vreg: usb1_vbus_vreg {

		compatible = "regulator-fixed";

		regulator-name = "usb_vbus_vreg";

		gpio = <&pmi8998_gpios 2 GPIO_ACTIVE_HIGH>;

		enable-active-high;



		/* Typical EN-to-VBUS turn on time for NX5P1100 */

		regulator-enable-ramp-delay = <630>;



		pinctrl-names = "default";

		pinctrl-0 = <&usb2_vbus_boost_default>;

	};



aliases {

		serial0 = &qupv3_se9_2uart;

		spi0 = &qupv3_se8_spi;
@@ -153,3 +176,17 @@ aliases { 
&qupv3_se10_i2c {

	status = "ok";

};



&usb1 {

	status = "okay";

	extcon = <&extcon_usb1>;

	vbus_dwc3-supply = <&usb1_vbus_vreg>;

};



&qusb_phy1 {

	status = "okay";

};



&usb_qmp_phy {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -117,6 +117,14 @@ 
		#include "fg-gen3-batterydata-ascent-3450mah.dtsi"

		#include "fg-gen3-batterydata-demo-6000mah.dtsi"

	};



	extcon_usb1: extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

		vbus-gpio = <&pmi8998_gpios 8 GPIO_ACTIVE_HIGH>;



		pinctrl-names = "default";

		pinctrl-0 = <&usb2_vbus_det_default>;

	};

};



&pmi8998_fg {
@@ -147,3 +155,16 @@ aliases { 
&qupv3_se10_i2c {

	status = "ok";

};



&usb1 {

	status = "okay";

	extcon = <&extcon_usb1>;

};



&qusb_phy1 {

	status = "okay";

};



&usb_qmp_phy {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -2329,3 +2329,34 @@ 
		};

	};

};



&pmi8998_gpios {

	usb2_vbus_boost {

		usb2_vbus_boost_default: usb2_vbus_boost_default {

			pins = "gpio2";

			function = "normal";

			output-low;

			power-source = <0>;

		};

	};



	usb2_vbus_det {

		usb2_vbus_det_default: usb2_vbus_det_default {

			pins = "gpio8";

			function = "normal";

			input-enable;

			bias-pull-down;

			power-source = <1>;	/* VPH input supply */

		};

	};



	usb2_id_det {

		usb2_id_det_default: usb2_id_det_default {

			pins = "gpio9";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <0>;

		};

	};

};