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

Commit e41fa371 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: gsi: Update GSI 2.5 registers offset"

parents 5f038f38 ecf6f127

drivers/platform/msm/gsi/gsi.c

+27 −0
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ int gsi_register_device(struct gsi_per_props *props, unsigned long *dev_hdl) 
{

	int res;

	uint32_t val;

	int needed_reg_ver;



	if (!gsi_ctx) {

		pr_err("%s:%d gsi context not allocated\n", __func__, __LINE__);
@@ -968,6 +969,32 @@ int gsi_register_device(struct gsi_per_props *props, unsigned long *dev_hdl) 
		return -GSI_STATUS_UNSUPPORTED_OP;

	}



	switch (props->ver) {

	case GSI_VER_1_0:

	case GSI_VER_1_2:

	case GSI_VER_1_3:

	case GSI_VER_2_0:

	case GSI_VER_2_2:

		needed_reg_ver = GSI_REGISTER_VER_1;

		break;

	case GSI_VER_2_5:

		needed_reg_ver = GSI_REGISTER_VER_2;

		break;

	case GSI_VER_ERR:

	case GSI_VER_MAX:

	default:

		GSIERR("GSI version is not supported %d\n", props->ver);

		return -GSI_STATUS_INVALID_PARAMS;

	}



	if (needed_reg_ver != GSI_REGISTER_VER_CURRENT) {

		GSIERR("Invalid register version. current=%d, needed=%d\n",

			GSI_REGISTER_VER_CURRENT, needed_reg_ver);

		return -GSI_STATUS_UNSUPPORTED_OP;

	}

	GSIDBG("gsi ver %d register ver %d needed register ver %d\n",

		props->ver, GSI_REGISTER_VER_CURRENT, needed_reg_ver);



	spin_lock_init(&gsi_ctx->slock);

	if (props->intr == GSI_INTR_IRQ) {

		if (!props->irq) {

drivers/platform/msm/gsi/gsi_reg.h

+13 −1047

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/gsi/gsi_reg_v1.h

0 → 100644
+1063 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/gsi/gsi_reg_v2.h

0 → 100644
+1063 −0

File added.

Preview size limit exceeded, changes collapsed.