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

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

Merge "msm: ipa4: IPA_CLKON_CFG register configuration"

parents 22951366 d68ab111

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

+2 −1
Original line number Diff line number Diff line
@@ -3998,7 +3998,8 @@ static int ipa3_post_init(const struct ipa3_plat_drv_res *resource_p, 
	 * IPAv3.5 and above requires to disable prefetch for USB in order

	 * to allow MBIM to work, currently MBIM is not needed in MHI mode.

	 */

	if ((ipa3_ctx->ipa_hw_type >= IPA_HW_v3_5) &&

	if ((ipa3_ctx->ipa_hw_type >= IPA_HW_v3_5

		&& ipa3_ctx->ipa_hw_type < IPA_HW_v4_0) &&

		(!ipa3_ctx->ipa_config_is_mhi))

		ipa3_disable_prefetch(IPA_CLIENT_USB_CONS);

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

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define IPA_BCR_REG_VAL_v3_0 (0x00000001)

#define IPA_BCR_REG_VAL_v3_5 (0x0000003B)

#define IPA_BCR_REG_VAL_v4_0 (0x00000039)

#define IPA_CLKON_CFG_v4_0 (0x30000000)

#define IPA_AGGR_GRAN_MIN (1)

#define IPA_AGGR_GRAN_MAX (32)

#define IPA_EOT_COAL_GRAN_MIN (1)
@@ -2055,6 +2056,9 @@ int ipa3_init_hw(void) 


	ipahal_write_reg(IPA_BCR, val);



	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_0)

		ipahal_write_reg(IPA_CLKON_CFG, IPA_CLKON_CFG_v4_0);



	ipa3_cfg_qsb();



	return 0;

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ static const char *ipareg_name_to_str[IPA_REG_MAX] = { 
	__stringify(IPA_IDLE_INDICATION_CFG),

	__stringify(IPA_DPS_SEQUENCER_FIRST),

	__stringify(IPA_HPS_SEQUENCER_FIRST),

	__stringify(IPA_CLKON_CFG),

};



static void ipareg_construct_dummy(enum ipahal_reg_name reg,
@@ -1490,6 +1491,9 @@ static struct ipahal_reg_obj ipahal_reg_objs[IPA_HW_MAX][IPA_REG_MAX] = { 
	[IPA_HW_v4_0][IPA_ENDP_STATUS_n] = {

		ipareg_construct_endp_status_n_v4_0, ipareg_parse_dummy,

		0x00000840, 0x70},

	[IPA_HW_v4_0][IPA_CLKON_CFG] = {

		ipareg_construct_dummy, ipareg_parse_dummy,

		0x00000044, 0},

};



/*

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ enum ipahal_reg_name { 
	IPA_IDLE_INDICATION_CFG,

	IPA_DPS_SEQUENCER_FIRST,

	IPA_HPS_SEQUENCER_FIRST,

	IPA_CLKON_CFG,

	IPA_REG_MAX,

};