aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSundar Raman2013-07-18 17:42:14 -0500
committerPraneeth Bajjuri2013-07-25 20:45:54 -0500
commitb32501a57bbf7d89b454276bb8787c22a399d720 (patch)
treeff5b4269d78a645d970ff6c98fdb9b03ad95dfb3
parentd8058e32d933cab37f0dd100938a164321a54159 (diff)
downloadkernel-video-b32501a57bbf7d89b454276bb8787c22a399d720.tar.gz
kernel-video-b32501a57bbf7d89b454276bb8787c22a399d720.tar.xz
kernel-video-b32501a57bbf7d89b454276bb8787c22a399d720.zip
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>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_54xx_data.c28
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_7xx_data.c1
2 files changed, 22 insertions, 7 deletions
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 @@
45/* Base offset for all OMAP5 dma requests */ 45/* Base offset for all OMAP5 dma requests */
46#define OMAP54XX_DMA_REQ_START 1 46#define OMAP54XX_DMA_REQ_START 1
47 47
48/* Backward references (IPs with Bus Master capability) */
49static struct omap_hwmod omap54xx_bb2d_hwmod;
50
48 51
49/* 52/*
50 * IP blocks 53 * IP blocks
@@ -339,6 +342,24 @@ static struct omap_hwmod_irq_info omap54xx_bb2d_irqs[] = {
339 { .irq = -1 } 342 { .irq = -1 }
340}; 343};
341 344
345static struct omap_hwmod_addr_space omap54xx_bb2d_addrs[] = {
346 {
347 .pa_start = 0x59000000,
348 .pa_end = 0x590007ff,
349 .flags = ADDR_TYPE_RT
350 },
351 { }
352};
353
354/* l3_main_2 -> bb2d */
355static struct omap_hwmod_ocp_if omap54xx_l3_main_2__bb2d = {
356 .master = &omap54xx_l3_main_2_hwmod,
357 .slave = &omap54xx_bb2d_hwmod,
358 .clk = "l3_iclk_div",
359 .addr = omap54xx_bb2d_addrs,
360 .user = OCP_USER_MPU | OCP_USER_SDMA,
361};
362
342static struct omap_hwmod omap54xx_bb2d_hwmod = { 363static struct omap_hwmod omap54xx_bb2d_hwmod = {
343 .name = "bb2d", 364 .name = "bb2d",
344 .class = &omap54xx_bb2d_hwmod_class, 365 .class = &omap54xx_bb2d_hwmod_class,
@@ -3961,13 +3982,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_abe__aess = {
3961 .user = OCP_USER_MPU, 3982 .user = OCP_USER_MPU,
3962}; 3983};
3963 3984
3964/* l3_main_2 -> bb2d */
3965static struct omap_hwmod_ocp_if omap54xx_l3_main_2__bb2d = {
3966 .master = &omap54xx_l3_main_2_hwmod,
3967 .slave = &omap54xx_bb2d_hwmod,
3968 .clk = "l3_iclk_div",
3969 .user = OCP_USER_MPU | OCP_USER_SDMA,
3970};
3971 3985
3972static struct omap_hwmod_addr_space omap54xx_c2c_addrs[] = { 3986static struct omap_hwmod_addr_space omap54xx_c2c_addrs[] = {
3973 { 3987 {
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[] = {
3760 { 3760 {
3761 .pa_start = 0x59000000, 3761 .pa_start = 0x59000000,
3762 .pa_end = 0x590007ff, 3762 .pa_end = 0x590007ff,
3763 .flags = ADDR_TYPE_RT
3763 }, 3764 },
3764 { } 3765 { }
3765}; 3766};