[RFC,01/13] msm: scm: Move scm-boot files to drivers/soc and include/soc

Message ID 1407470722-23015-2-git-send-email-lina.iyer@linaro.org
State New
Headers show

Commit Message

Lina Iyer Aug. 8, 2014, 4:05 a.m.
Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
---
 arch/arm/mach-qcom/Makefile                         | 1 -
 drivers/soc/qcom/Makefile                           | 2 +-
 {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c | 4 ++--
 {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h | 0
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c (97%)
 rename {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h (100%)

diff --git a/arch/arm/mach-qcom/scm-boot.h b/include/soc/qcom/scm-boot.h
similarity index 100%
rename from arch/arm/mach-qcom/scm-boot.h
rename to include/soc/qcom/scm-boot.h

Comments

Pramod Gurav Aug. 8, 2014, 7:42 a.m. | #1
Hi Lina,

On Friday 08 August 2014 09:35 AM, Lina Iyer wrote:
> Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
> ---
>  arch/arm/mach-qcom/Makefile                         | 1 -
>  drivers/soc/qcom/Makefile                           | 2 +-
>  {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c | 4 ++--
>  {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h | 0
>  4 files changed, 3 insertions(+), 4 deletions(-)
>  rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c (97%)
>  rename {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h (100%)

There remain references to "scm-boot.h" in platsmp.c. Can we replace
them with "soc/qcom/scm-boot.h" in this same patch so that build does
not break with only applying this patch. I see these changes in "qcom:
platsmp: Enable deeper idle states for hotplug" hence build may not
break with all your patches. Correct if I am wrong.

Note: I am trying to apply these patches on top on rpm changes in
drivers/soc/qoc hence have to manual apply your patches. Also building
kernel after each patch and found the break.

> 
> diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile
> index db41e8c..e324375 100644
> --- a/arch/arm/mach-qcom/Makefile
> +++ b/arch/arm/mach-qcom/Makefile
> @@ -1,3 +1,2 @@
>  obj-y			:= board.o
>  obj-$(CONFIG_SMP)	+= platsmp.o
> -obj-$(CONFIG_QCOM_SCM)	+= scm-boot.o
> diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
> index a39446d..70d52ed 100644
> --- a/drivers/soc/qcom/Makefile
> +++ b/drivers/soc/qcom/Makefile
> @@ -1,3 +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
> +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o
> diff --git a/arch/arm/mach-qcom/scm-boot.c b/drivers/soc/qcom/scm-boot.c
> similarity index 97%
> rename from arch/arm/mach-qcom/scm-boot.c
> rename to drivers/soc/qcom/scm-boot.c
> index 5add20e..60ff7b4 100644
> --- a/arch/arm/mach-qcom/scm-boot.c
> +++ b/drivers/soc/qcom/scm-boot.c
> @@ -17,9 +17,9 @@
>  
>  #include <linux/module.h>
>  #include <linux/slab.h>
> -#include <soc/qcom/scm.h>
>  
> -#include "scm-boot.h"
> +#include <soc/qcom/scm.h>
> +#include <soc/qcom/scm-boot.h>
>  
>  /*
>   * Set the cold/warm boot address for one of the CPU cores.
> diff --git a/arch/arm/mach-qcom/scm-boot.h b/include/soc/qcom/scm-boot.h
> similarity index 100%
> rename from arch/arm/mach-qcom/scm-boot.h
> rename to include/soc/qcom/scm-boot.h
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lina Iyer Aug. 8, 2014, 2:39 p.m. | #2
On Fri, 8 Aug 2014, Pramod Gurav wrote:

> Hi Lina,
> 
> There remain references to "scm-boot.h" in platsmp.c. Can we replace
> them with "soc/qcom/scm-boot.h" in this same patch so that build does
> not break with only applying this patch. I see these changes in "qcom:
> platsmp: Enable deeper idle states for hotplug" hence build may not
> break with all your patches. Correct if I am wrong.
> 
> Note: I am trying to apply these patches on top on rpm changes in
> drivers/soc/qoc hence have to manual apply your patches. Also building
> kernel after each patch and found the break.
Thanks, will take care of it in the next set.

Lina
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile
index db41e8c..e324375 100644
--- a/arch/arm/mach-qcom/Makefile
+++ b/arch/arm/mach-qcom/Makefile
@@ -1,3 +1,2 @@ 
 obj-y			:= board.o
 obj-$(CONFIG_SMP)	+= platsmp.o
-obj-$(CONFIG_QCOM_SCM)	+= scm-boot.o
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index a39446d..70d52ed 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -1,3 +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
+obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o
diff --git a/arch/arm/mach-qcom/scm-boot.c b/drivers/soc/qcom/scm-boot.c
similarity index 97%
rename from arch/arm/mach-qcom/scm-boot.c
rename to drivers/soc/qcom/scm-boot.c
index 5add20e..60ff7b4 100644
--- a/arch/arm/mach-qcom/scm-boot.c
+++ b/drivers/soc/qcom/scm-boot.c
@@ -17,9 +17,9 @@ 
 
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <soc/qcom/scm.h>
 
-#include "scm-boot.h"
+#include <soc/qcom/scm.h>
+#include <soc/qcom/scm-boot.h>
 
 /*
  * Set the cold/warm boot address for one of the CPU cores.