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

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

Merge "soc: qcom: Add new scm API support in function scm_set_boot_addr"

parents b3c55561 0268defe
Loading
Loading
Loading
Loading
+14 −5
Original line number Diff line number Diff line
/* Copyright (c) 2010, 2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2010, 2014, 2016, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -24,12 +24,21 @@ int scm_set_boot_addr(phys_addr_t addr, unsigned int flags)
		u32 flags;
		u32 addr;
	} cmd;
	struct scm_desc desc = {0};

	if (!is_scm_armv8()) {
		cmd.addr = addr;
		cmd.flags = flags;
		return scm_call(SCM_SVC_BOOT, SCM_BOOT_ADDR,
				&cmd, sizeof(cmd), NULL, 0);
	}

	desc.args[0] = addr;
	desc.args[1] = flags;
	desc.arginfo = SCM_ARGS(2);

	return scm_call2(SCM_SIP_FNID(SCM_SVC_BOOT, SCM_BOOT_ADDR), &desc);
}
EXPORT_SYMBOL(scm_set_boot_addr);

/**