From: Sundar Raman <a0393242@ti.com>
Date: Thu, 18 Jul 2013 22:42:14 +0000 (-0500)
Subject: ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
X-Git-Tag: android-3.8-6AJ.1.1~18^2^2
X-Git-Url: https://git.ti.com/gitweb?p=android-sdk%2Fkernel-video.git;a=commitdiff_plain;h=b32501a57bbf7d89b454276bb8787c22a399d720;hp=d8058e32d933cab37f0dd100938a164321a54159

ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags

This is required so that the omap_hwmod_get_mpu_rt_va()
api returns a virtual register base address for the IP.

Change-Id: I29aff07f34653c552b3eac3a1ac3f10e36b7efbb
Signed-off-by: Sundar Raman <a0393242@ti.com>
---

diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index ee7f4a9a77a..73c152d17a9 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -45,6 +45,9 @@
 /* Base offset for all OMAP5 dma requests */
 #define OMAP54XX_DMA_REQ_START	1
 
+/* Backward references (IPs with Bus Master capability) */
+static struct omap_hwmod omap54xx_bb2d_hwmod;
+
 
 /*
  * IP blocks
@@ -339,6 +342,24 @@ static struct omap_hwmod_irq_info omap54xx_bb2d_irqs[] = {
 	{ .irq = -1 }
 };
 
+static struct omap_hwmod_addr_space omap54xx_bb2d_addrs[] = {
+	{
+		.pa_start	= 0x59000000,
+		.pa_end		= 0x590007ff,
+		.flags      = ADDR_TYPE_RT
+	},
+	{ }
+};
+
+/* l3_main_2 -> bb2d */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__bb2d = {
+	.master		= &omap54xx_l3_main_2_hwmod,
+	.slave		= &omap54xx_bb2d_hwmod,
+	.clk		= "l3_iclk_div",
+	.addr		= omap54xx_bb2d_addrs,
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 static struct omap_hwmod omap54xx_bb2d_hwmod = {
 	.name		= "bb2d",
 	.class		= &omap54xx_bb2d_hwmod_class,
@@ -3961,13 +3982,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_abe__aess = {
 	.user		= OCP_USER_MPU,
 };
 
-/* l3_main_2 -> bb2d */
-static struct omap_hwmod_ocp_if omap54xx_l3_main_2__bb2d = {
-	.master		= &omap54xx_l3_main_2_hwmod,
-	.slave		= &omap54xx_bb2d_hwmod,
-	.clk		= "l3_iclk_div",
-	.user		= OCP_USER_MPU | OCP_USER_SDMA,
-};
 
 static struct omap_hwmod_addr_space omap54xx_c2c_addrs[] = {
 	{
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index b648382f25b..29d7ee61f3c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -3760,6 +3760,7 @@ static struct omap_hwmod_addr_space dra7xx_bb2d_addrs[] = {
 	{
 		.pa_start	= 0x59000000,
 		.pa_end		= 0x590007ff,
+		.flags      = ADDR_TYPE_RT
 	},
 	{ }
 };