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

Commit 5aaea123 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 USB Type-C support for msmtitanium"

parents f7c2470e c9469967
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -234,6 +234,26 @@
				interrupts = <0x0 0x61 0x1>;
			};
		};

		pmtitanium_typec: qcom,pmtitanium_typec@bf00 {
			compatible = "qcom,qpnp-typec";
			reg = <0xbf00 0x100>;
			interrupts =    <0x0 0xbf 0x0>,
					<0x0 0xbf 0x1>,
					<0x0 0xbf 0x2>,
					<0x0 0xbf 0x3>,
					<0x0 0xbf 0x4>,
					<0x0 0xbf 0x6>,
					<0x0 0xbf 0x7>;

			interrupt-names =       "vrd-change",
						"ufp-detect",
						"ufp-detach",
						"dfp-detect",
						"dfp-detach",
						"vbus-err",
						"vconn-oc";
		};
	};

	pmtitanium_1: qcom,pmtitanium@1 {
+13 −0
Original line number Diff line number Diff line
@@ -251,3 +251,16 @@

	status = "ok";
};

&pmtitanium_typec {
	ss-mux-supply = <&pmtitanium_l13>;
	qcom,ssmux-gpio = <&tlmm 139 0>;
	pinctrl-names = "default";
	pinctrl-0 = <&typec_ssmux_config>;
};

&pmi8950_charger {
	qcom,external-typec;
	qcom,typec-psy-name = "typec";
	qcom,otg-pinctrl;
};
+28 −0
Original line number Diff line number Diff line
@@ -217,3 +217,31 @@

	status = "ok";
};

&pmtitanium_typec {
	ss-mux-supply = <&pmtitanium_l13>;
	qcom,ssmux-gpio = <&tlmm 139 0>;
	pinctrl-names = "default";
	pinctrl-0 = <&typec_ssmux_config>;
};

/{
	mtp_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;
		#include "batterydata-itech-3000mah.dtsi"
		#include "batterydata-ascent-3450mAh.dtsi"
	};
};

&pmi8950_fg {
	qcom,battery-data = <&mtp_batterydata>;
};

&pmi8950_charger {
	qcom,battery-data = <&mtp_batterydata>;
	qcom,chg-led-sw-controls;
	qcom,chg-led-support;
	qcom,external-typec;
	qcom,typec-psy-name = "typec";
	qcom,otg-pinctrl;
};
+13 −0
Original line number Diff line number Diff line
@@ -1295,5 +1295,18 @@
				};
			};
		};

		typec_ssmux_config: typec_ssmux_config {
			mux {
				pins = "gpio139";
				function = "ss_switch";
			};

			config {
				pins = "gpio139";
				drive-strength = <2>;
				bias-disable;
			};
		};
	};
};