Merge "soc: qcom: shared_memory: Add support for the new scm_call2 API"

		u32 share_type;

	} request;

	int resp = 0;

	struct scm_desc desc = {0};

	request.start = base;

	request.size = size;

	request.proc = proc_type;

	request.share_type = SHARED_HEAP_TYPE_READ |

	desc.arginfo = SCM_ARGS(4);

	desc.args[0] = request.start = base;

	desc.args[1] = request.size = size;

	desc.args[2] = request.proc = proc_type;

	desc.args[3] = request.share_type = SHARED_HEAP_TYPE_READ |

						SHARED_HEAP_TYPE_WRITE;

	if (!is_scm_armv8())

		rc = scm_call(SHARED_HEAP_SVC_ID, SHARED_HEAP_CMD_ID, &request,

				  sizeof(request), &resp, 1);

	else

		rc = scm_call2(SCM_SIP_FNID(SHARED_HEAP_SVC_ID,

			       SHARED_HEAP_CMD_ID), &desc);

	if (rc)

		pr_err("shared_heap: Failed to unlock the shared heap %d\n",