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

Commit 50214dcb authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add secondary USB configuration for sm8150"

parents 18604f1e b2dc259a

arch/arm64/boot/dts/qcom/sm8150-auto.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -133,6 +133,17 @@ 
	core-supply = <&pm8150_2_l8>;

};



&usb2_phy1 {

	vdd-supply = <&pm8150_1_l5>;

	vdda18-supply = <&pm8150_1_l12>;

	vdda33-supply = <&pm8150_1_l2>;

};



&usb_qmp_phy {

	vdd-supply = <&pm8150_1_l5>;

	core-supply = <&pm8150_2_l8>;

};



&icnss {

	vdd-cx-mx-supply = <&pm8150_1_l1>;

	vdd-1.8-xo-supply = <&pm8150_1_l7>;

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

+16 −0
Original line number Diff line number Diff line
@@ -38,6 +38,18 @@ 
		qca,bt-vdd-pa-current-level = <0>; /* LPM/PFM */

		qca,bt-vdd-ldo-current-level = <0>; /* LPM/PFM */

	};



	extcon_usb1: extcon_usb1 {

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

		vbus-gpio = <&pm8150_gpios 10 GPIO_ACTIVE_HIGH>;

		id-gpio = <&tlmm 101 GPIO_ACTIVE_HIGH>;

		vbus-out-gpio = <&pm8150_gpios 9 GPIO_ACTIVE_HIGH>;



		pinctrl-names = "default";

		pinctrl-0 = <&usb2_vbus_det_default

			     &usb2_id_det_default

			     &usb2_vbus_boost_default>;

	};

};



&qupv3_se13_4uart {
@@ -552,3 +564,7 @@ 
		};

	};

};



&usb1 {

	extcon = <&extcon_usb1>;

};

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

+16 −0
Original line number Diff line number Diff line
@@ -44,6 +44,18 @@ 
		qcom,batt-id-range-pct = <15>;

		#include "fg-gen4-batterydata-alium-3600mah.dtsi"

	};



	extcon_usb1: extcon_usb1 {

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

		vbus-gpio = <&pm8150_gpios 10 GPIO_ACTIVE_HIGH>;

		id-gpio = <&tlmm 101 GPIO_ACTIVE_HIGH>;

		vbus-out-gpio = <&pm8150_gpios 9 GPIO_ACTIVE_HIGH>;



		pinctrl-names = "default";

		pinctrl-0 = <&usb2_vbus_det_default

			     &usb2_id_det_default

			     &usb2_vbus_boost_default>;

	};

};



&qupv3_se13_4uart {
@@ -571,3 +583,7 @@ 
&smb1390_charger {

	status = "ok";

};



&usb1 {

	extcon = <&extcon_usb1>;

};

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

+9 −0
Original line number Diff line number Diff line
@@ -3938,5 +3938,14 @@ 
				bias-disable;

			};

		};



		usb2_id_det_default: usb2_id_det_default {

			config {

				pins = "gpio101";

				function = "gpio";

				input-enable;

				bias-pull-up;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sm8150-pmic-overlay.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -37,6 +37,25 @@ 
			power-source = <1>;

		};

	};



	usb2_vbus_boost {

		usb2_vbus_boost_default: usb2_vbus_boost_default {

			pins = "gpio9";

			function = "normal";

			output-low;

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

		};

	};



	usb2_vbus_det {

		usb2_vbus_det_default: usb2_vbus_det_default {

			pins = "gpio10";

			function = "normal";

			input-enable;

			bias-pull-down;

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

		};

	};

};



&pm8150l_gpios {