Add mmu hwmod data for iva and isp.

Signed-off-by: Omar Ramirez Luna <omar.rami...@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |  135 ++++++++++++++++++++++++++++
 arch/arm/plat-omap/include/plat/iommu.h    |   10 ++
 2 files changed, 145 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c 
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index e2792cf..90eebee 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -27,6 +27,7 @@
 #include <plat/mcbsp.h>
 #include <plat/mcspi.h>
 #include <plat/dmtimer.h>
+#include <plat/iommu.h>
 
 #include "omap_hwmod_common_data.h"
 
@@ -3332,6 +3333,134 @@ static struct omap_hwmod omap34xx_mcspi4 = {
 };
 
 /*
+ * 'mmu' class
+ * The memory management unit performs virtual to physical address translation
+ * for its requestors.
+ */
+
+static struct omap_hwmod_class_sysconfig mmu_sysc = {
+       .rev_offs       = 0x000,
+       .sysc_offs      = 0x010,
+       .syss_offs      = 0x014,
+       .sysc_flags     = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE |
+                          SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),
+       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+       .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap3xxx_mmu_hwmod_class = {
+       .name = "mmu",
+       .sysc = &mmu_sysc,
+};
+
+/* isp mmu */
+
+static struct omap_mmu_dev_attr isp_mmu_dev_attr = {
+       .da_start = 0x0,
+       .da_end = 0xfffff000,
+       .nr_tlb_entries = 8,
+};
+
+static struct omap_hwmod omap3xxx_isp_mmu_hwmod;
+static struct omap_hwmod_irq_info omap3xxx_isp_mmu_irqs[] = {
+       { .irq = 24 },
+};
+
+static struct omap_hwmod_addr_space omap3xxx_isp_mmu_addrs[] = {
+       {
+               .pa_start       = 0x480bd400,
+               .pa_end         = 0x480bd47f,
+               .flags          = ADDR_TYPE_RT,
+       },
+};
+
+/* l4_core -> isp mmu */
+static struct omap_hwmod_ocp_if omap3xxx_l4_core__isp_mmu = {
+       .master         = &omap3xxx_l4_core_hwmod,
+       .slave          = &omap3xxx_isp_mmu_hwmod,
+       .addr           = omap3xxx_isp_mmu_addrs,
+       .addr_cnt       = ARRAY_SIZE(omap3xxx_isp_mmu_addrs),
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* isp mmu slave ports */
+static struct omap_hwmod_ocp_if *omap3xxx_isp_mmu_slaves[] = {
+       &omap3xxx_l4_core__isp_mmu,
+};
+
+static struct omap_hwmod omap3xxx_isp_mmu_hwmod = {
+       .name           = "isp_mmu",
+       .class          = &omap3xxx_mmu_hwmod_class,
+       .mpu_irqs       = omap3xxx_isp_mmu_irqs,
+       .mpu_irqs_cnt   = ARRAY_SIZE(omap3xxx_isp_mmu_irqs),
+       .main_clk       = "cam_ick",
+       .dev_attr       = &isp_mmu_dev_attr,
+       .slaves         = omap3xxx_isp_mmu_slaves,
+       .slaves_cnt     = ARRAY_SIZE(omap3xxx_isp_mmu_slaves),
+       .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+       .flags          = HWMOD_NO_IDLEST,
+};
+
+/* iva mmu */
+
+static struct omap_mmu_dev_attr iva_mmu_dev_attr = {
+       .da_start = 0x11000000,
+       .da_end = 0xfffff000,
+       .nr_tlb_entries = 32,
+};
+
+static struct omap_hwmod omap3xxx_iva_mmu_hwmod;
+static struct omap_hwmod_irq_info omap3xxx_iva_mmu_irqs[] = {
+       { .irq = 28 },
+};
+
+static struct omap_hwmod_rst_info omap3xxx_iva_mmu_resets[] = {
+       { .name = "mmu", .rst_shift = 1, .st_shift = 9 },
+};
+
+static struct omap_hwmod_addr_space omap3xxx_iva_mmu_addrs[] = {
+       {
+               .pa_start       = 0x5d000000,
+               .pa_end         = 0x5d00007f,
+               .flags          = ADDR_TYPE_RT,
+       },
+};
+
+/* l3_main -> iva mmu */
+static struct omap_hwmod_ocp_if omap3xxx_l3_main__iva_mmu = {
+       .master         = &omap3xxx_l3_main_hwmod,
+       .slave          = &omap3xxx_iva_mmu_hwmod,
+       .addr           = omap3xxx_iva_mmu_addrs,
+       .addr_cnt       = ARRAY_SIZE(omap3xxx_iva_mmu_addrs),
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* iva mmu slave ports */
+static struct omap_hwmod_ocp_if *omap3xxx_iva_mmu_slaves[] = {
+       &omap3xxx_l3_main__iva_mmu,
+};
+
+static struct omap_hwmod omap3xxx_iva_mmu_hwmod = {
+       .name           = "iva_mmu",
+       .class          = &omap3xxx_mmu_hwmod_class,
+       .mpu_irqs       = omap3xxx_iva_mmu_irqs,
+       .mpu_irqs_cnt   = ARRAY_SIZE(omap3xxx_iva_mmu_irqs),
+       .rst_lines      = omap3xxx_iva_mmu_resets,
+       .rst_lines_cnt  = ARRAY_SIZE(omap3xxx_iva_mmu_resets),
+       .main_clk       = "iva2_ck",
+       .prcm = {
+               .omap2 = {
+                       .module_offs = OMAP3430_IVA2_MOD,
+               },
+       },
+       .dev_attr       = &iva_mmu_dev_attr,
+       .slaves         = omap3xxx_iva_mmu_slaves,
+       .slaves_cnt     = ARRAY_SIZE(omap3xxx_iva_mmu_slaves),
+       .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+       .flags          = HWMOD_NO_IDLEST | HWMOD_INIT_NO_RESET,
+};
+
+/*
  * usbhsotg
  */
 static struct omap_hwmod_class_sysconfig omap3xxx_usbhsotg_sysc = {
@@ -3643,6 +3772,12 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = 
{
        &omap34xx_mcspi3,
        &omap34xx_mcspi4,
 
+       /* mmu class */
+       &omap3xxx_isp_mmu_hwmod,
+#ifdef CONFIG_OMAP_IOMMU_IVA2
+       &omap3xxx_iva_mmu_hwmod,
+#endif
+
        /* usbotg class */
        &omap3xxx_usbhsotg_hwmod,
 
diff --git a/arch/arm/plat-omap/include/plat/iommu.h 
b/arch/arm/plat-omap/include/plat/iommu.h
index 174f1b9..b0d43ce 100644
--- a/arch/arm/plat-omap/include/plat/iommu.h
+++ b/arch/arm/plat-omap/include/plat/iommu.h
@@ -102,6 +102,16 @@ struct iommu_functions {
        ssize_t (*dump_ctx)(struct iommu *obj, char *buf, ssize_t len);
 };
 
+/* omap_mmu_dev_attr - OMAP mmu device attributes for omap_hwmod
+ * @nr_tlb_entries: number of entries supported by the translation look-aside
+ *                   buffer (TLB).
+ */
+struct omap_mmu_dev_attr {
+       u32 da_start;
+       u32 da_end;
+       int nr_tlb_entries;
+};
+
 struct iommu_platform_data {
        const char *name;
        const char *clk_name;
-- 
1.7.1

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

Reply via email to