ARM: qcom: Prep scm code for move to drivers/firmware

Add qcom prefix to functions, etc to create a unique name space for the
scm code as it gets ready to move out of qcom specific mach dir.

Signed-off-by: Kumar Gala <galak@codeaurora.org>

diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
index 8f4962e..596e623 100644 (file)
--- a/arch/arm/mach-qcom/platsmp.c
+++ b/arch/arm/mach-qcom/platsmp.c
@@ -323,9 +323,9 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus)
        unsigned int flags = 0;
        static const int cold_boot_flags[] = {
                0,
-               SCM_FLAG_COLDBOOT_CPU1,
-               SCM_FLAG_COLDBOOT_CPU2,
-               SCM_FLAG_COLDBOOT_CPU3,
+               QCOM_SCM_FLAG_COLDBOOT_CPU1,
+               QCOM_SCM_FLAG_COLDBOOT_CPU2,
+               QCOM_SCM_FLAG_COLDBOOT_CPU3,
        };
 
        for_each_present_cpu(cpu) {
@@ -337,7 +337,7 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus)
                flags |= cold_boot_flags[map];
        }
 
-       if (scm_set_boot_addr(virt_to_phys(secondary_startup_arm), flags)) {
+       if (qcom_scm_set_boot_addr(virt_to_phys(secondary_startup_arm), flags)) {
                for_each_present_cpu(cpu) {
                        if (cpu == smp_processor_id())
                                continue;

diff --cc arch/arm/mach-qcom/scm.c
Simple merge

diff --cc arch/arm/mach-qcom/scm.h
Simple merge