ARM: qcom: Merge scm and scm boot code together

Put all scm related code into a single file as a first step in cleaning
up the scm interface to just expose functional behavior insteam of making
direct scm calls.

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

diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile
index 8f756ae..10b6841 100644 (file)
--- a/arch/arm/mach-qcom/Makefile
+++ b/arch/arm/mach-qcom/Makefile
@@ -1,5 +1,5 @@
 obj-y                  := board.o
 obj-$(CONFIG_SMP)      += platsmp.o
-obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o
+obj-$(CONFIG_QCOM_SCM) += scm.o
 
 CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)

diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
index 09cffed..8f4962e 100644 (file)
--- a/arch/arm/mach-qcom/platsmp.c
+++ b/arch/arm/mach-qcom/platsmp.c
@@ -20,7 +20,7 @@
 
 #include <asm/smp_plat.h>
 
-#include "scm-boot.h"
+#include "scm.h"
 
 #define VDD_SC1_ARRAY_CLAMP_GFS_CTL    0x35a0
 #define SCSS_CPU1CORE_RESET            0x2d80

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

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

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

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