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

Commit cc609191 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 support for GPIO based VBUS detection for APQ8009"

parents 7281c9c2 b0a27b03

arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326-excelpoint-refboard.dts

+33 −4
Original line number Diff line number Diff line
@@ -56,6 +56,19 @@ 
			bias-disable;

		};

	};



	usb_vbus_detect: usb_vbus_detect {

		mux {

			pins = "gpio97";

			function = "gpio";

		};



		config {

			pins = "gpio97";

			drive-strength = <2>;

			bias-disable;

		};

	};

};



&soc {
@@ -170,6 +183,24 @@ 
				<79 512 25000 200000>,    /* 200 Mbps */

				<79 512 2048000 4096000>; /* MAX */

	};



	vbus_otg_supply: vbus_otg_supply {

		compatible = "regulator-fixed";

		regulator-name = "vbus_otg";

		status = "ok";

		enable-active-high;

		gpio = <&pm8916_gpios 3 0>;

	};



	usb_detect: qcom,gpio-usbdetect {

		compatible = "qcom,gpio-usbdetect";

		interrupt-parent = <&msm_gpio>;

		interrupts = <97 0>;

		interrupt-names = "vbus_det_irq";

		pinctrl-names = "usb_vbus_detect";

		pinctrl-0 = <&usb_vbus_detect>;

		qcom,gpio-mode-sel = <&msm_gpio 97 0>;

	};

};



&wcnss {
@@ -279,10 +310,8 @@ 
	interrupts = <0 134 0>,<0 140 0>,<0 136 0>;

	interrupt-names = "core_irq", "async_irq", "phy_irq";



	qcom,hsusb-otg-mode = <1>; /* peripheral mode */

	qcom,hsusb-otg-otg-control= <3>;

	qcom,hsusb-otg-default-mode= <1>; /* peripheral mode */

	vbus_otg-supply = <&smb1360_otg_supply>;

	qcom,hsusb-otg-mode = <3>;

	vbus_otg-supply = <&vbus_otg_supply>;

};



&mdss_fb0 {

arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326-refboard.dts

+33 −4
Original line number Diff line number Diff line
@@ -56,6 +56,19 @@ 
			bias-disable;

		};

	};



	usb_vbus_detect: usb_vbus_detect {

		mux {

			pins = "gpio97";

			function = "gpio";

		};



		config {

			pins = "gpio97";

			drive-strength = <2>;

			bias-disable;

		};

	};

};



&soc {
@@ -148,6 +161,24 @@ 
				<79 512 25000 200000>,    /* 200 Mbps */

				<79 512 2048000 4096000>; /* MAX */

	};



	vbus_otg_supply: vbus_otg_supply {

		compatible = "regulator-fixed";

		regulator-name = "vbus_otg";

		status = "ok";

		enable-active-high;

		gpio = <&pm8916_gpios 3 0>;

	};



	usb_detect: qcom,gpio-usbdetect {

		compatible = "qcom,gpio-usbdetect";

		interrupt-parent = <&msm_gpio>;

		interrupts = <97 0>;

		interrupt-names = "vbus_det_irq";

		pinctrl-names = "usb_vbus_detect";

		pinctrl-0 = <&usb_vbus_detect>;

		qcom,gpio-mode-sel = <&msm_gpio 97 0>;

	};

};



&wcnss {
@@ -245,10 +276,8 @@ 
	interrupts = <0 134 0>,<0 140 0>,<0 136 0>;

	interrupt-names = "core_irq", "async_irq", "phy_irq";



	qcom,hsusb-otg-mode = <1>; /* peripheral mode */

	qcom,hsusb-otg-otg-control= <3>;

	qcom,hsusb-otg-default-mode= <1>; /* peripheral mode */

	vbus_otg-supply = <&smb1360_otg_supply>;

	qcom,hsusb-otg-mode = <3>;

	vbus_otg-supply = <&vbus_otg_supply>;

};



&mdss_fb0 {