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

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

Merge "msm: ipa3: Do not configure USB pipes in MHI mode"

parents d42794ca e1c0a852

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

+15 −14
Original line number Diff line number Diff line
@@ -837,10 +837,10 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 


	/* IPA_3_5_MHI */

	[IPA_3_5_MHI][IPA_CLIENT_USB_PROD]            = {

			true, IPA_v3_5_MHI_GROUP_DDR, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,

			false, IPA_EP_NOT_ALLOCATED, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID,

			QMB_MASTER_SELECT_DDR,

			{ 0, 7, 8, 16, IPA_EE_AP } },

			{ -1, -1, -1, -1, -1 } },

	[IPA_3_5_MHI][IPA_CLIENT_APPS_WAN_PROD]   = {

			true, IPA_v3_5_MHI_GROUP_DDR, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,
@@ -914,15 +914,15 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 
			QMB_MASTER_SELECT_DDR,

			{ 16, 3, 8, 8, IPA_EE_UC } },

	[IPA_3_5_MHI][IPA_CLIENT_USB_CONS]            = {

			true, IPA_v3_5_MHI_GROUP_DDR, false,

			false, IPA_EP_NOT_ALLOCATED, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID,

			QMB_MASTER_SELECT_DDR,

			{ 17, 11, 8, 8, IPA_EE_AP } },

			{ -1, -1, -1, -1, -1 } },

	[IPA_3_5_MHI][IPA_CLIENT_USB_DPL_CONS]        = {

			true, IPA_v3_5_MHI_GROUP_DDR, false,

			false, IPA_EP_NOT_ALLOCATED, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID,

			QMB_MASTER_SELECT_DDR,

			{ 14, 10, 4, 6, IPA_EE_AP } },

			{ -1, -1, -1, -1, -1 } },

	[IPA_3_5_MHI][IPA_CLIENT_APPS_LAN_CONS]       = {

			true, IPA_v3_5_MHI_GROUP_DDR, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID,
@@ -1417,8 +1417,6 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 
			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,

			QMB_MASTER_SELECT_DDR,

			{ 8, 10, 8, 16, IPA_EE_AP } },





	[IPA_4_0_MHI][IPA_CLIENT_APPS_LAN_CONS]       = {

			true, IPA_v4_0_MHI_GROUP_DDR,

			false,
@@ -1779,9 +1777,11 @@ int ipa3_get_clients_from_rm_resource( 


	switch (resource) {

	case IPA_RM_RESOURCE_USB_CONS:

		if (ipa3_get_ep_mapping(IPA_CLIENT_USB_CONS) != -1)

			clients->names[i++] = IPA_CLIENT_USB_CONS;

		break;

	case IPA_RM_RESOURCE_USB_DPL_CONS:

		if (ipa3_get_ep_mapping(IPA_CLIENT_USB_DPL_CONS) != -1)

			clients->names[i++] = IPA_CLIENT_USB_DPL_CONS;

		break;

	case IPA_RM_RESOURCE_HSIC_CONS:
@@ -1803,6 +1803,7 @@ int ipa3_get_clients_from_rm_resource( 
		clients->names[i++] = IPA_CLIENT_ETHERNET_CONS;

		break;

	case IPA_RM_RESOURCE_USB_PROD:

		if (ipa3_get_ep_mapping(IPA_CLIENT_USB_PROD) != -1)

			clients->names[i++] = IPA_CLIENT_USB_PROD;

		break;

	case IPA_RM_RESOURCE_HSIC_PROD: