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

Commit 8e0bbcdb 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 USB VBUS detect for msm8996 Liquid"

parents 0dbcc6fa 9887f4e9

Documentation/devicetree/bindings/platform/msm/gpio-usbdetect.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
GPIO USB VBUS Detection



Discrete USB VBUS detection circuitry can be connected to the AP or PMICs.

Such circuits can be used to detect the when a USB cable is connected to

an upstream port such as a standard host or a wall charger by detecting

the presence of VBUS voltage. The GPIO can be configured to trigger an

interrupt, and allow the software driver to in turn notify the USB

subsytem using the power_supply framework.



Required Properties:

 - compatible: must be "qcom,gpio-usbdetect"

 - interrupts: an interrupt triggered by the output of the detection circuit

 - interrupt-names: must be "vbus_det_irq"



Optional Properties:

 - vin-supply: phandle to a regulator that powers this circuit, if needed



Example:



	usb_detect {

		compatible = "qcom,gpio-usbdetect";

                interrupt-parent = <&spmi_bus>;

                interrupts = <0x0 0xCA 0x0>;  /* PMA8084 GPIO 11 */

                interrupt-names = "vbus_det_irq";

                vin-supply = <&vbus_det_reg>;

	};

arch/arm/boot/dts/qcom/msm8996-liquid.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -373,6 +373,10 @@ 
	status = "okay";

};



&usb3 {

	vbus_dwc3-supply = <&usb_otg_switch>;

};



&pm8994_mpps {

	mpp@a300 { /* MPP 4 */

		/* HDMI_5v_vreg regulator enable */
@@ -489,6 +493,13 @@ 
		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		qcom,aux-codec = <&wsa881x_1>, <&wsa881x_2>;

	};



	usb_detect {

		compatible = "qcom,gpio-usbdetect";

		interrupt-parent = <&tlmm>;

		interrupts = <78 0>;

		interrupt-names = "vbus_det_irq";

	};

};



&pm8994_gpios {

arch/arm64/configs/msm-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ CONFIG_QPNP_COINCELL=y 
CONFIG_SPS=y

CONFIG_USB_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_GPIO_USB_DETECT=y

CONFIG_IPA=y

CONFIG_RMNET_IPA=y

CONFIG_QPNP_HAPTIC=y

arch/arm64/configs/msm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ CONFIG_SPS=y 
CONFIG_USB_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_MSM_AVTIMER=y

CONFIG_GPIO_USB_DETECT=y

CONFIG_IPA=y

CONFIG_RMNET_IPA=y

CONFIG_PFK=y

drivers/platform/msm/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -185,6 +185,15 @@ config QPNP_HAPTIC 
	  on the Qualcomm Technologies' QPNP PMICs. It uses the android

	  timed-output framework.



config GPIO_USB_DETECT

	tristate "GPIO-based USB VBUS Detection"

	depends on POWER_SUPPLY

	help

	  This driver supports external USB VBUS detection circuitry whose

	  output is connected to a GPIO. The driver in turn notifies the

	  USB driver of VBUS presence/disconnection using the power_supply

	  framework.



config MSM_11AD

	tristate "Platform driver for 11ad chip"

	depends on PCI