aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2010-12-21 23:08:34 -0500
committerPaul Walmsley <paul@pwsan.com>2010-12-21 23:08:34 -0500
commit659fa8222c0ca1061d74cb3282614c017f415fe5 (patch)
tree8286cb3e4013a6218e7726197db358f074dc9288
parent0cfe8751bbb8703bc77beb031eb6f4edf3d601d3 (diff)
OMAP4: hwmod data: Fix missing address in DMM and EMIF_FW
The DMM is a piece of interconnect that need to be configured properly for the tiler functionnality. It thus exposes some configuration registers that were missing previously. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_44xx_data.c26
1 files changed, 23 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 34f2a8e71ab6..92d446997e56 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -73,7 +73,15 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__dmm = {
73 .master = &omap44xx_l3_main_1_hwmod, 73 .master = &omap44xx_l3_main_1_hwmod,
74 .slave = &omap44xx_dmm_hwmod, 74 .slave = &omap44xx_dmm_hwmod,
75 .clk = "l3_div_ck", 75 .clk = "l3_div_ck",
76 .user = OCP_USER_MPU | OCP_USER_SDMA, 76 .user = OCP_USER_SDMA,
77};
78
79static struct omap_hwmod_addr_space omap44xx_dmm_addrs[] = {
80 {
81 .pa_start = 0x4e000000,
82 .pa_end = 0x4e0007ff,
83 .flags = ADDR_TYPE_RT
84 },
77}; 85};
78 86
79/* mpu -> dmm */ 87/* mpu -> dmm */
@@ -81,7 +89,9 @@ static struct omap_hwmod_ocp_if omap44xx_mpu__dmm = {
81 .master = &omap44xx_mpu_hwmod, 89 .master = &omap44xx_mpu_hwmod,
82 .slave = &omap44xx_dmm_hwmod, 90 .slave = &omap44xx_dmm_hwmod,
83 .clk = "l3_div_ck", 91 .clk = "l3_div_ck",
84 .user = OCP_USER_MPU | OCP_USER_SDMA, 92 .addr = omap44xx_dmm_addrs,
93 .addr_cnt = ARRAY_SIZE(omap44xx_dmm_addrs),
94 .user = OCP_USER_MPU,
85}; 95};
86 96
87/* dmm slave ports */ 97/* dmm slave ports */
@@ -121,12 +131,22 @@ static struct omap_hwmod_ocp_if omap44xx_dmm__emif_fw = {
121 .user = OCP_USER_MPU | OCP_USER_SDMA, 131 .user = OCP_USER_MPU | OCP_USER_SDMA,
122}; 132};
123 133
134static struct omap_hwmod_addr_space omap44xx_emif_fw_addrs[] = {
135 {
136 .pa_start = 0x4a20c000,
137 .pa_end = 0x4a20c0ff,
138 .flags = ADDR_TYPE_RT
139 },
140};
141
124/* l4_cfg -> emif_fw */ 142/* l4_cfg -> emif_fw */
125static struct omap_hwmod_ocp_if omap44xx_l4_cfg__emif_fw = { 143static struct omap_hwmod_ocp_if omap44xx_l4_cfg__emif_fw = {
126 .master = &omap44xx_l4_cfg_hwmod, 144 .master = &omap44xx_l4_cfg_hwmod,
127 .slave = &omap44xx_emif_fw_hwmod, 145 .slave = &omap44xx_emif_fw_hwmod,
128 .clk = "l4_div_ck", 146 .clk = "l4_div_ck",
129 .user = OCP_USER_MPU | OCP_USER_SDMA, 147 .addr = omap44xx_emif_fw_addrs,
148 .addr_cnt = ARRAY_SIZE(omap44xx_emif_fw_addrs),
149 .user = OCP_USER_MPU,
130}; 150};
131 151
132/* emif_fw slave ports */ 152/* emif_fw slave ports */