All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Boyd <sboyd@codeaurora.org>
To: David Brown <davidb@codeaurora.org>, Kumar Gala <galak@codeaurora.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Lina Iyer <lina.iyer@linaro.org>
Subject: [PATCH 8/8] msm: scm: Move the scm driver to drivers/soc/qcom
Date: Mon,  4 Aug 2014 18:31:50 -0700	[thread overview]
Message-ID: <1407202310-3359-9-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1407202310-3359-1-git-send-email-sboyd@codeaurora.org>

Architectural changes in the ARM Linux kernel tree mandate
the eventual removal of the mach-* directories. Move the
scm driver to drivers/soc/qcom and the scm header to
include/soc/qcom to support that removal.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/mach-qcom/Kconfig                     | 3 ---
 arch/arm/mach-qcom/Makefile                    | 4 +---
 arch/arm/mach-qcom/scm-boot.c                  | 2 +-
 drivers/soc/qcom/Kconfig                       | 2 ++
 drivers/soc/qcom/Makefile                      | 2 ++
 {arch/arm/mach-qcom => drivers/soc/qcom}/scm.c | 3 ++-
 {arch/arm/mach-qcom => include/soc/qcom}/scm.h | 0
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm.c (99%)
 rename {arch/arm/mach-qcom => include/soc/qcom}/scm.h (100%)

diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index ee5697ba05bc..57d112d62018 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -23,7 +23,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
similarity index 99%
rename from arch/arm/mach-qcom/scm.c
rename to drivers/soc/qcom/scm.c
index cfd4717aec78..2e98d80e2387 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
similarity index 100%
rename from arch/arm/mach-qcom/scm.h
rename to include/soc/qcom/scm.h
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 8/8] msm: scm: Move the scm driver to drivers/soc/qcom
Date: Mon,  4 Aug 2014 18:31:50 -0700	[thread overview]
Message-ID: <1407202310-3359-9-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1407202310-3359-1-git-send-email-sboyd@codeaurora.org>

Architectural changes in the ARM Linux kernel tree mandate
the eventual removal of the mach-* directories. Move the
scm driver to drivers/soc/qcom and the scm header to
include/soc/qcom to support that removal.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/mach-qcom/Kconfig                     | 3 ---
 arch/arm/mach-qcom/Makefile                    | 4 +---
 arch/arm/mach-qcom/scm-boot.c                  | 2 +-
 drivers/soc/qcom/Kconfig                       | 2 ++
 drivers/soc/qcom/Makefile                      | 2 ++
 {arch/arm/mach-qcom => drivers/soc/qcom}/scm.c | 3 ++-
 {arch/arm/mach-qcom => include/soc/qcom}/scm.h | 0
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm.c (99%)
 rename {arch/arm/mach-qcom => include/soc/qcom}/scm.h (100%)

diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index ee5697ba05bc..57d112d62018 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -23,7 +23,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
similarity index 99%
rename from arch/arm/mach-qcom/scm.c
rename to drivers/soc/qcom/scm.c
index cfd4717aec78..2e98d80e2387 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
similarity index 100%
rename from arch/arm/mach-qcom/scm.h
rename to include/soc/qcom/scm.h
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

  parent reply	other threads:[~2014-08-05  1:31 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-05  1:31 [PATCH 0/8] qcom SCM updates Stephen Boyd
2014-08-05  1:31 ` Stephen Boyd
2014-08-05  1:31 ` [PATCH 1/8] msm: scm: Fix incorrect cache invalidation Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31 ` [PATCH 2/8] msm: scm: Get cacheline size from CTR Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31 ` [PATCH 3/8] msm: scm: Flush the command buffer only instead of the entire cache Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31 ` [PATCH 4/8] msm: scm: Add atomic SCM APIs Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31 ` [PATCH 5/8] msm: scm: Add API to query for service/command availability Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31 ` [PATCH 6/8] msm: scm: Add a feat version query API Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31 ` [PATCH 7/8] msm: scm: Add logging of actual return code from scm call Stephen Boyd
2014-08-05  1:31   ` Stephen Boyd
2014-08-05  1:31 ` Stephen Boyd [this message]
2014-08-05  1:31   ` [PATCH 8/8] msm: scm: Move the scm driver to drivers/soc/qcom Stephen Boyd
2014-08-05  4:07   ` Lina Iyer
2014-08-05  4:07     ` Lina Iyer
2014-08-05 20:12     ` Bjorn Andersson
2014-08-05 20:12       ` Bjorn Andersson
2014-08-05 20:12       ` Bjorn Andersson
2014-08-05 20:17       ` Lina Iyer
2014-08-05 20:17         ` Lina Iyer
2014-08-05 20:17         ` Lina Iyer
2015-01-22  1:13   ` Olof Johansson
2015-01-22  1:13     ` Olof Johansson
2015-01-22  1:13     ` Olof Johansson
2015-01-22  1:53     ` Bjorn Andersson
2015-01-22  1:53       ` Bjorn Andersson
2015-01-22  1:53       ` Bjorn Andersson
2015-01-22 16:49       ` Kumar Gala
2015-01-22 16:49         ` Kumar Gala
2015-01-22 16:49         ` Kumar Gala
2015-01-23  1:19     ` Rob Clark
2015-01-23  1:19       ` Rob Clark
2015-01-23  1:19       ` Rob Clark
2014-09-17 22:08 ` [PATCH 0/8] qcom SCM updates Kumar Gala
2014-09-17 22:08   ` Kumar Gala

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1407202310-3359-9-git-send-email-sboyd@codeaurora.org \
    --to=sboyd@codeaurora.org \
    --cc=davidb@codeaurora.org \
    --cc=galak@codeaurora.org \
    --cc=lina.iyer@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.