From: paul@pwsan.com (Paul Walmsley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/9] ARM: OMAP4: hwmod data: add OCP_USER_DSP; mark omap44xx_dsp__iva appropriately
Date: Tue, 28 Feb 2012 04:10:56 -0700 [thread overview]
Message-ID: <20120228111055.808.79928.stgit@dusk> (raw)
In-Reply-To: <20120228110943.808.73639.stgit@dusk>
One of the OMAP4 links was missing OCP_USER flags, since it was only
used by the DSP initiator, and we did not have an OCP_USER_DSP flag.
Future patches will switch the hwmod code and data to register
interfaces, rather than hwmods, and it will be mandatory for all
interfaces to have at least one user bit set. This patch resolves the
issue by adding OCP_USER_DSP and marking the DSP-IVA interface
appropriately.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Beno?t Cousson <b-cousson@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 +
arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 8dfed19..f3fd64d 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -1089,6 +1089,7 @@ static struct omap_hwmod_ocp_if omap44xx_dsp__iva = {
.master = &omap44xx_dsp_hwmod,
.slave = &omap44xx_iva_hwmod,
.clk = "dpll_iva_m5x2_ck",
+ .user = OCP_USER_DSP,
};
/* dsp master ports */
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 8814365..f0a0711 100644
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -213,6 +213,7 @@ struct omap_hwmod_addr_space {
*/
#define OCP_USER_MPU (1 << 0)
#define OCP_USER_SDMA (1 << 1)
+#define OCP_USER_DSP (1 << 2)
/* omap_hwmod_ocp_if.flags bits */
#define OCPIF_SWSUP_IDLE (1 << 0)
next prev parent reply other threads:[~2012-02-28 11:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 11:10 [PATCH 0/9] ARM: OMAP2+: hwmod data: cleanup in preparation for link array removal Paul Walmsley
2012-02-28 11:10 ` [PATCH 1/9] ARM: OMAP2/3: hwmod data: update old names Paul Walmsley
2012-02-28 11:10 ` [PATCH 2/9] ARM: OMAP3: hwmod data: fix interfaces for the MMC hwmods Paul Walmsley
2012-02-28 11:10 ` [PATCH 3/9] ARM: OMAP3: hwmod data: add DSS->L3 interconnect for 3430ES1 Paul Walmsley
2012-02-28 11:10 ` [PATCH 5/9] ARM: OMAP36xx: hwmod data: fix SmartReflex interface data Paul Walmsley
2012-03-09 3:51 ` Paul Walmsley
2012-03-09 8:20 ` Jean Pihet
2012-03-09 16:55 ` Paul Walmsley
2012-02-28 11:10 ` [PATCH 4/9] ARM: OMAP3: hwmod data: GPTIMER12 is attached to a separate interconnect Paul Walmsley
2012-02-28 11:10 ` [PATCH 6/9] ARM: OMAP4: hwmod data: remove bandgap hwmod Paul Walmsley
2012-02-28 11:10 ` [PATCH 8/9] ARM: OMAP4: hwmod data: uncomment some "excluded" hwmods Paul Walmsley
2012-02-28 11:10 ` Paul Walmsley [this message]
2012-02-28 11:10 ` [PATCH 9/9] ARM: OMAP2+: hwmod: extend OCP_* register offsets from 16 to 32 bits Paul Walmsley
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=20120228111055.808.79928.stgit@dusk \
--to=paul@pwsan.com \
--cc=linux-arm-kernel@lists.infradead.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 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).