diff options
| -rw-r--r-- | arch/arm/mach-qcom/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-qcom/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-qcom/scm-boot.c | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/Makefile | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/scm.c (renamed from arch/arm/mach-qcom/scm.c) | 3 | ||||
| -rw-r--r-- | include/soc/qcom/scm.h (renamed from arch/arm/mach-qcom/scm.h) | 0 |
7 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 3b5539cc907b..891442eb01b1 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -25,7 +25,4 @@ config ARCH_MSM8974 bool "Enable support for MSM8974" select HAVE_ARM_ARCH_TIMER -config QCOM_SCM - bool - endif diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile index 8f756ae1ae31..db41e8c27aec 100644 --- a/arch/arm/mach-qcom/Makefile +++ b/arch/arm/mach-qcom/Makefile @@ -1,5 +1,3 @@ obj-y := board.o obj-$(CONFIG_SMP) += platsmp.o -obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o - -CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) +obj-$(CONFIG_QCOM_SCM) += scm-boot.o diff --git a/arch/arm/mach-qcom/scm-boot.c b/arch/arm/mach-qcom/scm-boot.c index 45cee3e469a5..5add20e64d99 100644 --- a/arch/arm/mach-qcom/scm-boot.c +++ b/arch/arm/mach-qcom/scm-boot.c @@ -17,8 +17,8 @@ #include <linux/module.h> #include <linux/slab.h> +#include <soc/qcom/scm.h> -#include "scm.h" #include "scm-boot.h" /* diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 7bd2c94f54a4..7dcd554496c7 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -9,3 +9,5 @@ config QCOM_GSBI functions for connecting the underlying serial UART, SPI, and I2C devices to the output pins. +config QCOM_SCM + bool diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 438901257ac1..a39446d08ac6 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -1 +1,3 @@ obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o +CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) +obj-$(CONFIG_QCOM_SCM) += scm.o diff --git a/arch/arm/mach-qcom/scm.c b/drivers/soc/qcom/scm.c index a77349d34e78..0ae8f97dc56e 100644 --- a/arch/arm/mach-qcom/scm.c +++ b/drivers/soc/qcom/scm.c @@ -22,10 +22,11 @@ #include <linux/errno.h> #include <linux/err.h> +#include <soc/qcom/scm.h> + #include <asm/outercache.h> #include <asm/cacheflush.h> -#include "scm.h" #define SCM_ENOMEM -5 #define SCM_EOPNOTSUPP -4 diff --git a/arch/arm/mach-qcom/scm.h b/include/soc/qcom/scm.h index 00b31ea58f29..00b31ea58f29 100644 --- a/arch/arm/mach-qcom/scm.h +++ b/include/soc/qcom/scm.h |