From: Stephen Boyd <sboyd@codeaurora.org>
To: David Brown <davidb@codeaurora.org>,
Daniel Walker <dwalker@fifo99.com>,
Bryan Huntsman <bryanh@codeaurora.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Joerg Roedel <joro@8bytes.org>,
Stepan Moskovchenko <stepanm@codeaurora.org>
Subject: [PATCH 08/11] iommu/msm: Move mach includes to iommu directory
Date: Tue, 18 Jun 2013 17:04:38 -0700 [thread overview]
Message-ID: <1371600281-6118-9-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1371600281-6118-1-git-send-email-sboyd@codeaurora.org>
Two header files exist in mach-msm's include/mach directory that
are only used by the MSM iommu driver. Move these files to the
iommu driver directory and prefix them with "msm_". This allows
us to compile the MSM iommu driver on multi-platform kernels.
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
Joerg, please ack so this can go through the MSM tree.
drivers/iommu/msm_iommu.c | 4 ++--
arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h | 0
drivers/iommu/msm_iommu_dev.c | 4 ++--
.../include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h (100%)
rename arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h (100%)
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 8ab4f41..f5ff657 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -31,8 +31,8 @@
#include <asm/cacheflush.h>
#include <asm/sizes.h>
-#include <mach/iommu_hw-8xxx.h>
-#include <mach/iommu.h>
+#include "msm_iommu_hw-8xxx.h"
+#include "msm_iommu.h"
#define MRC(reg, processor, op1, crn, crm, op2) \
__asm__ __volatile__ ( \
diff --git a/arch/arm/mach-msm/include/mach/iommu.h b/drivers/iommu/msm_iommu.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/iommu.h
rename to drivers/iommu/msm_iommu.h
diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c
index 9144a6b..2ac1033 100644
--- a/drivers/iommu/msm_iommu_dev.c
+++ b/drivers/iommu/msm_iommu_dev.c
@@ -27,8 +27,8 @@
#include <linux/err.h>
#include <linux/slab.h>
-#include <mach/iommu_hw-8xxx.h>
-#include <mach/iommu.h>
+#include "msm_iommu_hw-8xxx.h"
+#include "msm_iommu.h"
struct iommu_ctx_iter_data {
/* input */
diff --git a/arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h b/drivers/iommu/msm_iommu_hw-8xxx.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h
rename to drivers/iommu/msm_iommu_hw-8xxx.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 08/11] iommu/msm: Move mach includes to iommu directory
Date: Tue, 18 Jun 2013 17:04:38 -0700 [thread overview]
Message-ID: <1371600281-6118-9-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1371600281-6118-1-git-send-email-sboyd@codeaurora.org>
Two header files exist in mach-msm's include/mach directory that
are only used by the MSM iommu driver. Move these files to the
iommu driver directory and prefix them with "msm_". This allows
us to compile the MSM iommu driver on multi-platform kernels.
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
Joerg, please ack so this can go through the MSM tree.
drivers/iommu/msm_iommu.c | 4 ++--
arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h | 0
drivers/iommu/msm_iommu_dev.c | 4 ++--
.../include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h (100%)
rename arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h (100%)
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 8ab4f41..f5ff657 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -31,8 +31,8 @@
#include <asm/cacheflush.h>
#include <asm/sizes.h>
-#include <mach/iommu_hw-8xxx.h>
-#include <mach/iommu.h>
+#include "msm_iommu_hw-8xxx.h"
+#include "msm_iommu.h"
#define MRC(reg, processor, op1, crn, crm, op2) \
__asm__ __volatile__ ( \
diff --git a/arch/arm/mach-msm/include/mach/iommu.h b/drivers/iommu/msm_iommu.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/iommu.h
rename to drivers/iommu/msm_iommu.h
diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c
index 9144a6b..2ac1033 100644
--- a/drivers/iommu/msm_iommu_dev.c
+++ b/drivers/iommu/msm_iommu_dev.c
@@ -27,8 +27,8 @@
#include <linux/err.h>
#include <linux/slab.h>
-#include <mach/iommu_hw-8xxx.h>
-#include <mach/iommu.h>
+#include "msm_iommu_hw-8xxx.h"
+#include "msm_iommu.h"
struct iommu_ctx_iter_data {
/* input */
diff --git a/arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h b/drivers/iommu/msm_iommu_hw-8xxx.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h
rename to drivers/iommu/msm_iommu_hw-8xxx.h
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-06-19 0:04 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 0:04 [PATCH 00/11] MSM DT based multi-platform support Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [PATCH 01/11] ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60 Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [PATCH 02/11] ARM: msm: Don't compile __msm_ioremap_caller() unless used Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [PATCH 03/11] ARM: msm: Move debug-macro.S to include/debug Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [PATCH 04/11] ARM: msm: Remove TMR and TMR0 static mappings Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [PATCH 05/11] ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [PATCH 06/11] ARM: msm: Move mach/board.h contents to common.h Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [PATCH 07/11] ARM: msm: Remove devices-iommu.c Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd [this message]
2013-06-19 0:04 ` [PATCH 08/11] iommu/msm: Move mach includes to iommu directory Stephen Boyd
2013-06-20 10:00 ` Joerg Roedel
2013-06-20 10:00 ` Joerg Roedel
2013-06-19 0:04 ` [PATCH 09/11] ARM: msm: Only compile io.c on platforms that use it Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [RFC/PATCH 10/11] ARM: msm: Only build clock.c on proc_comm based platforms Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 0:04 ` [RFC/PATCH 11/11] ARM: msm: Move MSM's DT based hardware to multi-platform support Stephen Boyd
2013-06-19 0:04 ` Stephen Boyd
2013-06-19 15:30 ` Arnd Bergmann
2013-06-19 15:30 ` Arnd Bergmann
2013-06-26 15:29 ` Ivan T. Ivanov
2013-06-26 15:29 ` Ivan T. Ivanov
2013-06-26 20:28 ` Stephen Boyd
2013-06-26 20:28 ` Stephen Boyd
2013-06-19 15:42 ` [PATCH 00/11] MSM DT based " Arnd Bergmann
2013-06-19 15:42 ` Arnd Bergmann
2013-06-21 1:37 ` Stephen Boyd
2013-06-21 1:37 ` Stephen Boyd
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=1371600281-6118-9-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=bryanh@codeaurora.org \
--cc=davidb@codeaurora.org \
--cc=dwalker@fifo99.com \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stepanm@codeaurora.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.