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

Commit 0211f235 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: f_ipc: Mark current state to CONNECTED before registering pdev"

parents f53a0eee 314846a3

Documentation/devicetree/bindings/arm/msm/msm_ipc_router_hsic_xprt.txt→Documentation/devicetree/bindings/arm/msm/msm_ipc_router_usb_xprt.txt

+5 −5
Original line number Diff line number Diff line 
Qualcomm IPC Router HSIC Transport

Qualcomm Technologies, Inc. IPC Router USB Transport



Required properties:

-compatible:		should be "qcom,ipc_router_hsic_xprt"

-qcom,ch-name:		the HSIC channel name used by the HSIC transport

-compatible:		should be "qcom,ipc-router-usb-xprt"

-qcom,ch-name:		the USB channel name used by the USB transport

-qcom,xprt-remote:	string that defines the edge of the transport (PIL Name)

-qcom,xprt-linkid:	unique integer to identify the tier to which the link

			belongs to in the network and is used to avoid the

			routing loops while forwarding the broadcast messages

-qcom,xprt-version:	unique version ID used by HSIC transport header

-qcom,xprt-version:	unique version ID used by USB transport header



Example:

	qcom,ipc_router_external_modem_xprt {

		compatible = "qcom,ipc_router_hsic_xprt";

		compatible = "qcom,ipc-router-usb-xprt";

	        qcom,ch-name = "ipc_bridge";

		qcom,xprt-remote = "external-modem";

		qcom,xprt-linkid = <1>;

arch/arm/boot/dts/qcom/mdm9650-usb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
		qcom,pm-qos-latency = <101 2001 30001>;

		qcom,supported-func = "ffs","audio","diag","serial",

			"mass_storage","rndis_gsi","ecm_gsi","rmnet_gsi",

			"mbim_gsi","dpl_gsi","gps","qdss","rndis";

			"mbim_gsi","dpl_gsi","gps","qdss","rndis","ipc";

	};



	qusb_phy: qusb@79000 {

arch/arm/configs/mdm-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ CONFIG_MSM_SMP2P=y 
CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_USB_XPRT=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_IPC_ROUTER_MHI_DEV_XPRT=y

CONFIG_MSM_GLINK_PKT=y

arch/arm/configs/mdm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ CONFIG_MSM_SMP2P=y 
CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_USB_XPRT=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_IPC_ROUTER_MHI_DEV_XPRT=y

CONFIG_MSM_GLINK_PKT=y

drivers/soc/qcom/Kconfig

+8 −7
Original line number Diff line number Diff line
@@ -621,15 +621,16 @@ config MSM_EVENT_TIMER 
	  events that require the core to be awake and ready to handle the

	  event.



config MSM_IPC_ROUTER_HSIC_XPRT

	depends on USB_QCOM_IPC_BRIDGE

config MSM_IPC_ROUTER_USB_XPRT

	depends on USB_QCOM_IPC_BRIDGE || USB_F_IPC

	depends on IPC_ROUTER

	bool "MSM HSIC XPRT Layer"

	bool "MSM USB XPRT Layer"

	help

	  HSIC Transport Layer that enables off-chip communication of

	  IPC Router. When the HSIC endpoint becomes available, this layer

	  registers the transport with IPC Router and enable message

	  exchange.

	  USB Transport Layer that enables off-chip communication of IPC Router.

	  When the USB endpoint becomes available, this layer registers the

	  transport with IPC Router and enable message exchange. This layer is

	  independent of USB host or device mode IPC bridge and can interface

	  with only one of them on a given platform.



config MSM_SYSMON_GLINK_COMM

	bool "MSM System Monitor communication support using GLINK transport"