From: paul@pwsan.com (Paul Walmsley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/15] ARM: OMAP4: hwmod data: add OCM RAM IP block
Date: Thu, 08 Mar 2012 03:51:35 -0700 [thread overview]
Message-ID: <20120308105134.14753.63101.stgit@dusk> (raw)
In-Reply-To: <20120308104918.14753.69281.stgit@dusk>
Add the OCM RAM IP block and interconnect data. This is an oh-chip
block of SRAM connected directly to the L3 bus.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Beno?t Cousson <b-cousson@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 32 +++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 968feb0..f48fe77 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -280,7 +280,6 @@ static struct omap_hwmod omap44xx_mpu_private_hwmod = {
* efuse_ctrl_std
* mpu_c0
* mpu_c1
- * ocmc_ram
* ocp_wp_noc
* prcm_mpu
* prm
@@ -2356,6 +2355,28 @@ static struct omap_hwmod omap44xx_mpu_hwmod = {
};
/*
+ * 'ocmc_ram' class
+ * top-level core on-chip ram
+ */
+
+static struct omap_hwmod_class omap44xx_ocmc_ram_hwmod_class = {
+ .name = "ocmc_ram",
+};
+
+/* ocmc_ram */
+static struct omap_hwmod omap44xx_ocmc_ram_hwmod = {
+ .name = "ocmc_ram",
+ .class = &omap44xx_ocmc_ram_hwmod_class,
+ .clkdm_name = "l3_2_clkdm",
+ .prcm = {
+ .omap4 = {
+ .clkctrl_offs = OMAP4_CM_L3_2_OCMC_RAM_CLKCTRL_OFFSET,
+ .context_offs = OMAP4_RM_L3_2_OCMC_RAM_CONTEXT_OFFSET,
+ },
+ },
+};
+
+/*
* 'ocp2scp' class
* bridge to transform ocp interface protocol to scp (serial control port)
* protocol
@@ -4923,6 +4944,14 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc5 = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
+/* l3_main_2 -> ocmc_ram */
+static struct omap_hwmod_ocp_if omap44xx_l3_main_2__ocmc_ram = {
+ .master = &omap44xx_l3_main_2_hwmod,
+ .slave = &omap44xx_ocmc_ram_hwmod,
+ .clk = "l3_div_ck",
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
/* l4_cfg -> ocp2scp_usb_phy */
static struct omap_hwmod_ocp_if omap44xx_l4_cfg__ocp2scp_usb_phy = {
.master = &omap44xx_l4_cfg_hwmod,
@@ -5654,6 +5683,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
&omap44xx_l4_per__mmc3,
&omap44xx_l4_per__mmc4,
&omap44xx_l4_per__mmc5,
+ &omap44xx_l3_main_2__ocmc_ram,
&omap44xx_l4_cfg__ocp2scp_usb_phy,
&omap44xx_l3_main_2__sl2if,
&omap44xx_l4_abe__slimbus1,
next prev parent reply other threads:[~2012-03-08 10:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 10:51 [PATCH 00/15] ARM: OMAP4: hwmod data: add almost all remaining IP blocks Paul Walmsley
2012-03-08 10:51 ` [PATCH 01/15] ARM: OMAP2+: clockdomains: make {prm,cm}_clkdm common Paul Walmsley
2012-03-08 10:51 ` [PATCH 02/15] ARM: OMAP4: hwmod data: introduce fdif(face detect module) hwmod Paul Walmsley
2012-03-08 10:51 ` [PATCH 04/15] ARM: OMAP4: hwmod data: add GPMC Paul Walmsley
2012-03-08 10:51 ` [PATCH 03/15] ARM: OMAP4: hwmod data: add HDQ/1-wire Paul Walmsley
2012-03-08 10:51 ` [PATCH 05/15] ARM: OMAP4: hwmod data: add EMIF1 and 2 Paul Walmsley
2012-03-08 10:51 ` [PATCH 06/15] ARM: OMAP4: hwmod data: add GPU Paul Walmsley
2012-03-08 10:51 ` [PATCH 07/15] ARM: OMAP4: hwmod data: add the Slimbus IP blocks Paul Walmsley
2012-03-08 10:51 ` [PATCH 08/15] ARM: OMAP4: hwmod data: add McASP Paul Walmsley
2012-03-08 10:51 ` [PATCH 09/15] ARM: OMAP4: hwmod data: add some interconnect-related IP blocks Paul Walmsley
2012-03-08 10:51 ` [PATCH 10/15] ARM: OMAP4: hwmod data: add remaining USB-related " Paul Walmsley
2012-03-08 10:51 ` [PATCH 12/15] ARM: OMAP4: hwmod data: add the OCP-WP IP block Paul Walmsley
2012-03-08 10:51 ` Paul Walmsley [this message]
2012-03-08 10:51 ` [PATCH 13/15] ARM: OMAP4: hwmod data: add System Control Module Paul Walmsley
2012-03-08 10:51 ` [PATCH 15/15] ARM: OMAP4: hwmod data: add DEBUGSS skeleton Paul Walmsley
2012-03-08 10:51 ` [PATCH 14/15] ARM: OMAP4: hwmod data: add PRCM and related IP blocks Paul Walmsley
2012-03-08 11:31 ` [PATCH 00/15] ARM: OMAP4: hwmod data: add almost all remaining " Rajendra Nayak
2012-03-08 17:05 ` 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=20120308105134.14753.63101.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).