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

Commit 3a461b3b 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 port and host mode APQ8096 drone"

parents 1e584348 f4048b77
Loading
Loading
Loading
Loading
+16 −13
Original line number Diff line number Diff line
@@ -354,12 +354,6 @@


&rpm_bus {
	rpm-regulator-bstb {
		status = "disabled";
		regulator-bst {
			status = "disabled";
		};
	};
	rpm-regulator-ldoa1 {
		status = "disabled";
		pm8994_l1: regulator-l1 {
@@ -500,17 +494,11 @@
};

&pmi8994_charger {
	/delete-property/ otg-parent-supply;
	qcom,charging-disabled;
	smbcharger_charger_otg {
		parent-supply = <&pmi8994_boost_5v>;
	};
};

&usb_otg_switch {
	/delete-property/ vin-supply;
	gpio = <&pm8994_gpios 11 0>;
	enable-active-high;
	status = "ok";
};

@@ -519,6 +507,14 @@
	vbus_dwc3-supply = <&usb_otg_switch>;
};

&usb2s {
	status = "ok";
	vbus_dwc3-supply = <&usb_vbus_vreg>;
	dwc3@7600000 {
		dr_mode = "host";
	};
};

&usb_nop_phy {
	status = "ok";
};
@@ -662,6 +658,13 @@
		regulator-always-on;
	};

	usb_vbus_vreg: usb_vbus_vreg {
		compatible = "regulator-fixed";
		regulator-name = "usb_vbus_vreg";
		gpio = <&pmi8994_gpios 3 0>;
		enable-active-high;
	};

	sound {
		status = "disabled";
	};
@@ -718,10 +721,10 @@

	gpio@ca00 { /* GPIO 11 - USB enb1 (otg switch) */
		qcom,mode = <1>;	/* DIGITAL OUT */
		qcom,pull = <1>;	/* PULL DOWN */
		qcom,vin-sel = <2>;	/* 1.8 */
		qcom,src-sel = <0>;	/* GPIO */
		qcom,master-en = <1>;	/* Enable GPIO */
		qcom,invert = <0>;	/* Invert */
		status = "okay";
	};