* [PATCH 2/4][v3] OMAP:iommu support for OMAP4
@ 2010-04-20 22:56 Kanigeri, Hari
2010-04-21 22:04 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Kanigeri, Hari @ 2010-04-20 22:56 UTC (permalink / raw)
To: linux-omap@vger.kernel.org
Cc: Shilimkar, Santosh, Felipe Contreras, Hiroshi DOYU,
tony@atomide.com
[-- Attachment #1: Type: text/plain, Size: 2097 bytes --]
>From 9a2bcae7a2de6890884c23c45563eece1e6838de Mon Sep 17 00:00:00 2001
From: Hari Kanigeri <h-kanigeri2@ti.com>
Date: Tue, 20 Apr 2010 17:39:18 -0500
Subject: [PATCH 2/4] OMAP:iommu support for OMAP4
This patch provides the iommu support for OMAP4 co-processors.
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
---
arch/arm/mach-omap2/omap-iommu.c | 26 ++++++++++++++++++++++++++
arch/arm/plat-omap/include/plat/omap44xx.h | 3 +++
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index 416a65d..f569371 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -13,6 +13,7 @@
#include <linux/platform_device.h>
#include <plat/iommu.h>
+#include <plat/irqs.h>
struct iommu_device {
resource_size_t base;
@@ -46,6 +47,31 @@ static struct iommu_device devices[] = {
};
#endif
+#ifdef CONFIG_ARCH_OMAP4
+static struct iommu_device devices[] = {
+ {
+ .base = OMAP4_MMU1_BASE,
+ .irq = INT_44XX_DUCATI_MMU_IRQ,
+ .pdata = {
+ .name = "ducati",
+ .nr_tlb_entries = 32,
+ .clk_name = "ducati_ick",
+ },
+ },
+#if defined(CONFIG_MPU_TESLA_IOMMU)
+ {
+ .base = OMAP4_MMU2_BASE,
+ .irq = INT_44XX_DSP_MMU,
+ .pdata = {
+ .name = "tesla",
+ .nr_tlb_entries = 32,
+ .clk_name = "tesla_ick",
+ },
+ },
+#endif
+};
+#endif
+
#define NR_IOMMU_DEVICES ARRAY_SIZE(devices)
static struct platform_device *omap_iommu_pdev[NR_IOMMU_DEVICES];
diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h
index 9cb1e9d..1b5b786 100644
--- a/arch/arm/plat-omap/include/plat/omap44xx.h
+++ b/arch/arm/plat-omap/include/plat/omap44xx.h
@@ -47,5 +47,8 @@
#define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000)
#define OMAP44XX_HSUSB_OTG_BASE (L4_44XX_BASE + 0xAB000)
+#define OMAP4_MMU1_BASE 0x55082000
+#define OMAP4_MMU2_BASE 0x4A066000
+
#endif /* __ASM_ARCH_OMAP44XX_H */
--
1.7.0
Thank you,
Best regards,
Hari
[-- Attachment #2: 0002-OMAP-iommu-support-for-OMAP4.patch --]
[-- Type: application/octet-stream, Size: 1986 bytes --]
From 9a2bcae7a2de6890884c23c45563eece1e6838de Mon Sep 17 00:00:00 2001
From: Hari Kanigeri <h-kanigeri2@ti.com>
Date: Tue, 20 Apr 2010 17:39:18 -0500
Subject: [PATCH 2/4] OMAP:iommu support for OMAP4
This patch provides the iommu support for OMAP4 co-processors.
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
---
arch/arm/mach-omap2/omap-iommu.c | 26 ++++++++++++++++++++++++++
arch/arm/plat-omap/include/plat/omap44xx.h | 3 +++
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index 416a65d..f569371 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -13,6 +13,7 @@
#include <linux/platform_device.h>
#include <plat/iommu.h>
+#include <plat/irqs.h>
struct iommu_device {
resource_size_t base;
@@ -46,6 +47,31 @@ static struct iommu_device devices[] = {
};
#endif
+#ifdef CONFIG_ARCH_OMAP4
+static struct iommu_device devices[] = {
+ {
+ .base = OMAP4_MMU1_BASE,
+ .irq = INT_44XX_DUCATI_MMU_IRQ,
+ .pdata = {
+ .name = "ducati",
+ .nr_tlb_entries = 32,
+ .clk_name = "ducati_ick",
+ },
+ },
+#if defined(CONFIG_MPU_TESLA_IOMMU)
+ {
+ .base = OMAP4_MMU2_BASE,
+ .irq = INT_44XX_DSP_MMU,
+ .pdata = {
+ .name = "tesla",
+ .nr_tlb_entries = 32,
+ .clk_name = "tesla_ick",
+ },
+ },
+#endif
+};
+#endif
+
#define NR_IOMMU_DEVICES ARRAY_SIZE(devices)
static struct platform_device *omap_iommu_pdev[NR_IOMMU_DEVICES];
diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h
index 9cb1e9d..1b5b786 100644
--- a/arch/arm/plat-omap/include/plat/omap44xx.h
+++ b/arch/arm/plat-omap/include/plat/omap44xx.h
@@ -47,5 +47,8 @@
#define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000)
#define OMAP44XX_HSUSB_OTG_BASE (L4_44XX_BASE + 0xAB000)
+#define OMAP4_MMU1_BASE 0x55082000
+#define OMAP4_MMU2_BASE 0x4A066000
+
#endif /* __ASM_ARCH_OMAP44XX_H */
--
1.7.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4][v3] OMAP:iommu support for OMAP4
2010-04-20 22:56 [PATCH 2/4][v3] OMAP:iommu support for OMAP4 Kanigeri, Hari
@ 2010-04-21 22:04 ` Tony Lindgren
2010-04-21 22:18 ` Kanigeri, Hari
0 siblings, 1 reply; 3+ messages in thread
From: Tony Lindgren @ 2010-04-21 22:04 UTC (permalink / raw)
To: Kanigeri, Hari
Cc: linux-omap@vger.kernel.org, Shilimkar, Santosh, Felipe Contreras,
Hiroshi DOYU
* Kanigeri, Hari <h-kanigeri2@ti.com> [100420 15:52]:
> From 9a2bcae7a2de6890884c23c45563eece1e6838de Mon Sep 17 00:00:00 2001
> From: Hari Kanigeri <h-kanigeri2@ti.com>
> Date: Tue, 20 Apr 2010 17:39:18 -0500
> Subject: [PATCH 2/4] OMAP:iommu support for OMAP4
>
> This patch provides the iommu support for OMAP4 co-processors.
>
> Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
> ---
> arch/arm/mach-omap2/omap-iommu.c | 26 ++++++++++++++++++++++++++
> arch/arm/plat-omap/include/plat/omap44xx.h | 3 +++
> 2 files changed, 29 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
> index 416a65d..f569371 100644
> --- a/arch/arm/mach-omap2/omap-iommu.c
> +++ b/arch/arm/mach-omap2/omap-iommu.c
> @@ -13,6 +13,7 @@
> #include <linux/platform_device.h>
>
> #include <plat/iommu.h>
> +#include <plat/irqs.h>
>
> struct iommu_device {
> resource_size_t base;
> @@ -46,6 +47,31 @@ static struct iommu_device devices[] = {
> };
> #endif
>
> +#ifdef CONFIG_ARCH_OMAP4
> +static struct iommu_device devices[] = {
> + {
> + .base = OMAP4_MMU1_BASE,
> + .irq = INT_44XX_DUCATI_MMU_IRQ,
> + .pdata = {
> + .name = "ducati",
> + .nr_tlb_entries = 32,
> + .clk_name = "ducati_ick",
> + },
> + },
> +#if defined(CONFIG_MPU_TESLA_IOMMU)
> + {
> + .base = OMAP4_MMU2_BASE,
> + .irq = INT_44XX_DSP_MMU,
> + .pdata = {
> + .name = "tesla",
> + .nr_tlb_entries = 32,
> + .clk_name = "tesla_ick",
> + },
> + },
> +#endif
> +};
> +#endif
This should use:
static struct iommu_device *devices;
#ifdef CONFIG_ARCH_OMAP3
static struct iommu_device omap3_devices[] = {
...
#else
#define omap3_devices NULL
#endif
#ifdef CONFIG_ARCH_OMAP4
static struct iommu_device omap4_devices[] = {
...
#else
#define omap4_devices NULL
#endif
Then in init, just set devices based on the omap type.
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH 2/4][v3] OMAP:iommu support for OMAP4
2010-04-21 22:04 ` Tony Lindgren
@ 2010-04-21 22:18 ` Kanigeri, Hari
0 siblings, 0 replies; 3+ messages in thread
From: Kanigeri, Hari @ 2010-04-21 22:18 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap@vger.kernel.org, Shilimkar, Santosh, Felipe Contreras,
Hiroshi DOYU
Tony,
> -----Original Message-----
> From: Tony Lindgren [mailto:tony@atomide.com]
> Sent: Wednesday, April 21, 2010 5:05 PM
> To: Kanigeri, Hari
> Cc: linux-omap@vger.kernel.org; Shilimkar, Santosh; Felipe Contreras;
> Hiroshi DOYU
> Subject: Re: [PATCH 2/4][v3] OMAP:iommu support for OMAP4
>
> * Kanigeri, Hari <h-kanigeri2@ti.com> [100420 15:52]:
> > From 9a2bcae7a2de6890884c23c45563eece1e6838de Mon Sep 17 00:00:00 2001
> > From: Hari Kanigeri <h-kanigeri2@ti.com>
> > Date: Tue, 20 Apr 2010 17:39:18 -0500
> > Subject: [PATCH 2/4] OMAP:iommu support for OMAP4
> >
> > This patch provides the iommu support for OMAP4 co-processors.
> >
> > Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
> > ---
> > arch/arm/mach-omap2/omap-iommu.c | 26
> ++++++++++++++++++++++++++
> > arch/arm/plat-omap/include/plat/omap44xx.h | 3 +++
> > 2 files changed, 29 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-
> omap2/omap-iommu.c
> > index 416a65d..f569371 100644
> > --- a/arch/arm/mach-omap2/omap-iommu.c
> > +++ b/arch/arm/mach-omap2/omap-iommu.c
> > @@ -13,6 +13,7 @@
> > #include <linux/platform_device.h>
> >
> > #include <plat/iommu.h>
> > +#include <plat/irqs.h>
> >
> > struct iommu_device {
> > resource_size_t base;
> > @@ -46,6 +47,31 @@ static struct iommu_device devices[] = {
> > };
> > #endif
> >
> > +#ifdef CONFIG_ARCH_OMAP4
> > +static struct iommu_device devices[] = {
> > + {
> > + .base = OMAP4_MMU1_BASE,
> > + .irq = INT_44XX_DUCATI_MMU_IRQ,
> > + .pdata = {
> > + .name = "ducati",
> > + .nr_tlb_entries = 32,
> > + .clk_name = "ducati_ick",
> > + },
> > + },
> > +#if defined(CONFIG_MPU_TESLA_IOMMU)
> > + {
> > + .base = OMAP4_MMU2_BASE,
> > + .irq = INT_44XX_DSP_MMU,
> > + .pdata = {
> > + .name = "tesla",
> > + .nr_tlb_entries = 32,
> > + .clk_name = "tesla_ick",
> > + },
> > + },
> > +#endif
> > +};
> > +#endif
>
> This should use:
>
> static struct iommu_device *devices;
>
> #ifdef CONFIG_ARCH_OMAP3
> static struct iommu_device omap3_devices[] = {
> ...
> #else
> #define omap3_devices NULL
> #endif
>
> #ifdef CONFIG_ARCH_OMAP4
> static struct iommu_device omap4_devices[] = {
> ...
> #else
> #define omap4_devices NULL
> #endif
>
> Then in init, just set devices based on the omap type.
>
Appreciate your input. I will send revised patches.
Best regards,
Hari
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-04-21 22:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-20 22:56 [PATCH 2/4][v3] OMAP:iommu support for OMAP4 Kanigeri, Hari
2010-04-21 22:04 ` Tony Lindgren
2010-04-21 22:18 ` Kanigeri, Hari
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.