repost of the omap iommu header changes to remove plat includes

PATCH Superseded Tony Lindgren 2 participants 9 messages Oct 16, 2012 – Oct 18, 2012

Subsystems (6)

Arm (32-bit) Media (V4L/DVB) Arm sub-architectures OMAP2+ support +2 more subsystems

lore

Share & tools

lore

Tony Lindgren

author maintainer

2012-10-16 00:36 UTC #0 lore raw

cover repost of the omap iommu header changes to remove plat includes

Hi,

Looks like Joerg was not cc:d in the original series, so I'm reposting these updated against v3.7-rc1.

Regards,

Tony

---

Ido Yariv (4):
ARM: OMAP: Merge iommu2.h into iommu.h
ARM: OMAP2+: Make some definitions local
ARM: OMAP2+: Move iommu/iovmm headers to platform_data
ARM: OMAP2+: Move iopgtable header to drivers/iommu/

 arch/arm/mach-omap2/devices.c               |    2 
 arch/arm/mach-omap2/iommu2.c                |    8 ++
 arch/arm/mach-omap2/omap-iommu.c            |    2 
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c  |    2 
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c  |    2 
 arch/arm/plat-omap/include/plat/iommu2.h    |   96 -----------------------
 drivers/iommu/omap-iommu-debug.c            |    7 +-
 drivers/iommu/omap-iommu.c                  |    5 +
 drivers/iommu/omap-iommu.h                  |   59 ++++++++++++++
 drivers/iommu/omap-iopgtable.h              |    0 
 drivers/iommu/omap-iovmm.c                  |    7 +-
 drivers/media/platform/omap3isp/isp.h       |    5 +
 drivers/media/platform/omap3isp/ispvideo.c  |    5 -
 include/linux/platform_data/iommu-omap.h    |  115 ++++++++++++++++-----------
 include/linux/platform_data/iovmm-omap.h    |    0 
 15 files changed, 155 insertions(+), 160 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/plat/iommu2.h
 create mode 100644 drivers/iommu/omap-iommu.h
 rename arch/arm/plat-omap/include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h (100%)
 rename arch/arm/plat-omap/include/plat/iommu.h => include/linux/platform_data/iommu-omap.h (69%)
 rename arch/arm/plat-omap/include/plat/iovmm.h => include/linux/platform_data/iovmm-omap.h (100%)

Signature · 1 line

Signature

Tony Lindgren

author maintainer

2012-10-16 00:36 UTC #1 lore raw

PATCH 1/4 ARM: OMAP: Merge iommu2.h into iommu.h

From: Ido Yariv <[email protected]>

Since iommu is not supported on OMAP1 and will not likely to ever be supported, merge plat/iommu2.h into iommu.h so only one file would have to move to platform_data/ as part of the single zImage effort.

Cc Joerg Roedel <[email protected]>

Cc Ohad Ben-Cohen <[email protected]>

Signed-off-by Ido Yariv <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/plat-omap/include/plat/iommu.h  |   88 ++++++++++++++++++++++++++--
 arch/arm/plat-omap/include/plat/iommu2.h |   96 ------------------------------
 2 files changed, 83 insertions(+), 101 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/plat/iommu2.h

arch/arm/plat-omap/include/plat/iommu.h +83 -5

index 68b5f03..7e8c7b6 100644
@@ -13,6 +13,12 @@
 #ifndef __MACH_IOMMU_H
 #define __MACH_IOMMU_H
 
+#include <linux/io.h>
+
+#if defined(CONFIG_ARCH_OMAP1)
+#error "iommu for this processor not implemented yet"
+#endif
+
 struct iotlb_entry {
 	u32 da;
 	u32 pa;

@@ -159,11 +165,70 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
 #define OMAP_IOMMU_ERR_TBLWALK_FAULT	(1 << 3)
 #define OMAP_IOMMU_ERR_MULTIHIT_FAULT	(1 << 4)
 
-#if defined(CONFIG_ARCH_OMAP1)
-#error "iommu for this processor not implemented yet"
-#else
-#include <plat/iommu2.h>
-#endif
+/*
+ * MMU Register offsets
+ */
+#define MMU_REVISION		0x00
+#define MMU_SYSCONFIG		0x10
+#define MMU_SYSSTATUS		0x14
+#define MMU_IRQSTATUS		0x18
+#define MMU_IRQENABLE		0x1c
+#define MMU_WALKING_ST		0x40
+#define MMU_CNTL		0x44
+#define MMU_FAULT_AD		0x48
+#define MMU_TTB			0x4c
+#define MMU_LOCK		0x50
+#define MMU_LD_TLB		0x54
+#define MMU_CAM			0x58
+#define MMU_RAM			0x5c
+#define MMU_GFLUSH		0x60
+#define MMU_FLUSH_ENTRY		0x64
+#define MMU_READ_CAM		0x68
+#define MMU_READ_RAM		0x6c
+#define MMU_EMU_FAULT_AD	0x70
+
+#define MMU_REG_SIZE		256
+
+/*
+ * MMU Register bit definitions
+ */
+#define MMU_LOCK_BASE_SHIFT	10
+#define MMU_LOCK_BASE_MASK	(0x1f << MMU_LOCK_BASE_SHIFT)
+#define MMU_LOCK_BASE(x)	\
+	((x & MMU_LOCK_BASE_MASK) >> MMU_LOCK_BASE_SHIFT)
+
+#define MMU_LOCK_VICT_SHIFT	4
+#define MMU_LOCK_VICT_MASK	(0x1f << MMU_LOCK_VICT_SHIFT)
+#define MMU_LOCK_VICT(x)	\
+	((x & MMU_LOCK_VICT_MASK) >> MMU_LOCK_VICT_SHIFT)
+
+#define MMU_CAM_VATAG_SHIFT	12
+#define MMU_CAM_VATAG_MASK \
+	((~0UL >> MMU_CAM_VATAG_SHIFT) << MMU_CAM_VATAG_SHIFT)
+#define MMU_CAM_P		(1 << 3)
+#define MMU_CAM_V		(1 << 2)
+#define MMU_CAM_PGSZ_MASK	3
+#define MMU_CAM_PGSZ_1M		(0 << 0)
+#define MMU_CAM_PGSZ_64K	(1 << 0)
+#define MMU_CAM_PGSZ_4K		(2 << 0)
+#define MMU_CAM_PGSZ_16M	(3 << 0)
+
+#define MMU_RAM_PADDR_SHIFT	12
+#define MMU_RAM_PADDR_MASK \
+	((~0UL >> MMU_RAM_PADDR_SHIFT) << MMU_RAM_PADDR_SHIFT)
+#define MMU_RAM_ENDIAN_SHIFT	9
+#define MMU_RAM_ENDIAN_MASK	(1 << MMU_RAM_ENDIAN_SHIFT)
+#define MMU_RAM_ENDIAN_BIG	(1 << MMU_RAM_ENDIAN_SHIFT)
+#define MMU_RAM_ENDIAN_LITTLE	(0 << MMU_RAM_ENDIAN_SHIFT)
+#define MMU_RAM_ELSZ_SHIFT	7
+#define MMU_RAM_ELSZ_MASK	(3 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_ELSZ_8		(0 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_ELSZ_16		(1 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_ELSZ_32		(2 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_ELSZ_NONE	(3 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_MIXED_SHIFT	6
+#define MMU_RAM_MIXED_MASK	(1 << MMU_RAM_MIXED_SHIFT)
+#define MMU_RAM_MIXED		MMU_RAM_MIXED_MASK
 
 /*
  * utilities for super page(16MB, 1MB, 64KB and 4KB)

@@ -218,4 +283,17 @@ omap_iommu_dump_ctx(struct omap_iommu *obj, char *buf, ssize_t len);
 extern size_t
 omap_dump_tlb_entries(struct omap_iommu *obj, char *buf, ssize_t len);
 
+/*
+ * register accessors
+ */
+static inline u32 iommu_read_reg(struct omap_iommu *obj, size_t offs)
+{
+	return __raw_readl(obj->regbase + offs);
+}
+
+static inline void iommu_write_reg(struct omap_iommu *obj, u32 val, size_t offs)
+{
+	__raw_writel(val, obj->regbase + offs);
+}
+
 #endif /* __MACH_IOMMU_H */

arch/arm/plat-omap/include/plat/iommu2.h deleted +0 ~~-96~~

96 lines not on this page · raw message

Tony Lindgren

author maintainer

2012-10-16 00:36 UTC #2 lore raw

PATCH 2/4 ARM: OMAP2+: Make some definitions local

In reply to Tony Lindgren

From: Ido Yariv <[email protected]>

Move some of the definitions in plat/iommu.h that can be made local to either drivers/iommu or arch/arm/mach-omap2. This minimizes the number of global definitions once plat/iommu.h moves to platform_data/ as part of the single zImage effort.

Cc Joerg Roedel <[email protected]>

Cc Ohad Ben-Cohen <[email protected]>

Signed-off-by Ido Yariv <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap2/iommu2.c            |    6 +++
 arch/arm/plat-omap/include/plat/iommu.h |   55 -----------------------------
 drivers/iommu/omap-iommu-debug.c        |    2 +
 drivers/iommu/omap-iommu.c              |    2 +
 drivers/iommu/omap-iommu.h              |   59 +++++++++++++++++++++++++++++++
 drivers/iommu/omap-iovmm.c              |    2 +
 6 files changed, 71 insertions(+), 55 deletions(-)
 create mode 100644 drivers/iommu/omap-iommu.h

arch/arm/mach-omap2/iommu2.c +6 -0

index eefc379..c986880 100644
@@ -65,6 +65,12 @@
 	 ((pgsz) == MMU_CAM_PGSZ_64K) ? 0xffff0000 :	\
 	 ((pgsz) == MMU_CAM_PGSZ_4K)  ? 0xfffff000 : 0)
 
+/* IOMMU errors */
+#define OMAP_IOMMU_ERR_TLB_MISS		(1 << 0)
+#define OMAP_IOMMU_ERR_TRANS_FAULT	(1 << 1)
+#define OMAP_IOMMU_ERR_EMU_MISS		(1 << 2)
+#define OMAP_IOMMU_ERR_TBLWALK_FAULT	(1 << 3)
+#define OMAP_IOMMU_ERR_MULTIHIT_FAULT	(1 << 4)
 
 static void __iommu_set_twl(struct omap_iommu *obj, bool on)
 {

arch/arm/plat-omap/include/plat/iommu.h +0 ~~-55~~

85 lines not on this page · raw message

drivers/iommu/omap-iommu-debug.c +2 -0

index f55fc5d..a0b0309 100644
@@ -24,6 +24,8 @@
 
 #include <plat/iopgtable.h>
 
+#include "omap-iommu.h"
+
 #define MAXCOLUMN 100 /* for short messages */
 
 static DEFINE_MUTEX(iommu_debug_lock);

drivers/iommu/omap-iommu.c +2 -0

index d0b1234..80844b3 100644
@@ -28,6 +28,8 @@
 
 #include <plat/iopgtable.h>
 
+#include "omap-iommu.h"
+
 #define for_each_iotlb_cr(obj, n, __i, cr)				\
 	for (__i = 0;							\
 	     (__i < (n)) && (cr = __iotlb_read_cr((obj), __i), true);	\

drivers/iommu/omap-iommu.h new file +59 -0

59 lines not on this page · raw message

drivers/iommu/omap-iovmm.c +2 -0

index 2e10c3e..b362fb5 100644
@@ -26,6 +26,8 @@
 
 #include <plat/iopgtable.h>
 
+#include "omap-iommu.h"
+
 static struct kmem_cache *iovm_area_cachep;
 
 /* return the offset of the first scatterlist entry in a sg table */

Tony Lindgren

author maintainer

2012-10-16 00:36 UTC #3 lore raw

PATCH 3/4 ARM: OMAP2+: Move iommu/iovmm headers to platform_data

In reply to Tony Lindgren

From: Ido Yariv <[email protected]>

Move iommu/iovmm headers from plat/ to platform_data/ as part of the single zImage work.

Cc Joerg Roedel <[email protected]>

Cc Ohad Ben-Cohen <[email protected]>

Signed-off-by Ido Yariv <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap2/devices.c              |    2 +-
 arch/arm/mach-omap2/iommu2.c               |    2 +-
 arch/arm/mach-omap2/omap-iommu.c           |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |    2 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
 drivers/iommu/omap-iommu-debug.c           |    4 ++--
 drivers/iommu/omap-iommu.c                 |    2 +-
 drivers/iommu/omap-iovmm.c                 |    4 ++--
 drivers/media/platform/omap3isp/isp.h      |    5 +++--
 drivers/media/platform/omap3isp/ispvideo.c |    5 ++---
 include/linux/platform_data/iommu-omap.h   |    0 
 include/linux/platform_data/iovmm-omap.h   |    0 
 12 files changed, 15 insertions(+), 15 deletions(-)
 rename arch/arm/plat-omap/include/plat/iommu.h => include/linux/platform_data/iommu-omap.h (100%)
 rename arch/arm/plat-omap/include/plat/iovmm.h => include/linux/platform_data/iovmm-omap.h (100%)

arch/arm/mach-omap2/devices.c +1 -1

index c8c2117..6cd0c2a 100644
@@ -126,7 +126,7 @@ static struct platform_device omap2cam_device = {
 
 #if defined(CONFIG_IOMMU_API)
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 static struct resource omap3isp_resources[] = {
 	{

arch/arm/mach-omap2/iommu2.c +1 -1

index c986880..82f9174 100644
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/stringify.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 /*
  * omap2 architecture specific register bit definitions

arch/arm/mach-omap2/omap-iommu.c +1 -1

index df298d4..a6a4ff8 100644
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 #include "soc.h"
 #include "common.h"

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1

index f67b7ee..621bc71 100644
@@ -26,8 +26,8 @@
 #include <plat/mmc.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/iommu-omap.h>
 #include <plat/dmtimer.h>
-#include <plat/iommu.h>
 
 #include "am35xx.h"

arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1 -1

index 652d028..5850b3e 100644
@@ -27,10 +27,10 @@
 #include <plat/dma.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
+#include <linux/platform_data/iommu-omap.h>
 #include <plat/mmc.h>
 #include <plat/dmtimer.h>
 #include <plat/common.h>
-#include <plat/iommu.h>
 
 #include "omap_hwmod_common_data.h"
 #include "cm1_44xx.h"

drivers/iommu/omap-iommu-debug.c +2 -2

index a0b0309..8c1e30b 100644
@@ -19,8 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/debugfs.h>
 
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include <plat/iopgtable.h>

drivers/iommu/omap-iommu.c +1 -1

index 80844b3..6100334 100644
@@ -24,7 +24,7 @@
 
 #include <asm/cacheflush.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 #include <plat/iopgtable.h>

drivers/iommu/omap-iovmm.c +2 -2

index b362fb5..b5ac2cd 100644
@@ -21,8 +21,8 @@
 #include <asm/cacheflush.h>
 #include <asm/mach/map.h>
 
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include <plat/iopgtable.h>

drivers/media/platform/omap3isp/isp.h +3 -2

index 8be7487..62c76f9 100644
@@ -34,8 +34,9 @@
 #include <linux/platform_device.h>
 #include <linux/wait.h>
 #include <linux/iommu.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include "ispstat.h"
 #include "ispccdc.h"

drivers/media/platform/omap3isp/ispvideo.c +2 -3

index a0b737fe..75ecfc8 100644
@@ -34,9 +34,8 @@
 #include <linux/vmalloc.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
-#include <plat/omap-pm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include "ispvideo.h"
 #include "isp.h"

include/linux/platform_data/iommu-omap.h renamed from arch/arm/plat-omap/include/plat/iommu.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/iommu.h
rename to include/linux/platform_data/iommu-omap.h

include/linux/platform_data/iovmm-omap.h renamed from arch/arm/plat-omap/include/plat/iovmm.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/iovmm.h
rename to include/linux/platform_data/iovmm-omap.h

Tony Lindgren

author maintainer

2012-10-16 00:38 UTC #4 lore raw

PATCH 3/4 ARM: OMAP2+: Move iommu/iovmm headers to platform_data

Quoted 4 lines · Tony Lindgren

From: Ido Yariv <[email protected]>
Move iommu/iovmm headers from plat/ to platform_data/ as part of the single zImage work.

Joerg, I'm planning to apply these four patches against -rc1 into omap-for-v3.8/cleanup-headers-iommu branch if these look OK to you.

That branch won't contain other patches and you can pull it in too if needed.

Regards,

Tony

Quoted 179 lines

Cc Joerg Roedel <[email protected]>

Cc Ohad Ben-Cohen <[email protected]>

Signed-off-by Ido Yariv <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap2/devices.c              |    2 +-
 arch/arm/mach-omap2/iommu2.c               |    2 +-
 arch/arm/mach-omap2/omap-iommu.c           |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |    2 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
 drivers/iommu/omap-iommu-debug.c           |    4 ++--
 drivers/iommu/omap-iommu.c                 |    2 +-
 drivers/iommu/omap-iovmm.c                 |    4 ++--
 drivers/media/platform/omap3isp/isp.h      |    5 +++--
 drivers/media/platform/omap3isp/ispvideo.c |    5 ++---
 include/linux/platform_data/iommu-omap.h   |    0 
 include/linux/platform_data/iovmm-omap.h   |    0 
 12 files changed, 15 insertions(+), 15 deletions(-)
 rename arch/arm/plat-omap/include/plat/iommu.h => include/linux/platform_data/iommu-omap.h (100%)
 rename arch/arm/plat-omap/include/plat/iovmm.h => include/linux/platform_data/iovmm-omap.h (100%)

arch/arm/mach-omap2/devices.c +1 -1

index c8c2117..6cd0c2a 100644
@@ -126,7 +126,7 @@ static struct platform_device omap2cam_device = {
 
 #if defined(CONFIG_IOMMU_API)
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 static struct resource omap3isp_resources[] = {
 	{

arch/arm/mach-omap2/iommu2.c +1 -1

index c986880..82f9174 100644
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/stringify.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 /*
  * omap2 architecture specific register bit definitions

arch/arm/mach-omap2/omap-iommu.c +1 -1

index df298d4..a6a4ff8 100644
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 #include "soc.h"
 #include "common.h"

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1

index f67b7ee..621bc71 100644
@@ -26,8 +26,8 @@
 #include <plat/mmc.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/iommu-omap.h>
 #include <plat/dmtimer.h>
-#include <plat/iommu.h>
 
 #include "am35xx.h"

arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1 -1

index 652d028..5850b3e 100644
@@ -27,10 +27,10 @@
 #include <plat/dma.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
+#include <linux/platform_data/iommu-omap.h>
 #include <plat/mmc.h>
 #include <plat/dmtimer.h>
 #include <plat/common.h>
-#include <plat/iommu.h>
 
 #include "omap_hwmod_common_data.h"
 #include "cm1_44xx.h"

drivers/iommu/omap-iommu-debug.c +2 -2

index a0b0309..8c1e30b 100644
@@ -19,8 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/debugfs.h>
 
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include <plat/iopgtable.h>

drivers/iommu/omap-iommu.c +1 -1

index 80844b3..6100334 100644
@@ -24,7 +24,7 @@
 
 #include <asm/cacheflush.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 #include <plat/iopgtable.h>

drivers/iommu/omap-iovmm.c +2 -2

index b362fb5..b5ac2cd 100644
@@ -21,8 +21,8 @@
 #include <asm/cacheflush.h>
 #include <asm/mach/map.h>
 
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include <plat/iopgtable.h>

drivers/media/platform/omap3isp/isp.h +3 -2

index 8be7487..62c76f9 100644
@@ -34,8 +34,9 @@
 #include <linux/platform_device.h>
 #include <linux/wait.h>
 #include <linux/iommu.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include "ispstat.h"
 #include "ispccdc.h"

drivers/media/platform/omap3isp/ispvideo.c +2 -3

index a0b737fe..75ecfc8 100644
@@ -34,9 +34,8 @@
 #include <linux/vmalloc.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
-#include <plat/omap-pm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include "ispvideo.h"
 #include "isp.h"

include/linux/platform_data/iommu-omap.h renamed from arch/arm/plat-omap/include/plat/iommu.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/iommu.h
rename to include/linux/platform_data/iommu-omap.h

include/linux/platform_data/iovmm-omap.h renamed from arch/arm/plat-omap/include/plat/iovmm.h +0 -1

similarity index 100%
rename from arch/arm/plat-omap/include/plat/iovmm.h
rename to include/linux/platform_data/iovmm-omap.h
 
--

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

Laurent Pinchart

2012-10-18 13:44 UTC #5 lore raw

PATCH 3/4 ARM: OMAP2+: Move iommu/iovmm headers to platform_data

In reply to Tony Lindgren

Hi,

Quoted 4 lines · On Monday 15 October 2012 17:36:40 Tony Lindgren wrote:

From: Ido Yariv <[email protected]>
Move iommu/iovmm headers from plat/ to platform_data/ as part of the single zImage work.

Is that really where those headers belong ? iommu-omap.h contains far more than platform data, and iovmm-omap.h contains no platform data at all.

Quoted 181 lines

Cc Joerg Roedel <[email protected]>
Cc Ohad Ben-Cohen <[email protected]>
Signed-off-by Ido Yariv <[email protected]>
Acked-by Mauro Carvalho Chehab <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
---
 arch/arm/mach-omap2/devices.c              |    2 +-
 arch/arm/mach-omap2/iommu2.c               |    2 +-
 arch/arm/mach-omap2/omap-iommu.c           |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |    2 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
 drivers/iommu/omap-iommu-debug.c           |    4 ++--
 drivers/iommu/omap-iommu.c                 |    2 +-
 drivers/iommu/omap-iovmm.c                 |    4 ++--
 drivers/media/platform/omap3isp/isp.h      |    5 +++--
 drivers/media/platform/omap3isp/ispvideo.c |    5 ++---
 include/linux/platform_data/iommu-omap.h   |    0
 include/linux/platform_data/iovmm-omap.h   |    0
 12 files changed, 15 insertions(+), 15 deletions(-)
 rename arch/arm/plat-omap/include/plat/iommu.h =>
include/linux/platform_data/iommu-omap.h (100%) rename arch/arm/plat-omap/include/plat/iovmm.h => include/linux/platform_data/iovmm-omap.h (100%)
arch/arm/mach-omap2/devices.c +1 -1
index c8c2117..6cd0c2a 100644
@@ -126,7 +126,7 @@ static struct platform_device omap2cam_device = {
 
 #if defined(CONFIG_IOMMU_API)
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 static struct resource omap3isp_resources[] = {
 	{
arch/arm/mach-omap2/iommu2.c +1 -1
index c986880..82f9174 100644
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/stringify.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 /*
  * omap2 architecture specific register bit definitions
(quoted diff) +0 -0
b/arch/arm/mach-omap2/omap-iommu.c index df298d4..a6a4ff8 100644
arch/arm/mach-omap2/omap-iommu.c +1 -1
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 #include "soc.h"
 #include "common.h"
(quoted diff) +0 -0
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index f67b7ee..621bc71 100644
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1
@@ -26,8 +26,8 @@
 #include <plat/mmc.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/iommu-omap.h>
 #include <plat/dmtimer.h>
-#include <plat/iommu.h>
 
 #include "am35xx.h"
 
(quoted diff) +0 -0
b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 652d028..5850b3e 100644
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1 -1
@@ -27,10 +27,10 @@
 #include <plat/dma.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
+#include <linux/platform_data/iommu-omap.h>
 #include <plat/mmc.h>
 #include <plat/dmtimer.h>
 #include <plat/common.h>
-#include <plat/iommu.h>
 
 #include "omap_hwmod_common_data.h"
 #include "cm1_44xx.h"
(quoted diff) +0 -0
b/drivers/iommu/omap-iommu-debug.c index a0b0309..8c1e30b 100644
drivers/iommu/omap-iommu-debug.c +2 -2
@@ -19,8 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/debugfs.h>
 
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include <plat/iopgtable.h>
 
drivers/iommu/omap-iommu.c +1 -1
index 80844b3..6100334 100644
@@ -24,7 +24,7 @@
 
 #include <asm/cacheflush.h>
 
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
 
 #include <plat/iopgtable.h>
 
drivers/iommu/omap-iovmm.c +2 -2
index b362fb5..b5ac2cd 100644
@@ -21,8 +21,8 @@
 #include <asm/cacheflush.h>
 #include <asm/mach/map.h>
 
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include <plat/iopgtable.h>
 
(quoted diff) +0 -0
b/drivers/media/platform/omap3isp/isp.h index 8be7487..62c76f9 100644
drivers/media/platform/omap3isp/isp.h +3 -2
@@ -34,8 +34,9 @@
 #include <linux/platform_device.h>
 #include <linux/wait.h>
 #include <linux/iommu.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include "ispstat.h"
 #include "ispccdc.h"
(quoted diff) +0 -0
b/drivers/media/platform/omap3isp/ispvideo.c index a0b737fe..75ecfc8 100644
drivers/media/platform/omap3isp/ispvideo.c +2 -3
@@ -34,9 +34,8 @@
 #include <linux/vmalloc.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
-#include <plat/omap-pm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
 
 #include "ispvideo.h"
 #include "isp.h"
(quoted diff) +0 -0
b/include/linux/platform_data/iommu-omap.h similarity index 100% rename from arch/arm/plat-omap/include/plat/iommu.h rename to include/linux/platform_data/iommu-omap.h
(quoted diff) +0 -0
b/include/linux/platform_data/iovmm-omap.h similarity index 100% rename from arch/arm/plat-omap/include/plat/iovmm.h rename to include/linux/platform_data/iovmm-omap.h
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 3 lines

Regards,

Laurent Pinchart

Tony Lindgren

author maintainer

2012-10-18 16:25 UTC #6 lore raw

PATCH 3/4 ARM: OMAP2+: Move iommu/iovmm headers to platform_data

Quoted 10 lines · Laurent Pinchart

Hi,
Quoted 4 lines · On Monday 15 October 2012 17:36:40 Tony Lindgren wrote:
From: Ido Yariv <[email protected]>
Move iommu/iovmm headers from plat/ to platform_data/ as part of the single zImage work.
Is that really where those headers belong ? iommu-omap.h contains far more than platform data, and iovmm-omap.h contains no platform data at all.

Hmm I though that was already fixed by Ido but looks like there are non-platform data things still remaining there.

Looking at arch/arm/mach-omap2/iommu2.c it seems that it should moved to drivers/iommu/omap-iommu2.c and that way most of the header can be local in drivers/iommu/omap-iommu.h. I'll do some patches for that and repost.

Thanks,

Tony

Tony Lindgren

author maintainer

2012-10-18 20:30 UTC #7 lore raw

PATCH 3/4 ARM: OMAP2+: Move iommu/iovmm headers to platform_data

Quoted 12 lines · Tony Lindgren

Quoted 10 lines · Laurent Pinchart
Hi,
Quoted 4 lines · On Monday 15 October 2012 17:36:40 Tony Lindgren wrote:
From: Ido Yariv <[email protected]>
Move iommu/iovmm headers from plat/ to platform_data/ as part of the single zImage work.
Is that really where those headers belong ? iommu-omap.h contains far more than platform data, and iovmm-omap.h contains no platform data at all.

Quoted 6 lines

Hmm I though that was already fixed by Ido but looks like there are non-platform data things still remaining there.
Looking at arch/arm/mach-omap2/iommu2.c it seems that it should moved to drivers/iommu/omap-iommu2.c and that way most of the header can be local in drivers/iommu/omap-iommu.h. I'll do some patches for that and repost.

I ended up solving the iovmm-omap.h issue by adding include/linux/omap-iommu.h like intel and amd have.

Reposted the series as "[PATCH v3 0/6] omap iommu changes to remove plat includes".

Regards,

Tony

Tony Lindgren

author maintainer

2012-10-16 00:36 UTC #8 lore raw

PATCH 4/4 ARM: OMAP2+: Move iopgtable header to drivers/iommu/

In reply to Tony Lindgren

From: Ido Yariv <[email protected]>

The iopgtable header file is only used by the iommu & iovmm drivers, so move it to drivers/iommu/, as part of the single zImage effort.

Cc Joerg Roedel <[email protected]>

Cc Ohad Ben-Cohen <[email protected]>

Signed-off-by Ido Yariv <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 drivers/iommu/omap-iommu-debug.c            |    3 +--
 drivers/iommu/omap-iommu.c                  |    3 +--
 drivers/iommu/omap-iopgtable.h              |    0 
 drivers/iommu/omap-iovmm.c                  |    3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)
 rename arch/arm/plat-omap/include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h (100%)

drivers/iommu/omap-iommu-debug.c +1 -2

index 8c1e30b..84dbfd2 100644
@@ -22,8 +22,7 @@
 #include <linux/platform_data/iommu-omap.h>
 #include <linux/platform_data/iovmm-omap.h>
 
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
 #include "omap-iommu.h"
 
 #define MAXCOLUMN 100 /* for short messages */

drivers/iommu/omap-iommu.c +1 -2

index 6100334..1ca33b0 100644
@@ -26,8 +26,7 @@
 
 #include <linux/platform_data/iommu-omap.h>
 
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
 #include "omap-iommu.h"
 
 #define for_each_iotlb_cr(obj, n, __i, cr)				\

drivers/iommu/omap-iopgtable.h renamed from arch/arm/plat-omap/include/plat/iopgtable.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/iopgtable.h
rename to drivers/iommu/omap-iopgtable.h

drivers/iommu/omap-iovmm.c +1 -2

index b5ac2cd..2820e3a 100644
@@ -24,8 +24,7 @@
 #include <linux/platform_data/iommu-omap.h>
 #include <linux/platform_data/iovmm-omap.h>
 
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
 #include "omap-iommu.h"
 
 static struct kmem_cache *iovm_area_cachep;