From: Ohad Ben-Cohen <ohad@wizery.com>
To: linux-omap@vger.kernel.org
Cc: Kanigeri Hari <h-kanigeri2@ti.com>, Ohad Ben-Cohen <ohadb@ti.com>
Subject: [RFC 1/6] omap: add iva2 hwmod support to omap3
Date: Fri, 2 Jul 2010 01:23:09 +0300 [thread overview]
Message-ID: <1278022994-28476-2-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1278022994-28476-1-git-send-email-ohad@wizery.com>
From: Ohad Ben-Cohen <ohadb@ti.com>
Add preliminary iva2 hwmod support to omap3.
We do not include iva2_clk; that will be part of a separate
hwmod, which will be controlled by iommu.
Signed-off-by: Ohad Ben-Cohen <ohadb@ti.com>
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_34xx.h | 23 +++++++++++++++++++++++
arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 +
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_34xx.h b/arch/arm/mach-omap2/omap_hwmod_34xx.h
index b6076b9..d363a95 100644
--- a/arch/arm/mach-omap2/omap_hwmod_34xx.h
+++ b/arch/arm/mach-omap2/omap_hwmod_34xx.h
@@ -22,6 +22,7 @@
#include "prm-regbits-34xx.h"
static struct omap_hwmod omap34xx_mpu_hwmod;
+static struct omap_hwmod omap34xx_iva2_hwmod;
static struct omap_hwmod omap34xx_l3_hwmod;
static struct omap_hwmod omap34xx_l4_core_hwmod;
static struct omap_hwmod omap34xx_l4_per_hwmod;
@@ -47,9 +48,17 @@ static struct omap_hwmod_ocp_if omap34xx_mpu__l3 = {
.user = OCP_USER_MPU,
};
+/* IVA2 -> L3 interface */
+static struct omap_hwmod_ocp_if omap34xx_iva2__l3 = {
+ .master = &omap34xx_iva2_hwmod,
+ .slave = &omap34xx_l3_hwmod,
+ .user = OCP_USER_IVA2,
+};
+
/* Slave interfaces on the L3 interconnect */
static struct omap_hwmod_ocp_if *omap34xx_l3_slaves[] = {
&omap34xx_mpu__l3,
+ &omap34xx_iva2__l3,
};
/* Master interfaces on the L3 interconnect */
@@ -150,12 +159,26 @@ static struct omap_hwmod omap34xx_mpu_hwmod = {
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
};
+/* Master interfaces on the IVA2 device */
+static struct omap_hwmod_ocp_if *omap34xx_iva2_masters[] = {
+ &omap34xx_iva2__l3,
+};
+
+/* IVA2 */
+static struct omap_hwmod omap34xx_iva2_hwmod = {
+ .name = "iva2_hwmod",
+ .masters = omap34xx_iva2_masters,
+ .masters_cnt = ARRAY_SIZE(omap34xx_iva2_masters),
+ .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+};
+
static __initdata struct omap_hwmod *omap34xx_hwmods[] = {
&omap34xx_l3_hwmod,
&omap34xx_l4_core_hwmod,
&omap34xx_l4_per_hwmod,
&omap34xx_l4_wkup_hwmod,
&omap34xx_mpu_hwmod,
+ &omap34xx_iva2_hwmod,
NULL,
};
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 3393325..5e64992 100644
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -160,6 +160,7 @@ struct omap_hwmod_addr_space {
*/
#define OCP_USER_MPU (1 << 0)
#define OCP_USER_SDMA (1 << 1)
+#define OCP_USER_IVA2 (1 << 2)
/* omap_hwmod_ocp_if.flags bits */
#define OCPIF_HAS_IDLEST (1 << 0)
--
1.7.0.4
next prev parent reply other threads:[~2010-07-01 22:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 22:23 [RFC 0/6] Introducing OMAP Remote Processor module Ohad Ben-Cohen
2010-07-01 22:23 ` Ohad Ben-Cohen [this message]
2010-07-02 5:43 ` [RFC 1/6] omap: add iva2 hwmod support to omap3 Cousson, Benoit
2010-07-04 21:57 ` Ohad Ben-Cohen
2010-07-01 22:23 ` [RFC 2/6] omap: introduce OMAP3 remoteproc module Ohad Ben-Cohen
2010-07-27 15:23 ` Premi, Sanjeev
2010-07-01 22:23 ` [RFC 3/6] omap: introduce OMAP4 " Ohad Ben-Cohen
2010-07-01 22:23 ` [RFC 4/6] omap: introduce common " Ohad Ben-Cohen
2010-07-27 14:49 ` Premi, Sanjeev
2010-07-01 22:23 ` [RFC 5/6] omap: add remoteproc device(s) Ohad Ben-Cohen
2010-07-27 15:44 ` Premi, Sanjeev
2010-07-01 22:23 ` [RFC 6/6] omap: enable remoteproc building Ohad Ben-Cohen
2010-07-27 15:49 ` Premi, Sanjeev
2010-07-27 12:27 ` [RFC 0/6] Introducing OMAP Remote Processor module Premi, Sanjeev
2010-07-27 17:09 ` Ohad Ben-Cohen
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=1278022994-28476-2-git-send-email-ohad@wizery.com \
--to=ohad@wizery.com \
--cc=h-kanigeri2@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=ohadb@ti.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).