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

Commit cf763442 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: Add a gpio for extcon_usb1 node"

parents a379ead4 ad2fbfed
Loading
Loading
Loading
Loading
+24 −8
Original line number Diff line number Diff line
@@ -67,6 +67,19 @@
			};
	};

	usb_det_default: usb_det_default {
		usb_id_det_default: usb_id_det_default {
			mux {
				pins = "gpio131";
				function = "gpio";
			};
			config {
				pins = "gpio131";
				drive-strength = <2>;
				bias-pull-down;
				output-enable;
			};
		};
		usb_vbus_det_default: usb_vbus_det_default {
			config {
				pins = "gpio26";
@@ -76,6 +89,7 @@
			};
		};
	};
};

&sdhc_2 {
	/* VDD external regulator is enabled/disabled by pm660_l18 regulator */
@@ -96,14 +110,16 @@
	extcon_usb1: extcon_usb1 {
		compatible = "linux,extcon-usb-gpio";
		id-gpio = <&tlmm 26 0x1>;
		trig-gpio = <&tlmm 131 0x0>;
		gpio-names = "gpio131";

		pinctrl-names = "default";
		pinctrl-0 = <&usb_vbus_det_default>;
		pinctrl-0 = <&usb_vbus_det_default &usb_id_det_default>;
	};
};

&usb0 {
	extcon = <&extcon_usb1 &extcon_usb1>;
	extcon = <&extcon_usb1>;
};

&msm_sdw_codec {