aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-07-09 21:14:05 -0400
committerPaul Walmsley <paul@pwsan.com>2011-07-09 21:14:05 -0400
commit78183f3fdf76f422431a81852468be01b36db325 (patch)
treec236cc685b3568c2092e8aca16a20da0a87008b2 /arch/arm
parentecba3287b4121dcf3ca7607fe71c205913edec06 (diff)
omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space arrays
Previously, struct omap_hwmod_addr_space arrays were unterminated; and users of these arrays used the ARRAY_SIZE() macro to determine the length of the array. However, ARRAY_SIZE() only works when the array is in the same scope as the macro user. So far this hasn't been a problem. However, to reduce duplicated data, a subsequent patch will move common data to a separate, shared file. When this is done, ARRAY_SIZE() will no longer be usable. This patch removes ARRAY_SIZE() usage for struct omap_hwmod_addr_space arrays and uses a null structure member as the array terminator instead. Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.c45
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2420_data.c66
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2430_data.c83
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c108
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_44xx_data.c170
-rw-r--r--arch/arm/plat-omap/include/plat/omap_hwmod.h2
6 files changed, 249 insertions, 225 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 293fa6cd50e1..77094d75367f 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2,6 +2,7 @@
2 * omap_hwmod implementation for OMAP2/3/4 2 * omap_hwmod implementation for OMAP2/3/4
3 * 3 *
4 * Copyright (C) 2009-2011 Nokia Corporation 4 * Copyright (C) 2009-2011 Nokia Corporation
5 * Copyright (C) 2011 Texas Instruments, Inc.
5 * 6 *
6 * Paul Walmsley, Benoît Cousson, Kevin Hilman 7 * Paul Walmsley, Benoît Cousson, Kevin Hilman
7 * 8 *
@@ -678,6 +679,29 @@ static void _disable_optional_clocks(struct omap_hwmod *oh)
678} 679}
679 680
680/** 681/**
682 * _count_ocp_if_addr_spaces - count the number of address space entries for @oh
683 * @oh: struct omap_hwmod *oh
684 *
685 * Count and return the number of address space ranges associated with
686 * the hwmod @oh. Used to allocate struct resource data. Returns 0
687 * if @oh is NULL.
688 */
689static int _count_ocp_if_addr_spaces(struct omap_hwmod_ocp_if *os)
690{
691 struct omap_hwmod_addr_space *mem;
692 int i = 0;
693
694 if (!os || !os->addr)
695 return 0;
696
697 do {
698 mem = &os->addr[i++];
699 } while (mem->pa_start != mem->pa_end);
700
701 return i;
702}
703
704/**
681 * _find_mpu_port_index - find hwmod OCP slave port ID intended for MPU use 705 * _find_mpu_port_index - find hwmod OCP slave port ID intended for MPU use
682 * @oh: struct omap_hwmod * 706 * @oh: struct omap_hwmod *
683 * 707 *
@@ -722,8 +746,7 @@ static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index)
722{ 746{
723 struct omap_hwmod_ocp_if *os; 747 struct omap_hwmod_ocp_if *os;
724 struct omap_hwmod_addr_space *mem; 748 struct omap_hwmod_addr_space *mem;
725 int i; 749 int i = 0, found = 0;
726 int found = 0;
727 void __iomem *va_start; 750 void __iomem *va_start;
728 751
729 if (!oh || oh->slaves_cnt == 0) 752 if (!oh || oh->slaves_cnt == 0)
@@ -731,12 +754,14 @@ static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index)
731 754
732 os = oh->slaves[index]; 755 os = oh->slaves[index];
733 756
734 for (i = 0, mem = os->addr; i < os->addr_cnt; i++, mem++) { 757 if (!os->addr)
735 if (mem->flags & ADDR_TYPE_RT) { 758 return NULL;
759
760 do {
761 mem = &os->addr[i++];
762 if (mem->flags & ADDR_TYPE_RT)
736 found = 1; 763 found = 1;
737 break; 764 } while (!found && mem->pa_start != mem->pa_end);
738 }
739 }
740 765
741 if (found) { 766 if (found) {
742 va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start); 767 va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
@@ -1942,7 +1967,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh)
1942 ret = oh->mpu_irqs_cnt + oh->sdma_reqs_cnt; 1967 ret = oh->mpu_irqs_cnt + oh->sdma_reqs_cnt;
1943 1968
1944 for (i = 0; i < oh->slaves_cnt; i++) 1969 for (i = 0; i < oh->slaves_cnt; i++)
1945 ret += oh->slaves[i]->addr_cnt; 1970 ret += _count_ocp_if_addr_spaces(oh->slaves[i]);
1946 1971
1947 return ret; 1972 return ret;
1948} 1973}
@@ -1982,10 +2007,12 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)
1982 2007
1983 for (i = 0; i < oh->slaves_cnt; i++) { 2008 for (i = 0; i < oh->slaves_cnt; i++) {
1984 struct omap_hwmod_ocp_if *os; 2009 struct omap_hwmod_ocp_if *os;
2010 int addr_cnt;
1985 2011
1986 os = oh->slaves[i]; 2012 os = oh->slaves[i];
2013 addr_cnt = _count_ocp_if_addr_spaces(os);
1987 2014
1988 for (j = 0; j < os->addr_cnt; j++) { 2015 for (j = 0; j < addr_cnt; j++) {
1989 (res + r)->name = (os->addr + j)->name; 2016 (res + r)->name = (os->addr + j)->name;
1990 (res + r)->start = (os->addr + j)->pa_start; 2017 (res + r)->start = (os->addr + j)->pa_start;
1991 (res + r)->end = (os->addr + j)->pa_end; 2018 (res + r)->end = (os->addr + j)->pa_end;
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index c4d0ae87d62a..1a7ce3ec0c0b 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * omap_hwmod_2420_data.c - hardware modules present on the OMAP2420 chips 2 * omap_hwmod_2420_data.c - hardware modules present on the OMAP2420 chips
3 * 3 *
4 * Copyright (C) 2009-2010 Nokia Corporation 4 * Copyright (C) 2009-2011 Nokia Corporation
5 * Paul Walmsley 5 * Paul Walmsley
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
@@ -120,6 +120,7 @@ static struct omap_hwmod_addr_space omap2420_mcspi1_addr_space[] = {
120 .pa_end = 0x480980ff, 120 .pa_end = 0x480980ff,
121 .flags = ADDR_TYPE_RT, 121 .flags = ADDR_TYPE_RT,
122 }, 122 },
123 { }
123}; 124};
124 125
125static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = { 126static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = {
@@ -127,7 +128,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = {
127 .slave = &omap2420_mcspi1_hwmod, 128 .slave = &omap2420_mcspi1_hwmod,
128 .clk = "mcspi1_ick", 129 .clk = "mcspi1_ick",
129 .addr = omap2420_mcspi1_addr_space, 130 .addr = omap2420_mcspi1_addr_space,
130 .addr_cnt = ARRAY_SIZE(omap2420_mcspi1_addr_space),
131 .user = OCP_USER_MPU | OCP_USER_SDMA, 131 .user = OCP_USER_MPU | OCP_USER_SDMA,
132}; 132};
133 133
@@ -138,6 +138,7 @@ static struct omap_hwmod_addr_space omap2420_mcspi2_addr_space[] = {
138 .pa_end = 0x4809a0ff, 138 .pa_end = 0x4809a0ff,
139 .flags = ADDR_TYPE_RT, 139 .flags = ADDR_TYPE_RT,
140 }, 140 },
141 { }
141}; 142};
142 143
143static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = { 144static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = {
@@ -145,7 +146,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = {
145 .slave = &omap2420_mcspi2_hwmod, 146 .slave = &omap2420_mcspi2_hwmod,
146 .clk = "mcspi2_ick", 147 .clk = "mcspi2_ick",
147 .addr = omap2420_mcspi2_addr_space, 148 .addr = omap2420_mcspi2_addr_space,
148 .addr_cnt = ARRAY_SIZE(omap2420_mcspi2_addr_space),
149 .user = OCP_USER_MPU | OCP_USER_SDMA, 149 .user = OCP_USER_MPU | OCP_USER_SDMA,
150}; 150};
151 151
@@ -163,6 +163,7 @@ static struct omap_hwmod_addr_space omap2420_uart1_addr_space[] = {
163 .pa_end = OMAP2_UART1_BASE + SZ_8K - 1, 163 .pa_end = OMAP2_UART1_BASE + SZ_8K - 1,
164 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 164 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
165 }, 165 },
166 { }
166}; 167};
167 168
168static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = { 169static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
@@ -170,7 +171,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
170 .slave = &omap2420_uart1_hwmod, 171 .slave = &omap2420_uart1_hwmod,
171 .clk = "uart1_ick", 172 .clk = "uart1_ick",
172 .addr = omap2420_uart1_addr_space, 173 .addr = omap2420_uart1_addr_space,
173 .addr_cnt = ARRAY_SIZE(omap2420_uart1_addr_space),
174 .user = OCP_USER_MPU | OCP_USER_SDMA, 174 .user = OCP_USER_MPU | OCP_USER_SDMA,
175}; 175};
176 176
@@ -181,6 +181,7 @@ static struct omap_hwmod_addr_space omap2420_uart2_addr_space[] = {
181 .pa_end = OMAP2_UART2_BASE + SZ_1K - 1, 181 .pa_end = OMAP2_UART2_BASE + SZ_1K - 1,
182 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 182 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
183 }, 183 },
184 { }
184}; 185};
185 186
186static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = { 187static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
@@ -188,7 +189,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
188 .slave = &omap2420_uart2_hwmod, 189 .slave = &omap2420_uart2_hwmod,
189 .clk = "uart2_ick", 190 .clk = "uart2_ick",
190 .addr = omap2420_uart2_addr_space, 191 .addr = omap2420_uart2_addr_space,
191 .addr_cnt = ARRAY_SIZE(omap2420_uart2_addr_space),
192 .user = OCP_USER_MPU | OCP_USER_SDMA, 192 .user = OCP_USER_MPU | OCP_USER_SDMA,
193}; 193};
194 194
@@ -199,6 +199,7 @@ static struct omap_hwmod_addr_space omap2420_uart3_addr_space[] = {
199 .pa_end = OMAP2_UART3_BASE + SZ_1K - 1, 199 .pa_end = OMAP2_UART3_BASE + SZ_1K - 1,
200 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 200 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
201 }, 201 },
202 { }
202}; 203};
203 204
204static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = { 205static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
@@ -206,7 +207,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
206 .slave = &omap2420_uart3_hwmod, 207 .slave = &omap2420_uart3_hwmod,
207 .clk = "uart3_ick", 208 .clk = "uart3_ick",
208 .addr = omap2420_uart3_addr_space, 209 .addr = omap2420_uart3_addr_space,
209 .addr_cnt = ARRAY_SIZE(omap2420_uart3_addr_space),
210 .user = OCP_USER_MPU | OCP_USER_SDMA, 210 .user = OCP_USER_MPU | OCP_USER_SDMA,
211}; 211};
212 212
@@ -220,6 +220,7 @@ static struct omap_hwmod_addr_space omap2420_i2c1_addr_space[] = {
220 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1, 220 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1,
221 .flags = ADDR_TYPE_RT, 221 .flags = ADDR_TYPE_RT,
222 }, 222 },
223 { }
223}; 224};
224 225
225static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = { 226static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = {
@@ -227,7 +228,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = {
227 .slave = &omap2420_i2c1_hwmod, 228 .slave = &omap2420_i2c1_hwmod,
228 .clk = "i2c1_ick", 229 .clk = "i2c1_ick",
229 .addr = omap2420_i2c1_addr_space, 230 .addr = omap2420_i2c1_addr_space,
230 .addr_cnt = ARRAY_SIZE(omap2420_i2c1_addr_space),
231 .user = OCP_USER_MPU | OCP_USER_SDMA, 231 .user = OCP_USER_MPU | OCP_USER_SDMA,
232}; 232};
233 233
@@ -238,6 +238,7 @@ static struct omap_hwmod_addr_space omap2420_i2c2_addr_space[] = {
238 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1, 238 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1,
239 .flags = ADDR_TYPE_RT, 239 .flags = ADDR_TYPE_RT,
240 }, 240 },
241 { }
241}; 242};
242 243
243static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = { 244static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = {
@@ -245,7 +246,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = {
245 .slave = &omap2420_i2c2_hwmod, 246 .slave = &omap2420_i2c2_hwmod,
246 .clk = "i2c2_ick", 247 .clk = "i2c2_ick",
247 .addr = omap2420_i2c2_addr_space, 248 .addr = omap2420_i2c2_addr_space,
248 .addr_cnt = ARRAY_SIZE(omap2420_i2c2_addr_space),
249 .user = OCP_USER_MPU | OCP_USER_SDMA, 249 .user = OCP_USER_MPU | OCP_USER_SDMA,
250}; 250};
251 251
@@ -370,6 +370,7 @@ static struct omap_hwmod_addr_space omap2420_timer1_addrs[] = {
370 .pa_end = 0x48028000 + SZ_1K - 1, 370 .pa_end = 0x48028000 + SZ_1K - 1,
371 .flags = ADDR_TYPE_RT 371 .flags = ADDR_TYPE_RT
372 }, 372 },
373 { }
373}; 374};
374 375
375/* l4_wkup -> timer1 */ 376/* l4_wkup -> timer1 */
@@ -378,7 +379,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__timer1 = {
378 .slave = &omap2420_timer1_hwmod, 379 .slave = &omap2420_timer1_hwmod,
379 .clk = "gpt1_ick", 380 .clk = "gpt1_ick",
380 .addr = omap2420_timer1_addrs, 381 .addr = omap2420_timer1_addrs,
381 .addr_cnt = ARRAY_SIZE(omap2420_timer1_addrs),
382 .user = OCP_USER_MPU | OCP_USER_SDMA, 382 .user = OCP_USER_MPU | OCP_USER_SDMA,
383}; 383};
384 384
@@ -420,6 +420,7 @@ static struct omap_hwmod_addr_space omap2420_timer2_addrs[] = {
420 .pa_end = 0x4802a000 + SZ_1K - 1, 420 .pa_end = 0x4802a000 + SZ_1K - 1,
421 .flags = ADDR_TYPE_RT 421 .flags = ADDR_TYPE_RT
422 }, 422 },
423 { }
423}; 424};
424 425
425/* l4_core -> timer2 */ 426/* l4_core -> timer2 */
@@ -428,7 +429,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer2 = {
428 .slave = &omap2420_timer2_hwmod, 429 .slave = &omap2420_timer2_hwmod,
429 .clk = "gpt2_ick", 430 .clk = "gpt2_ick",
430 .addr = omap2420_timer2_addrs, 431 .addr = omap2420_timer2_addrs,
431 .addr_cnt = ARRAY_SIZE(omap2420_timer2_addrs),
432 .user = OCP_USER_MPU | OCP_USER_SDMA, 432 .user = OCP_USER_MPU | OCP_USER_SDMA,
433}; 433};
434 434
@@ -470,6 +470,7 @@ static struct omap_hwmod_addr_space omap2420_timer3_addrs[] = {
470 .pa_end = 0x48078000 + SZ_1K - 1, 470 .pa_end = 0x48078000 + SZ_1K - 1,
471 .flags = ADDR_TYPE_RT 471 .flags = ADDR_TYPE_RT
472 }, 472 },
473 { }
473}; 474};
474 475
475/* l4_core -> timer3 */ 476/* l4_core -> timer3 */
@@ -478,7 +479,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer3 = {
478 .slave = &omap2420_timer3_hwmod, 479 .slave = &omap2420_timer3_hwmod,
479 .clk = "gpt3_ick", 480 .clk = "gpt3_ick",
480 .addr = omap2420_timer3_addrs, 481 .addr = omap2420_timer3_addrs,
481 .addr_cnt = ARRAY_SIZE(omap2420_timer3_addrs),
482 .user = OCP_USER_MPU | OCP_USER_SDMA, 482 .user = OCP_USER_MPU | OCP_USER_SDMA,
483}; 483};
484 484
@@ -520,6 +520,7 @@ static struct omap_hwmod_addr_space omap2420_timer4_addrs[] = {
520 .pa_end = 0x4807a000 + SZ_1K - 1, 520 .pa_end = 0x4807a000 + SZ_1K - 1,
521 .flags = ADDR_TYPE_RT 521 .flags = ADDR_TYPE_RT
522 }, 522 },
523 { }
523}; 524};
524 525
525/* l4_core -> timer4 */ 526/* l4_core -> timer4 */
@@ -528,7 +529,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer4 = {
528 .slave = &omap2420_timer4_hwmod, 529 .slave = &omap2420_timer4_hwmod,
529 .clk = "gpt4_ick", 530 .clk = "gpt4_ick",
530 .addr = omap2420_timer4_addrs, 531 .addr = omap2420_timer4_addrs,
531 .addr_cnt = ARRAY_SIZE(omap2420_timer4_addrs),
532 .user = OCP_USER_MPU | OCP_USER_SDMA, 532 .user = OCP_USER_MPU | OCP_USER_SDMA,
533}; 533};
534 534
@@ -570,6 +570,7 @@ static struct omap_hwmod_addr_space omap2420_timer5_addrs[] = {
570 .pa_end = 0x4807c000 + SZ_1K - 1, 570 .pa_end = 0x4807c000 + SZ_1K - 1,
571 .flags = ADDR_TYPE_RT 571 .flags = ADDR_TYPE_RT
572 }, 572 },
573 { }
573}; 574};
574 575
575/* l4_core -> timer5 */ 576/* l4_core -> timer5 */
@@ -578,7 +579,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer5 = {
578 .slave = &omap2420_timer5_hwmod, 579 .slave = &omap2420_timer5_hwmod,
579 .clk = "gpt5_ick", 580 .clk = "gpt5_ick",
580 .addr = omap2420_timer5_addrs, 581 .addr = omap2420_timer5_addrs,
581 .addr_cnt = ARRAY_SIZE(omap2420_timer5_addrs),
582 .user = OCP_USER_MPU | OCP_USER_SDMA, 582 .user = OCP_USER_MPU | OCP_USER_SDMA,
583}; 583};
584 584
@@ -621,6 +621,7 @@ static struct omap_hwmod_addr_space omap2420_timer6_addrs[] = {
621 .pa_end = 0x4807e000 + SZ_1K - 1, 621 .pa_end = 0x4807e000 + SZ_1K - 1,
622 .flags = ADDR_TYPE_RT 622 .flags = ADDR_TYPE_RT
623 }, 623 },
624 { }
624}; 625};
625 626
626/* l4_core -> timer6 */ 627/* l4_core -> timer6 */
@@ -629,7 +630,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer6 = {
629 .slave = &omap2420_timer6_hwmod, 630 .slave = &omap2420_timer6_hwmod,
630 .clk = "gpt6_ick", 631 .clk = "gpt6_ick",
631 .addr = omap2420_timer6_addrs, 632 .addr = omap2420_timer6_addrs,
632 .addr_cnt = ARRAY_SIZE(omap2420_timer6_addrs),
633 .user = OCP_USER_MPU | OCP_USER_SDMA, 633 .user = OCP_USER_MPU | OCP_USER_SDMA,
634}; 634};
635 635
@@ -671,6 +671,7 @@ static struct omap_hwmod_addr_space omap2420_timer7_addrs[] = {
671 .pa_end = 0x48080000 + SZ_1K - 1, 671 .pa_end = 0x48080000 + SZ_1K - 1,
672 .flags = ADDR_TYPE_RT 672 .flags = ADDR_TYPE_RT
673 }, 673 },
674 { }
674}; 675};
675 676
676/* l4_core -> timer7 */ 677/* l4_core -> timer7 */
@@ -679,7 +680,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer7 = {
679 .slave = &omap2420_timer7_hwmod, 680 .slave = &omap2420_timer7_hwmod,
680 .clk = "gpt7_ick", 681 .clk = "gpt7_ick",
681 .addr = omap2420_timer7_addrs, 682 .addr = omap2420_timer7_addrs,
682 .addr_cnt = ARRAY_SIZE(omap2420_timer7_addrs),
683 .user = OCP_USER_MPU | OCP_USER_SDMA, 683 .user = OCP_USER_MPU | OCP_USER_SDMA,
684}; 684};
685 685
@@ -721,6 +721,7 @@ static struct omap_hwmod_addr_space omap2420_timer8_addrs[] = {
721 .pa_end = 0x48082000 + SZ_1K - 1, 721 .pa_end = 0x48082000 + SZ_1K - 1,
722 .flags = ADDR_TYPE_RT 722 .flags = ADDR_TYPE_RT
723 }, 723 },
724 { }
724}; 725};
725 726
726/* l4_core -> timer8 */ 727/* l4_core -> timer8 */
@@ -729,7 +730,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer8 = {
729 .slave = &omap2420_timer8_hwmod, 730 .slave = &omap2420_timer8_hwmod,
730 .clk = "gpt8_ick", 731 .clk = "gpt8_ick",
731 .addr = omap2420_timer8_addrs, 732 .addr = omap2420_timer8_addrs,
732 .addr_cnt = ARRAY_SIZE(omap2420_timer8_addrs),
733 .user = OCP_USER_MPU | OCP_USER_SDMA, 733 .user = OCP_USER_MPU | OCP_USER_SDMA,
734}; 734};
735 735
@@ -771,6 +771,7 @@ static struct omap_hwmod_addr_space omap2420_timer9_addrs[] = {
771 .pa_end = 0x48084000 + SZ_1K - 1, 771 .pa_end = 0x48084000 + SZ_1K - 1,
772 .flags = ADDR_TYPE_RT 772 .flags = ADDR_TYPE_RT
773 }, 773 },
774 { }
774}; 775};
775 776
776/* l4_core -> timer9 */ 777/* l4_core -> timer9 */
@@ -779,7 +780,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer9 = {
779 .slave = &omap2420_timer9_hwmod, 780 .slave = &omap2420_timer9_hwmod,
780 .clk = "gpt9_ick", 781 .clk = "gpt9_ick",
781 .addr = omap2420_timer9_addrs, 782 .addr = omap2420_timer9_addrs,
782 .addr_cnt = ARRAY_SIZE(omap2420_timer9_addrs),
783 .user = OCP_USER_MPU | OCP_USER_SDMA, 783 .user = OCP_USER_MPU | OCP_USER_SDMA,
784}; 784};
785 785
@@ -821,6 +821,7 @@ static struct omap_hwmod_addr_space omap2420_timer10_addrs[] = {
821 .pa_end = 0x48086000 + SZ_1K - 1, 821 .pa_end = 0x48086000 + SZ_1K - 1,
822 .flags = ADDR_TYPE_RT 822 .flags = ADDR_TYPE_RT
823 }, 823 },
824 { }
824}; 825};
825 826
826/* l4_core -> timer10 */ 827/* l4_core -> timer10 */
@@ -829,7 +830,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer10 = {
829 .slave = &omap2420_timer10_hwmod, 830 .slave = &omap2420_timer10_hwmod,
830 .clk = "gpt10_ick", 831 .clk = "gpt10_ick",
831 .addr = omap2420_timer10_addrs, 832 .addr = omap2420_timer10_addrs,
832 .addr_cnt = ARRAY_SIZE(omap2420_timer10_addrs),
833 .user = OCP_USER_MPU | OCP_USER_SDMA, 833 .user = OCP_USER_MPU | OCP_USER_SDMA,
834}; 834};
835 835
@@ -871,6 +871,7 @@ static struct omap_hwmod_addr_space omap2420_timer11_addrs[] = {
871 .pa_end = 0x48088000 + SZ_1K - 1, 871 .pa_end = 0x48088000 + SZ_1K - 1,
872 .flags = ADDR_TYPE_RT 872 .flags = ADDR_TYPE_RT
873 }, 873 },
874 { }
874}; 875};
875 876
876/* l4_core -> timer11 */ 877/* l4_core -> timer11 */
@@ -879,7 +880,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer11 = {
879 .slave = &omap2420_timer11_hwmod, 880 .slave = &omap2420_timer11_hwmod,
880 .clk = "gpt11_ick", 881 .clk = "gpt11_ick",
881 .addr = omap2420_timer11_addrs, 882 .addr = omap2420_timer11_addrs,
882 .addr_cnt = ARRAY_SIZE(omap2420_timer11_addrs),
883 .user = OCP_USER_MPU | OCP_USER_SDMA, 883 .user = OCP_USER_MPU | OCP_USER_SDMA,
884}; 884};
885 885
@@ -921,6 +921,7 @@ static struct omap_hwmod_addr_space omap2420_timer12_addrs[] = {
921 .pa_end = 0x4808a000 + SZ_1K - 1, 921 .pa_end = 0x4808a000 + SZ_1K - 1,
922 .flags = ADDR_TYPE_RT 922 .flags = ADDR_TYPE_RT
923 }, 923 },
924 { }
924}; 925};
925 926
926/* l4_core -> timer12 */ 927/* l4_core -> timer12 */
@@ -929,7 +930,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer12 = {
929 .slave = &omap2420_timer12_hwmod, 930 .slave = &omap2420_timer12_hwmod,
930 .clk = "gpt12_ick", 931 .clk = "gpt12_ick",
931 .addr = omap2420_timer12_addrs, 932 .addr = omap2420_timer12_addrs,
932 .addr_cnt = ARRAY_SIZE(omap2420_timer12_addrs),
933 .user = OCP_USER_MPU | OCP_USER_SDMA, 933 .user = OCP_USER_MPU | OCP_USER_SDMA,
934}; 934};
935 935
@@ -966,6 +966,7 @@ static struct omap_hwmod_addr_space omap2420_wd_timer2_addrs[] = {
966 .pa_end = 0x4802207f, 966 .pa_end = 0x4802207f,
967 .flags = ADDR_TYPE_RT 967 .flags = ADDR_TYPE_RT
968 }, 968 },
969 { }
969}; 970};
970 971
971static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = { 972static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = {
@@ -973,7 +974,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = {
973 .slave = &omap2420_wd_timer2_hwmod, 974 .slave = &omap2420_wd_timer2_hwmod,
974 .clk = "mpu_wdt_ick", 975 .clk = "mpu_wdt_ick",
975 .addr = omap2420_wd_timer2_addrs, 976 .addr = omap2420_wd_timer2_addrs,
976 .addr_cnt = ARRAY_SIZE(omap2420_wd_timer2_addrs),
977 .user = OCP_USER_MPU | OCP_USER_SDMA, 977 .user = OCP_USER_MPU | OCP_USER_SDMA,
978}; 978};
979 979
@@ -1184,6 +1184,7 @@ static struct omap_hwmod_addr_space omap2420_dss_addrs[] = {
1184 .pa_end = 0x480503FF, 1184 .pa_end = 0x480503FF,
1185 .flags = ADDR_TYPE_RT 1185 .flags = ADDR_TYPE_RT
1186 }, 1186 },
1187 { }
1187}; 1188};
1188 1189
1189/* l4_core -> dss */ 1190/* l4_core -> dss */
@@ -1192,7 +1193,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss = {
1192 .slave = &omap2420_dss_core_hwmod, 1193 .slave = &omap2420_dss_core_hwmod,
1193 .clk = "dss_ick", 1194 .clk = "dss_ick",
1194 .addr = omap2420_dss_addrs, 1195 .addr = omap2420_dss_addrs,
1195 .addr_cnt = ARRAY_SIZE(omap2420_dss_addrs),
1196 .fw = { 1196 .fw = {
1197 .omap2 = { 1197 .omap2 = {
1198 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION, 1198 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
@@ -1268,6 +1268,7 @@ static struct omap_hwmod_addr_space omap2420_dss_dispc_addrs[] = {
1268 .pa_end = 0x480507FF, 1268 .pa_end = 0x480507FF,
1269 .flags = ADDR_TYPE_RT 1269 .flags = ADDR_TYPE_RT
1270 }, 1270 },
1271 { }
1271}; 1272};
1272 1273
1273/* l4_core -> dss_dispc */ 1274/* l4_core -> dss_dispc */
@@ -1276,7 +1277,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_dispc = {
1276 .slave = &omap2420_dss_dispc_hwmod, 1277 .slave = &omap2420_dss_dispc_hwmod,
1277 .clk = "dss_ick", 1278 .clk = "dss_ick",
1278 .addr = omap2420_dss_dispc_addrs, 1279 .addr = omap2420_dss_dispc_addrs,
1279 .addr_cnt = ARRAY_SIZE(omap2420_dss_dispc_addrs),
1280 .fw = { 1280 .fw = {
1281 .omap2 = { 1281 .omap2 = {
1282 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION, 1282 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION,
@@ -1338,6 +1338,7 @@ static struct omap_hwmod_addr_space omap2420_dss_rfbi_addrs[] = {
1338 .pa_end = 0x48050BFF, 1338 .pa_end = 0x48050BFF,
1339 .flags = ADDR_TYPE_RT 1339 .flags = ADDR_TYPE_RT
1340 }, 1340 },
1341 { }
1341}; 1342};
1342 1343
1343/* l4_core -> dss_rfbi */ 1344/* l4_core -> dss_rfbi */
@@ -1346,7 +1347,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_rfbi = {
1346 .slave = &omap2420_dss_rfbi_hwmod, 1347 .slave = &omap2420_dss_rfbi_hwmod,
1347 .clk = "dss_ick", 1348 .clk = "dss_ick",
1348 .addr = omap2420_dss_rfbi_addrs, 1349 .addr = omap2420_dss_rfbi_addrs,
1349 .addr_cnt = ARRAY_SIZE(omap2420_dss_rfbi_addrs),
1350 .fw = { 1350 .fw = {
1351 .omap2 = { 1351 .omap2 = {
1352 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION, 1352 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
@@ -1394,6 +1394,7 @@ static struct omap_hwmod_addr_space omap2420_dss_venc_addrs[] = {
1394 .pa_end = 0x48050FFF, 1394 .pa_end = 0x48050FFF,
1395 .flags = ADDR_TYPE_RT 1395 .flags = ADDR_TYPE_RT
1396 }, 1396 },
1397 { }
1397}; 1398};
1398 1399
1399/* l4_core -> dss_venc */ 1400/* l4_core -> dss_venc */
@@ -1402,7 +1403,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = {
1402 .slave = &omap2420_dss_venc_hwmod, 1403 .slave = &omap2420_dss_venc_hwmod,
1403 .clk = "dss_54m_fck", 1404 .clk = "dss_54m_fck",
1404 .addr = omap2420_dss_venc_addrs, 1405 .addr = omap2420_dss_venc_addrs,
1405 .addr_cnt = ARRAY_SIZE(omap2420_dss_venc_addrs),
1406 .fw = { 1406 .fw = {
1407 .omap2 = { 1407 .omap2 = {
1408 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_VENC_REGION, 1408 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_VENC_REGION,
@@ -1536,6 +1536,7 @@ static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = {
1536 .pa_end = 0x480181ff, 1536 .pa_end = 0x480181ff,
1537 .flags = ADDR_TYPE_RT 1537 .flags = ADDR_TYPE_RT
1538 }, 1538 },
1539 { }
1539}; 1540};
1540 1541
1541static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { 1542static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = {
@@ -1543,7 +1544,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = {
1543 .slave = &omap2420_gpio1_hwmod, 1544 .slave = &omap2420_gpio1_hwmod,
1544 .clk = "gpios_ick", 1545 .clk = "gpios_ick",
1545 .addr = omap2420_gpio1_addr_space, 1546 .addr = omap2420_gpio1_addr_space,
1546 .addr_cnt = ARRAY_SIZE(omap2420_gpio1_addr_space),
1547 .user = OCP_USER_MPU | OCP_USER_SDMA, 1547 .user = OCP_USER_MPU | OCP_USER_SDMA,
1548}; 1548};
1549 1549
@@ -1554,6 +1554,7 @@ static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = {
1554 .pa_end = 0x4801a1ff, 1554 .pa_end = 0x4801a1ff,
1555 .flags = ADDR_TYPE_RT 1555 .flags = ADDR_TYPE_RT
1556 }, 1556 },
1557 { }
1557}; 1558};
1558 1559
1559static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { 1560static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = {
@@ -1561,7 +1562,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = {
1561 .slave = &omap2420_gpio2_hwmod, 1562 .slave = &omap2420_gpio2_hwmod,
1562 .clk = "gpios_ick", 1563 .clk = "gpios_ick",
1563 .addr = omap2420_gpio2_addr_space, 1564 .addr = omap2420_gpio2_addr_space,
1564 .addr_cnt = ARRAY_SIZE(omap2420_gpio2_addr_space),
1565 .user = OCP_USER_MPU | OCP_USER_SDMA, 1565 .user = OCP_USER_MPU | OCP_USER_SDMA,
1566}; 1566};
1567 1567
@@ -1572,6 +1572,7 @@ static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = {
1572 .pa_end = 0x4801c1ff, 1572 .pa_end = 0x4801c1ff,
1573 .flags = ADDR_TYPE_RT 1573 .flags = ADDR_TYPE_RT
1574 }, 1574 },
1575 { }
1575}; 1576};
1576 1577
1577static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { 1578static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = {
@@ -1579,7 +1580,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = {
1579 .slave = &omap2420_gpio3_hwmod, 1580 .slave = &omap2420_gpio3_hwmod,
1580 .clk = "gpios_ick", 1581 .clk = "gpios_ick",
1581 .addr = omap2420_gpio3_addr_space, 1582 .addr = omap2420_gpio3_addr_space,
1582 .addr_cnt = ARRAY_SIZE(omap2420_gpio3_addr_space),
1583 .user = OCP_USER_MPU | OCP_USER_SDMA, 1583 .user = OCP_USER_MPU | OCP_USER_SDMA,
1584}; 1584};
1585 1585
@@ -1590,6 +1590,7 @@ static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = {
1590 .pa_end = 0x4801e1ff, 1590 .pa_end = 0x4801e1ff,
1591 .flags = ADDR_TYPE_RT 1591 .flags = ADDR_TYPE_RT
1592 }, 1592 },
1593 { }
1593}; 1594};
1594 1595
1595static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { 1596static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = {
@@ -1597,7 +1598,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = {
1597 .slave = &omap2420_gpio4_hwmod, 1598 .slave = &omap2420_gpio4_hwmod,
1598 .clk = "gpios_ick", 1599 .clk = "gpios_ick",
1599 .addr = omap2420_gpio4_addr_space, 1600 .addr = omap2420_gpio4_addr_space,
1600 .addr_cnt = ARRAY_SIZE(omap2420_gpio4_addr_space),
1601 .user = OCP_USER_MPU | OCP_USER_SDMA, 1601 .user = OCP_USER_MPU | OCP_USER_SDMA,
1602}; 1602};
1603 1603
@@ -1789,6 +1789,7 @@ static struct omap_hwmod_addr_space omap2420_dma_system_addrs[] = {
1789 .pa_end = 0x48056fff, 1789 .pa_end = 0x48056fff,
1790 .flags = ADDR_TYPE_RT 1790 .flags = ADDR_TYPE_RT
1791 }, 1791 },
1792 { }
1792}; 1793};
1793 1794
1794/* dma_system -> L3 */ 1795/* dma_system -> L3 */
@@ -1810,7 +1811,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dma_system = {
1810 .slave = &omap2420_dma_system_hwmod, 1811 .slave = &omap2420_dma_system_hwmod,
1811 .clk = "sdma_ick", 1812 .clk = "sdma_ick",
1812 .addr = omap2420_dma_system_addrs, 1813 .addr = omap2420_dma_system_addrs,
1813 .addr_cnt = ARRAY_SIZE(omap2420_dma_system_addrs),
1814 .user = OCP_USER_MPU | OCP_USER_SDMA, 1814 .user = OCP_USER_MPU | OCP_USER_SDMA,
1815}; 1815};
1816 1816
@@ -1868,6 +1868,7 @@ static struct omap_hwmod_addr_space omap2420_mailbox_addrs[] = {
1868 .pa_end = 0x480941ff, 1868 .pa_end = 0x480941ff,
1869 .flags = ADDR_TYPE_RT, 1869 .flags = ADDR_TYPE_RT,
1870 }, 1870 },
1871 { }
1871}; 1872};
1872 1873
1873/* l4_core -> mailbox */ 1874/* l4_core -> mailbox */
@@ -1875,7 +1876,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mailbox = {
1875 .master = &omap2420_l4_core_hwmod, 1876 .master = &omap2420_l4_core_hwmod,
1876 .slave = &omap2420_mailbox_hwmod, 1877 .slave = &omap2420_mailbox_hwmod,
1877 .addr = omap2420_mailbox_addrs, 1878 .addr = omap2420_mailbox_addrs,
1878 .addr_cnt = ARRAY_SIZE(omap2420_mailbox_addrs),
1879 .user = OCP_USER_MPU | OCP_USER_SDMA, 1879 .user = OCP_USER_MPU | OCP_USER_SDMA,
1880}; 1880};
1881 1881
@@ -2044,6 +2044,7 @@ static struct omap_hwmod_addr_space omap2420_mcbsp1_addrs[] = {
2044 .pa_end = 0x480740ff, 2044 .pa_end = 0x480740ff,
2045 .flags = ADDR_TYPE_RT 2045 .flags = ADDR_TYPE_RT
2046 }, 2046 },
2047 { }
2047}; 2048};
2048 2049
2049/* l4_core -> mcbsp1 */ 2050/* l4_core -> mcbsp1 */
@@ -2052,7 +2053,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp1 = {
2052 .slave = &omap2420_mcbsp1_hwmod, 2053 .slave = &omap2420_mcbsp1_hwmod,
2053 .clk = "mcbsp1_ick", 2054 .clk = "mcbsp1_ick",
2054 .addr = omap2420_mcbsp1_addrs, 2055 .addr = omap2420_mcbsp1_addrs,
2055 .addr_cnt = ARRAY_SIZE(omap2420_mcbsp1_addrs),
2056 .user = OCP_USER_MPU | OCP_USER_SDMA, 2056 .user = OCP_USER_MPU | OCP_USER_SDMA,
2057}; 2057};
2058 2058
@@ -2101,6 +2101,7 @@ static struct omap_hwmod_addr_space omap2420_mcbsp2_addrs[] = {
2101 .pa_end = 0x480760ff, 2101 .pa_end = 0x480760ff,
2102 .flags = ADDR_TYPE_RT 2102 .flags = ADDR_TYPE_RT
2103 }, 2103 },
2104 { }
2104}; 2105};
2105 2106
2106/* l4_core -> mcbsp2 */ 2107/* l4_core -> mcbsp2 */
@@ -2109,7 +2110,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp2 = {
2109 .slave = &omap2420_mcbsp2_hwmod, 2110 .slave = &omap2420_mcbsp2_hwmod,
2110 .clk = "mcbsp2_ick", 2111 .clk = "mcbsp2_ick",
2111 .addr = omap2420_mcbsp2_addrs, 2112 .addr = omap2420_mcbsp2_addrs,
2112 .addr_cnt = ARRAY_SIZE(omap2420_mcbsp2_addrs),
2113 .user = OCP_USER_MPU | OCP_USER_SDMA, 2113 .user = OCP_USER_MPU | OCP_USER_SDMA,
2114}; 2114};
2115 2115
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 9682dd519f8d..da287947cc18 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * omap_hwmod_2430_data.c - hardware modules present on the OMAP2430 chips 2 * omap_hwmod_2430_data.c - hardware modules present on the OMAP2430 chips
3 * 3 *
4 * Copyright (C) 2009-2010 Nokia Corporation 4 * Copyright (C) 2009-2011 Nokia Corporation
5 * Paul Walmsley 5 * Paul Walmsley
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
@@ -141,6 +141,7 @@ static struct omap_hwmod_addr_space omap2430_i2c1_addr_space[] = {
141 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1, 141 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1,
142 .flags = ADDR_TYPE_RT, 142 .flags = ADDR_TYPE_RT,
143 }, 143 },
144 { }
144}; 145};
145 146
146static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = { 147static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = {
@@ -148,7 +149,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = {
148 .slave = &omap2430_i2c1_hwmod, 149 .slave = &omap2430_i2c1_hwmod,
149 .clk = "i2c1_ick", 150 .clk = "i2c1_ick",
150 .addr = omap2430_i2c1_addr_space, 151 .addr = omap2430_i2c1_addr_space,
151 .addr_cnt = ARRAY_SIZE(omap2430_i2c1_addr_space),
152 .user = OCP_USER_MPU | OCP_USER_SDMA, 152 .user = OCP_USER_MPU | OCP_USER_SDMA,
153}; 153};
154 154
@@ -159,6 +159,7 @@ static struct omap_hwmod_addr_space omap2430_i2c2_addr_space[] = {
159 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1, 159 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1,
160 .flags = ADDR_TYPE_RT, 160 .flags = ADDR_TYPE_RT,
161 }, 161 },
162 { }
162}; 163};
163 164
164static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = { 165static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = {
@@ -166,7 +167,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = {
166 .slave = &omap2430_i2c2_hwmod, 167 .slave = &omap2430_i2c2_hwmod,
167 .clk = "i2c2_ick", 168 .clk = "i2c2_ick",
168 .addr = omap2430_i2c2_addr_space, 169 .addr = omap2430_i2c2_addr_space,
169 .addr_cnt = ARRAY_SIZE(omap2430_i2c2_addr_space),
170 .user = OCP_USER_MPU | OCP_USER_SDMA, 170 .user = OCP_USER_MPU | OCP_USER_SDMA,
171}; 171};
172 172
@@ -184,6 +184,7 @@ static struct omap_hwmod_addr_space omap2430_uart1_addr_space[] = {
184 .pa_end = OMAP2_UART1_BASE + SZ_8K - 1, 184 .pa_end = OMAP2_UART1_BASE + SZ_8K - 1,
185 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 185 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
186 }, 186 },
187 { }
187}; 188};
188 189
189static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = { 190static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
@@ -191,7 +192,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
191 .slave = &omap2430_uart1_hwmod, 192 .slave = &omap2430_uart1_hwmod,
192 .clk = "uart1_ick", 193 .clk = "uart1_ick",
193 .addr = omap2430_uart1_addr_space, 194 .addr = omap2430_uart1_addr_space,
194 .addr_cnt = ARRAY_SIZE(omap2430_uart1_addr_space),
195 .user = OCP_USER_MPU | OCP_USER_SDMA, 195 .user = OCP_USER_MPU | OCP_USER_SDMA,
196}; 196};
197 197
@@ -202,6 +202,7 @@ static struct omap_hwmod_addr_space omap2430_uart2_addr_space[] = {
202 .pa_end = OMAP2_UART2_BASE + SZ_1K - 1, 202 .pa_end = OMAP2_UART2_BASE + SZ_1K - 1,
203 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 203 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
204 }, 204 },
205 { }
205}; 206};
206 207
207static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = { 208static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
@@ -209,7 +210,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
209 .slave = &omap2430_uart2_hwmod, 210 .slave = &omap2430_uart2_hwmod,
210 .clk = "uart2_ick", 211 .clk = "uart2_ick",
211 .addr = omap2430_uart2_addr_space, 212 .addr = omap2430_uart2_addr_space,
212 .addr_cnt = ARRAY_SIZE(omap2430_uart2_addr_space),
213 .user = OCP_USER_MPU | OCP_USER_SDMA, 213 .user = OCP_USER_MPU | OCP_USER_SDMA,
214}; 214};
215 215
@@ -220,6 +220,7 @@ static struct omap_hwmod_addr_space omap2430_uart3_addr_space[] = {
220 .pa_end = OMAP2_UART3_BASE + SZ_1K - 1, 220 .pa_end = OMAP2_UART3_BASE + SZ_1K - 1,
221 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 221 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
222 }, 222 },
223 { }
223}; 224};
224 225
225static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = { 226static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
@@ -227,7 +228,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
227 .slave = &omap2430_uart3_hwmod, 228 .slave = &omap2430_uart3_hwmod,
228 .clk = "uart3_ick", 229 .clk = "uart3_ick",
229 .addr = omap2430_uart3_addr_space, 230 .addr = omap2430_uart3_addr_space,
230 .addr_cnt = ARRAY_SIZE(omap2430_uart3_addr_space),
231 .user = OCP_USER_MPU | OCP_USER_SDMA, 231 .user = OCP_USER_MPU | OCP_USER_SDMA,
232}; 232};
233 233
@@ -248,7 +248,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__usbhsotg = {
248 .slave = &omap2430_usbhsotg_hwmod, 248 .slave = &omap2430_usbhsotg_hwmod,
249 .clk = "usb_l4_ick", 249 .clk = "usb_l4_ick",
250 .addr = omap2430_usbhsotg_addrs, 250 .addr = omap2430_usbhsotg_addrs,
251 .addr_cnt = ARRAY_SIZE(omap2430_usbhsotg_addrs),
252 .user = OCP_USER_MPU, 251 .user = OCP_USER_MPU,
253}; 252};
254 253
@@ -267,6 +266,7 @@ static struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = {
267 .pa_end = 0x4809c1ff, 266 .pa_end = 0x4809c1ff,
268 .flags = ADDR_TYPE_RT, 267 .flags = ADDR_TYPE_RT,
269 }, 268 },
269 { }
270}; 270};
271 271
272static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = { 272static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = {
@@ -274,7 +274,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = {
274 .slave = &omap2430_mmc1_hwmod, 274 .slave = &omap2430_mmc1_hwmod,
275 .clk = "mmchs1_ick", 275 .clk = "mmchs1_ick",
276 .addr = omap2430_mmc1_addr_space, 276 .addr = omap2430_mmc1_addr_space,
277 .addr_cnt = ARRAY_SIZE(omap2430_mmc1_addr_space),
278 .user = OCP_USER_MPU | OCP_USER_SDMA, 277 .user = OCP_USER_MPU | OCP_USER_SDMA,
279}; 278};
280 279
@@ -285,14 +284,14 @@ static struct omap_hwmod_addr_space omap2430_mmc2_addr_space[] = {
285 .pa_end = 0x480b41ff, 284 .pa_end = 0x480b41ff,
286 .flags = ADDR_TYPE_RT, 285 .flags = ADDR_TYPE_RT,
287 }, 286 },
287 { }
288}; 288};
289 289
290static struct omap_hwmod_ocp_if omap2430_l4_core__mmc2 = { 290static struct omap_hwmod_ocp_if omap2430_l4_core__mmc2 = {
291 .master = &omap2430_l4_core_hwmod, 291 .master = &omap2430_l4_core_hwmod,
292 .slave = &omap2430_mmc2_hwmod, 292 .slave = &omap2430_mmc2_hwmod,
293 .addr = omap2430_mmc2_addr_space,
294 .clk = "mmchs2_ick", 293 .clk = "mmchs2_ick",
295 .addr_cnt = ARRAY_SIZE(omap2430_mmc2_addr_space), 294 .addr = omap2430_mmc2_addr_space,
296 .user = OCP_USER_MPU | OCP_USER_SDMA, 295 .user = OCP_USER_MPU | OCP_USER_SDMA,
297}; 296};
298 297
@@ -339,6 +338,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi1_addr_space[] = {
339 .pa_end = 0x480980ff, 338 .pa_end = 0x480980ff,
340 .flags = ADDR_TYPE_RT, 339 .flags = ADDR_TYPE_RT,
341 }, 340 },
341 { }
342}; 342};
343 343
344static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = { 344static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = {
@@ -346,7 +346,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = {
346 .slave = &omap2430_mcspi1_hwmod, 346 .slave = &omap2430_mcspi1_hwmod,
347 .clk = "mcspi1_ick", 347 .clk = "mcspi1_ick",
348 .addr = omap2430_mcspi1_addr_space, 348 .addr = omap2430_mcspi1_addr_space,
349 .addr_cnt = ARRAY_SIZE(omap2430_mcspi1_addr_space),
350 .user = OCP_USER_MPU | OCP_USER_SDMA, 349 .user = OCP_USER_MPU | OCP_USER_SDMA,
351}; 350};
352 351
@@ -357,6 +356,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi2_addr_space[] = {
357 .pa_end = 0x4809a0ff, 356 .pa_end = 0x4809a0ff,
358 .flags = ADDR_TYPE_RT, 357 .flags = ADDR_TYPE_RT,
359 }, 358 },
359 { }
360}; 360};
361 361
362static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = { 362static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = {
@@ -364,7 +364,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = {
364 .slave = &omap2430_mcspi2_hwmod, 364 .slave = &omap2430_mcspi2_hwmod,
365 .clk = "mcspi2_ick", 365 .clk = "mcspi2_ick",
366 .addr = omap2430_mcspi2_addr_space, 366 .addr = omap2430_mcspi2_addr_space,
367 .addr_cnt = ARRAY_SIZE(omap2430_mcspi2_addr_space),
368 .user = OCP_USER_MPU | OCP_USER_SDMA, 367 .user = OCP_USER_MPU | OCP_USER_SDMA,
369}; 368};
370 369
@@ -375,6 +374,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[] = {
375 .pa_end = 0x480b80ff, 374 .pa_end = 0x480b80ff,
376 .flags = ADDR_TYPE_RT, 375 .flags = ADDR_TYPE_RT,
377 }, 376 },
377 { }
378}; 378};
379 379
380static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = { 380static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = {
@@ -382,7 +382,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = {
382 .slave = &omap2430_mcspi3_hwmod, 382 .slave = &omap2430_mcspi3_hwmod,
383 .clk = "mcspi3_ick", 383 .clk = "mcspi3_ick",
384 .addr = omap2430_mcspi3_addr_space, 384 .addr = omap2430_mcspi3_addr_space,
385 .addr_cnt = ARRAY_SIZE(omap2430_mcspi3_addr_space),
386 .user = OCP_USER_MPU | OCP_USER_SDMA, 385 .user = OCP_USER_MPU | OCP_USER_SDMA,
387}; 386};
388 387
@@ -471,6 +470,7 @@ static struct omap_hwmod_addr_space omap2430_timer1_addrs[] = {
471 .pa_end = 0x49018000 + SZ_1K - 1, 470 .pa_end = 0x49018000 + SZ_1K - 1,
472 .flags = ADDR_TYPE_RT 471 .flags = ADDR_TYPE_RT
473 }, 472 },
473 { }
474}; 474};
475 475
476/* l4_wkup -> timer1 */ 476/* l4_wkup -> timer1 */
@@ -479,7 +479,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__timer1 = {
479 .slave = &omap2430_timer1_hwmod, 479 .slave = &omap2430_timer1_hwmod,
480 .clk = "gpt1_ick", 480 .clk = "gpt1_ick",
481 .addr = omap2430_timer1_addrs, 481 .addr = omap2430_timer1_addrs,
482 .addr_cnt = ARRAY_SIZE(omap2430_timer1_addrs),
483 .user = OCP_USER_MPU | OCP_USER_SDMA, 482 .user = OCP_USER_MPU | OCP_USER_SDMA,
484}; 483};
485 484
@@ -521,6 +520,7 @@ static struct omap_hwmod_addr_space omap2430_timer2_addrs[] = {
521 .pa_end = 0x4802a000 + SZ_1K - 1, 520 .pa_end = 0x4802a000 + SZ_1K - 1,
522 .flags = ADDR_TYPE_RT 521 .flags = ADDR_TYPE_RT
523 }, 522 },
523 { }
524}; 524};
525 525
526/* l4_core -> timer2 */ 526/* l4_core -> timer2 */
@@ -529,7 +529,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer2 = {
529 .slave = &omap2430_timer2_hwmod, 529 .slave = &omap2430_timer2_hwmod,
530 .clk = "gpt2_ick", 530 .clk = "gpt2_ick",
531 .addr = omap2430_timer2_addrs, 531 .addr = omap2430_timer2_addrs,
532 .addr_cnt = ARRAY_SIZE(omap2430_timer2_addrs),
533 .user = OCP_USER_MPU | OCP_USER_SDMA, 532 .user = OCP_USER_MPU | OCP_USER_SDMA,
534}; 533};
535 534
@@ -571,6 +570,7 @@ static struct omap_hwmod_addr_space omap2430_timer3_addrs[] = {
571 .pa_end = 0x48078000 + SZ_1K - 1, 570 .pa_end = 0x48078000 + SZ_1K - 1,
572 .flags = ADDR_TYPE_RT 571 .flags = ADDR_TYPE_RT
573 }, 572 },
573 { }
574}; 574};
575 575
576/* l4_core -> timer3 */ 576/* l4_core -> timer3 */
@@ -579,7 +579,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer3 = {
579 .slave = &omap2430_timer3_hwmod, 579 .slave = &omap2430_timer3_hwmod,
580 .clk = "gpt3_ick", 580 .clk = "gpt3_ick",
581 .addr = omap2430_timer3_addrs, 581 .addr = omap2430_timer3_addrs,
582 .addr_cnt = ARRAY_SIZE(omap2430_timer3_addrs),
583 .user = OCP_USER_MPU | OCP_USER_SDMA, 582 .user = OCP_USER_MPU | OCP_USER_SDMA,
584}; 583};
585 584
@@ -621,6 +620,7 @@ static struct omap_hwmod_addr_space omap2430_timer4_addrs[] = {
621 .pa_end = 0x4807a000 + SZ_1K - 1, 620 .pa_end = 0x4807a000 + SZ_1K - 1,
622 .flags = ADDR_TYPE_RT 621 .flags = ADDR_TYPE_RT
623 }, 622 },
623 { }
624}; 624};
625 625
626/* l4_core -> timer4 */ 626/* l4_core -> timer4 */
@@ -629,7 +629,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer4 = {
629 .slave = &omap2430_timer4_hwmod, 629 .slave = &omap2430_timer4_hwmod,
630 .clk = "gpt4_ick", 630 .clk = "gpt4_ick",
631 .addr = omap2430_timer4_addrs, 631 .addr = omap2430_timer4_addrs,
632 .addr_cnt = ARRAY_SIZE(omap2430_timer4_addrs),
633 .user = OCP_USER_MPU | OCP_USER_SDMA, 632 .user = OCP_USER_MPU | OCP_USER_SDMA,
634}; 633};
635 634
@@ -671,6 +670,7 @@ static struct omap_hwmod_addr_space omap2430_timer5_addrs[] = {
671 .pa_end = 0x4807c000 + SZ_1K - 1, 670 .pa_end = 0x4807c000 + SZ_1K - 1,
672 .flags = ADDR_TYPE_RT 671 .flags = ADDR_TYPE_RT
673 }, 672 },
673 { }
674}; 674};
675 675
676/* l4_core -> timer5 */ 676/* l4_core -> timer5 */
@@ -679,7 +679,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer5 = {
679 .slave = &omap2430_timer5_hwmod, 679 .slave = &omap2430_timer5_hwmod,
680 .clk = "gpt5_ick", 680 .clk = "gpt5_ick",
681 .addr = omap2430_timer5_addrs, 681 .addr = omap2430_timer5_addrs,
682 .addr_cnt = ARRAY_SIZE(omap2430_timer5_addrs),
683 .user = OCP_USER_MPU | OCP_USER_SDMA, 682 .user = OCP_USER_MPU | OCP_USER_SDMA,
684}; 683};
685 684
@@ -721,6 +720,7 @@ static struct omap_hwmod_addr_space omap2430_timer6_addrs[] = {
721 .pa_end = 0x4807e000 + SZ_1K - 1, 720 .pa_end = 0x4807e000 + SZ_1K - 1,
722 .flags = ADDR_TYPE_RT 721 .flags = ADDR_TYPE_RT
723 }, 722 },
723 { }
724}; 724};
725 725
726/* l4_core -> timer6 */ 726/* l4_core -> timer6 */
@@ -729,7 +729,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer6 = {
729 .slave = &omap2430_timer6_hwmod, 729 .slave = &omap2430_timer6_hwmod,
730 .clk = "gpt6_ick", 730 .clk = "gpt6_ick",
731 .addr = omap2430_timer6_addrs, 731 .addr = omap2430_timer6_addrs,
732 .addr_cnt = ARRAY_SIZE(omap2430_timer6_addrs),
733 .user = OCP_USER_MPU | OCP_USER_SDMA, 732 .user = OCP_USER_MPU | OCP_USER_SDMA,
734}; 733};
735 734
@@ -771,6 +770,7 @@ static struct omap_hwmod_addr_space omap2430_timer7_addrs[] = {
771 .pa_end = 0x48080000 + SZ_1K - 1, 770 .pa_end = 0x48080000 + SZ_1K - 1,
772 .flags = ADDR_TYPE_RT 771 .flags = ADDR_TYPE_RT
773 }, 772 },
773 { }
774}; 774};
775 775
776/* l4_core -> timer7 */ 776/* l4_core -> timer7 */
@@ -779,7 +779,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer7 = {
779 .slave = &omap2430_timer7_hwmod, 779 .slave = &omap2430_timer7_hwmod,
780 .clk = "gpt7_ick", 780 .clk = "gpt7_ick",
781 .addr = omap2430_timer7_addrs, 781 .addr = omap2430_timer7_addrs,
782 .addr_cnt = ARRAY_SIZE(omap2430_timer7_addrs),
783 .user = OCP_USER_MPU | OCP_USER_SDMA, 782 .user = OCP_USER_MPU | OCP_USER_SDMA,
784}; 783};
785 784
@@ -821,6 +820,7 @@ static struct omap_hwmod_addr_space omap2430_timer8_addrs[] = {
821 .pa_end = 0x48082000 + SZ_1K - 1, 820 .pa_end = 0x48082000 + SZ_1K - 1,
822 .flags = ADDR_TYPE_RT 821 .flags = ADDR_TYPE_RT
823 }, 822 },
823 { }
824}; 824};
825 825
826/* l4_core -> timer8 */ 826/* l4_core -> timer8 */
@@ -829,7 +829,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer8 = {
829 .slave = &omap2430_timer8_hwmod, 829 .slave = &omap2430_timer8_hwmod,
830 .clk = "gpt8_ick", 830 .clk = "gpt8_ick",
831 .addr = omap2430_timer8_addrs, 831 .addr = omap2430_timer8_addrs,
832 .addr_cnt = ARRAY_SIZE(omap2430_timer8_addrs),
833 .user = OCP_USER_MPU | OCP_USER_SDMA, 832 .user = OCP_USER_MPU | OCP_USER_SDMA,
834}; 833};
835 834
@@ -871,6 +870,7 @@ static struct omap_hwmod_addr_space omap2430_timer9_addrs[] = {
871 .pa_end = 0x48084000 + SZ_1K - 1, 870 .pa_end = 0x48084000 + SZ_1K - 1,
872 .flags = ADDR_TYPE_RT 871 .flags = ADDR_TYPE_RT
873 }, 872 },
873 { }
874}; 874};
875 875
876/* l4_core -> timer9 */ 876/* l4_core -> timer9 */
@@ -879,7 +879,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer9 = {
879 .slave = &omap2430_timer9_hwmod, 879 .slave = &omap2430_timer9_hwmod,
880 .clk = "gpt9_ick", 880 .clk = "gpt9_ick",
881 .addr = omap2430_timer9_addrs, 881 .addr = omap2430_timer9_addrs,
882 .addr_cnt = ARRAY_SIZE(omap2430_timer9_addrs),
883 .user = OCP_USER_MPU | OCP_USER_SDMA, 882 .user = OCP_USER_MPU | OCP_USER_SDMA,
884}; 883};
885 884
@@ -921,6 +920,7 @@ static struct omap_hwmod_addr_space omap2430_timer10_addrs[] = {
921 .pa_end = 0x48086000 + SZ_1K - 1, 920 .pa_end = 0x48086000 + SZ_1K - 1,
922 .flags = ADDR_TYPE_RT 921 .flags = ADDR_TYPE_RT
923 }, 922 },
923 { }
924}; 924};
925 925
926/* l4_core -> timer10 */ 926/* l4_core -> timer10 */
@@ -929,7 +929,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer10 = {
929 .slave = &omap2430_timer10_hwmod, 929 .slave = &omap2430_timer10_hwmod,
930 .clk = "gpt10_ick", 930 .clk = "gpt10_ick",
931 .addr = omap2430_timer10_addrs, 931 .addr = omap2430_timer10_addrs,
932 .addr_cnt = ARRAY_SIZE(omap2430_timer10_addrs),
933 .user = OCP_USER_MPU | OCP_USER_SDMA, 932 .user = OCP_USER_MPU | OCP_USER_SDMA,
934}; 933};
935 934
@@ -971,6 +970,7 @@ static struct omap_hwmod_addr_space omap2430_timer11_addrs[] = {
971 .pa_end = 0x48088000 + SZ_1K - 1, 970 .pa_end = 0x48088000 + SZ_1K - 1,
972 .flags = ADDR_TYPE_RT 971 .flags = ADDR_TYPE_RT
973 }, 972 },
973 { }
974}; 974};
975 975
976/* l4_core -> timer11 */ 976/* l4_core -> timer11 */
@@ -979,7 +979,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer11 = {
979 .slave = &omap2430_timer11_hwmod, 979 .slave = &omap2430_timer11_hwmod,
980 .clk = "gpt11_ick", 980 .clk = "gpt11_ick",
981 .addr = omap2430_timer11_addrs, 981 .addr = omap2430_timer11_addrs,
982 .addr_cnt = ARRAY_SIZE(omap2430_timer11_addrs),
983 .user = OCP_USER_MPU | OCP_USER_SDMA, 982 .user = OCP_USER_MPU | OCP_USER_SDMA,
984}; 983};
985 984
@@ -1021,6 +1020,7 @@ static struct omap_hwmod_addr_space omap2430_timer12_addrs[] = {
1021 .pa_end = 0x4808a000 + SZ_1K - 1, 1020 .pa_end = 0x4808a000 + SZ_1K - 1,
1022 .flags = ADDR_TYPE_RT 1021 .flags = ADDR_TYPE_RT
1023 }, 1022 },
1023 { }
1024}; 1024};
1025 1025
1026/* l4_core -> timer12 */ 1026/* l4_core -> timer12 */
@@ -1029,7 +1029,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer12 = {
1029 .slave = &omap2430_timer12_hwmod, 1029 .slave = &omap2430_timer12_hwmod,
1030 .clk = "gpt12_ick", 1030 .clk = "gpt12_ick",
1031 .addr = omap2430_timer12_addrs, 1031 .addr = omap2430_timer12_addrs,
1032 .addr_cnt = ARRAY_SIZE(omap2430_timer12_addrs),
1033 .user = OCP_USER_MPU | OCP_USER_SDMA, 1032 .user = OCP_USER_MPU | OCP_USER_SDMA,
1034}; 1033};
1035 1034
@@ -1066,6 +1065,7 @@ static struct omap_hwmod_addr_space omap2430_wd_timer2_addrs[] = {
1066 .pa_end = 0x4901607f, 1065 .pa_end = 0x4901607f,
1067 .flags = ADDR_TYPE_RT 1066 .flags = ADDR_TYPE_RT
1068 }, 1067 },
1068 { }
1069}; 1069};
1070 1070
1071static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = { 1071static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = {
@@ -1073,7 +1073,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = {
1073 .slave = &omap2430_wd_timer2_hwmod, 1073 .slave = &omap2430_wd_timer2_hwmod,
1074 .clk = "mpu_wdt_ick", 1074 .clk = "mpu_wdt_ick",
1075 .addr = omap2430_wd_timer2_addrs, 1075 .addr = omap2430_wd_timer2_addrs,
1076 .addr_cnt = ARRAY_SIZE(omap2430_wd_timer2_addrs),
1077 .user = OCP_USER_MPU | OCP_USER_SDMA, 1076 .user = OCP_USER_MPU | OCP_USER_SDMA,
1078}; 1077};
1079 1078
@@ -1284,6 +1283,7 @@ static struct omap_hwmod_addr_space omap2430_dss_addrs[] = {
1284 .pa_end = 0x480503FF, 1283 .pa_end = 0x480503FF,
1285 .flags = ADDR_TYPE_RT 1284 .flags = ADDR_TYPE_RT
1286 }, 1285 },
1286 { }
1287}; 1287};
1288 1288
1289/* l4_core -> dss */ 1289/* l4_core -> dss */
@@ -1292,7 +1292,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss = {
1292 .slave = &omap2430_dss_core_hwmod, 1292 .slave = &omap2430_dss_core_hwmod,
1293 .clk = "dss_ick", 1293 .clk = "dss_ick",
1294 .addr = omap2430_dss_addrs, 1294 .addr = omap2430_dss_addrs,
1295 .addr_cnt = ARRAY_SIZE(omap2430_dss_addrs),
1296 .user = OCP_USER_MPU | OCP_USER_SDMA, 1295 .user = OCP_USER_MPU | OCP_USER_SDMA,
1297}; 1296};
1298 1297
@@ -1362,6 +1361,7 @@ static struct omap_hwmod_addr_space omap2430_dss_dispc_addrs[] = {
1362 .pa_end = 0x480507FF, 1361 .pa_end = 0x480507FF,
1363 .flags = ADDR_TYPE_RT 1362 .flags = ADDR_TYPE_RT
1364 }, 1363 },
1364 { }
1365}; 1365};
1366 1366
1367/* l4_core -> dss_dispc */ 1367/* l4_core -> dss_dispc */
@@ -1370,7 +1370,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_dispc = {
1370 .slave = &omap2430_dss_dispc_hwmod, 1370 .slave = &omap2430_dss_dispc_hwmod,
1371 .clk = "dss_ick", 1371 .clk = "dss_ick",
1372 .addr = omap2430_dss_dispc_addrs, 1372 .addr = omap2430_dss_dispc_addrs,
1373 .addr_cnt = ARRAY_SIZE(omap2430_dss_dispc_addrs),
1374 .user = OCP_USER_MPU | OCP_USER_SDMA, 1373 .user = OCP_USER_MPU | OCP_USER_SDMA,
1375}; 1374};
1376 1375
@@ -1426,6 +1425,7 @@ static struct omap_hwmod_addr_space omap2430_dss_rfbi_addrs[] = {
1426 .pa_end = 0x48050BFF, 1425 .pa_end = 0x48050BFF,
1427 .flags = ADDR_TYPE_RT 1426 .flags = ADDR_TYPE_RT
1428 }, 1427 },
1428 { }
1429}; 1429};
1430 1430
1431/* l4_core -> dss_rfbi */ 1431/* l4_core -> dss_rfbi */
@@ -1434,7 +1434,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_rfbi = {
1434 .slave = &omap2430_dss_rfbi_hwmod, 1434 .slave = &omap2430_dss_rfbi_hwmod,
1435 .clk = "dss_ick", 1435 .clk = "dss_ick",
1436 .addr = omap2430_dss_rfbi_addrs, 1436 .addr = omap2430_dss_rfbi_addrs,
1437 .addr_cnt = ARRAY_SIZE(omap2430_dss_rfbi_addrs),
1438 .user = OCP_USER_MPU | OCP_USER_SDMA, 1437 .user = OCP_USER_MPU | OCP_USER_SDMA,
1439}; 1438};
1440 1439
@@ -1476,6 +1475,7 @@ static struct omap_hwmod_addr_space omap2430_dss_venc_addrs[] = {
1476 .pa_end = 0x48050FFF, 1475 .pa_end = 0x48050FFF,
1477 .flags = ADDR_TYPE_RT 1476 .flags = ADDR_TYPE_RT
1478 }, 1477 },
1478 { }
1479}; 1479};
1480 1480
1481/* l4_core -> dss_venc */ 1481/* l4_core -> dss_venc */
@@ -1484,7 +1484,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_venc = {
1484 .slave = &omap2430_dss_venc_hwmod, 1484 .slave = &omap2430_dss_venc_hwmod,
1485 .clk = "dss_54m_fck", 1485 .clk = "dss_54m_fck",
1486 .addr = omap2430_dss_venc_addrs, 1486 .addr = omap2430_dss_venc_addrs,
1487 .addr_cnt = ARRAY_SIZE(omap2430_dss_venc_addrs),
1488 .flags = OCPIF_SWSUP_IDLE, 1487 .flags = OCPIF_SWSUP_IDLE,
1489 .user = OCP_USER_MPU | OCP_USER_SDMA, 1488 .user = OCP_USER_MPU | OCP_USER_SDMA,
1490}; 1489};
@@ -1621,6 +1620,7 @@ static struct omap_hwmod_addr_space omap2430_gpio1_addr_space[] = {
1621 .pa_end = 0x4900C1ff, 1620 .pa_end = 0x4900C1ff,
1622 .flags = ADDR_TYPE_RT 1621 .flags = ADDR_TYPE_RT
1623 }, 1622 },
1623 { }
1624}; 1624};
1625 1625
1626static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = { 1626static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = {
@@ -1628,7 +1628,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = {
1628 .slave = &omap2430_gpio1_hwmod, 1628 .slave = &omap2430_gpio1_hwmod,
1629 .clk = "gpios_ick", 1629 .clk = "gpios_ick",
1630 .addr = omap2430_gpio1_addr_space, 1630 .addr = omap2430_gpio1_addr_space,
1631 .addr_cnt = ARRAY_SIZE(omap2430_gpio1_addr_space),
1632 .user = OCP_USER_MPU | OCP_USER_SDMA, 1631 .user = OCP_USER_MPU | OCP_USER_SDMA,
1633}; 1632};
1634 1633
@@ -1639,6 +1638,7 @@ static struct omap_hwmod_addr_space omap2430_gpio2_addr_space[] = {
1639 .pa_end = 0x4900E1ff, 1638 .pa_end = 0x4900E1ff,
1640 .flags = ADDR_TYPE_RT 1639 .flags = ADDR_TYPE_RT
1641 }, 1640 },
1641 { }
1642}; 1642};
1643 1643
1644static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = { 1644static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = {
@@ -1646,7 +1646,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = {
1646 .slave = &omap2430_gpio2_hwmod, 1646 .slave = &omap2430_gpio2_hwmod,
1647 .clk = "gpios_ick", 1647 .clk = "gpios_ick",
1648 .addr = omap2430_gpio2_addr_space, 1648 .addr = omap2430_gpio2_addr_space,
1649 .addr_cnt = ARRAY_SIZE(omap2430_gpio2_addr_space),
1650 .user = OCP_USER_MPU | OCP_USER_SDMA, 1649 .user = OCP_USER_MPU | OCP_USER_SDMA,
1651}; 1650};
1652 1651
@@ -1657,6 +1656,7 @@ static struct omap_hwmod_addr_space omap2430_gpio3_addr_space[] = {
1657 .pa_end = 0x490101ff, 1656 .pa_end = 0x490101ff,
1658 .flags = ADDR_TYPE_RT 1657 .flags = ADDR_TYPE_RT
1659 }, 1658 },
1659 { }
1660}; 1660};
1661 1661
1662static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = { 1662static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = {
@@ -1664,7 +1664,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = {
1664 .slave = &omap2430_gpio3_hwmod, 1664 .slave = &omap2430_gpio3_hwmod,
1665 .clk = "gpios_ick", 1665 .clk = "gpios_ick",
1666 .addr = omap2430_gpio3_addr_space, 1666 .addr = omap2430_gpio3_addr_space,
1667 .addr_cnt = ARRAY_SIZE(omap2430_gpio3_addr_space),
1668 .user = OCP_USER_MPU | OCP_USER_SDMA, 1667 .user = OCP_USER_MPU | OCP_USER_SDMA,
1669}; 1668};
1670 1669
@@ -1675,6 +1674,7 @@ static struct omap_hwmod_addr_space omap2430_gpio4_addr_space[] = {
1675 .pa_end = 0x490121ff, 1674 .pa_end = 0x490121ff,
1676 .flags = ADDR_TYPE_RT 1675 .flags = ADDR_TYPE_RT
1677 }, 1676 },
1677 { }
1678}; 1678};
1679 1679
1680static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = { 1680static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = {
@@ -1682,7 +1682,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = {
1682 .slave = &omap2430_gpio4_hwmod, 1682 .slave = &omap2430_gpio4_hwmod,
1683 .clk = "gpios_ick", 1683 .clk = "gpios_ick",
1684 .addr = omap2430_gpio4_addr_space, 1684 .addr = omap2430_gpio4_addr_space,
1685 .addr_cnt = ARRAY_SIZE(omap2430_gpio4_addr_space),
1686 .user = OCP_USER_MPU | OCP_USER_SDMA, 1685 .user = OCP_USER_MPU | OCP_USER_SDMA,
1687}; 1686};
1688 1687
@@ -1693,6 +1692,7 @@ static struct omap_hwmod_addr_space omap2430_gpio5_addr_space[] = {
1693 .pa_end = 0x480B61ff, 1692 .pa_end = 0x480B61ff,
1694 .flags = ADDR_TYPE_RT 1693 .flags = ADDR_TYPE_RT
1695 }, 1694 },
1695 { }
1696}; 1696};
1697 1697
1698static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = { 1698static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = {
@@ -1700,7 +1700,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = {
1700 .slave = &omap2430_gpio5_hwmod, 1700 .slave = &omap2430_gpio5_hwmod,
1701 .clk = "gpio5_ick", 1701 .clk = "gpio5_ick",
1702 .addr = omap2430_gpio5_addr_space, 1702 .addr = omap2430_gpio5_addr_space,
1703 .addr_cnt = ARRAY_SIZE(omap2430_gpio5_addr_space),
1704 .user = OCP_USER_MPU | OCP_USER_SDMA, 1703 .user = OCP_USER_MPU | OCP_USER_SDMA,
1705}; 1704};
1706 1705
@@ -1923,6 +1922,7 @@ static struct omap_hwmod_addr_space omap2430_dma_system_addrs[] = {
1923 .pa_end = 0x48056fff, 1922 .pa_end = 0x48056fff,
1924 .flags = ADDR_TYPE_RT 1923 .flags = ADDR_TYPE_RT
1925 }, 1924 },
1925 { }
1926}; 1926};
1927 1927
1928/* dma_system -> L3 */ 1928/* dma_system -> L3 */
@@ -1944,7 +1944,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = {
1944 .slave = &omap2430_dma_system_hwmod, 1944 .slave = &omap2430_dma_system_hwmod,
1945 .clk = "sdma_ick", 1945 .clk = "sdma_ick",
1946 .addr = omap2430_dma_system_addrs, 1946 .addr = omap2430_dma_system_addrs,
1947 .addr_cnt = ARRAY_SIZE(omap2430_dma_system_addrs),
1948 .user = OCP_USER_MPU | OCP_USER_SDMA, 1947 .user = OCP_USER_MPU | OCP_USER_SDMA,
1949}; 1948};
1950 1949
@@ -2001,6 +2000,7 @@ static struct omap_hwmod_addr_space omap2430_mailbox_addrs[] = {
2001 .pa_end = 0x480941ff, 2000 .pa_end = 0x480941ff,
2002 .flags = ADDR_TYPE_RT, 2001 .flags = ADDR_TYPE_RT,
2003 }, 2002 },
2003 { }
2004}; 2004};
2005 2005
2006/* l4_core -> mailbox */ 2006/* l4_core -> mailbox */
@@ -2008,7 +2008,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mailbox = {
2008 .master = &omap2430_l4_core_hwmod, 2008 .master = &omap2430_l4_core_hwmod,
2009 .slave = &omap2430_mailbox_hwmod, 2009 .slave = &omap2430_mailbox_hwmod,
2010 .addr = omap2430_mailbox_addrs, 2010 .addr = omap2430_mailbox_addrs,
2011 .addr_cnt = ARRAY_SIZE(omap2430_mailbox_addrs),
2012 .user = OCP_USER_MPU | OCP_USER_SDMA, 2011 .user = OCP_USER_MPU | OCP_USER_SDMA,
2013}; 2012};
2014 2013
@@ -2287,6 +2286,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp1_addrs[] = {
2287 .pa_end = 0x480740ff, 2286 .pa_end = 0x480740ff,
2288 .flags = ADDR_TYPE_RT 2287 .flags = ADDR_TYPE_RT
2289 }, 2288 },
2289 { }
2290}; 2290};
2291 2291
2292/* l4_core -> mcbsp1 */ 2292/* l4_core -> mcbsp1 */
@@ -2295,7 +2295,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp1 = {
2295 .slave = &omap2430_mcbsp1_hwmod, 2295 .slave = &omap2430_mcbsp1_hwmod,
2296 .clk = "mcbsp1_ick", 2296 .clk = "mcbsp1_ick",
2297 .addr = omap2430_mcbsp1_addrs, 2297 .addr = omap2430_mcbsp1_addrs,
2298 .addr_cnt = ARRAY_SIZE(omap2430_mcbsp1_addrs),
2299 .user = OCP_USER_MPU | OCP_USER_SDMA, 2298 .user = OCP_USER_MPU | OCP_USER_SDMA,
2300}; 2299};
2301 2300
@@ -2345,6 +2344,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp2_addrs[] = {
2345 .pa_end = 0x480760ff, 2344 .pa_end = 0x480760ff,
2346 .flags = ADDR_TYPE_RT 2345 .flags = ADDR_TYPE_RT
2347 }, 2346 },
2347 { }
2348}; 2348};
2349 2349
2350/* l4_core -> mcbsp2 */ 2350/* l4_core -> mcbsp2 */
@@ -2353,7 +2353,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp2 = {
2353 .slave = &omap2430_mcbsp2_hwmod, 2353 .slave = &omap2430_mcbsp2_hwmod,
2354 .clk = "mcbsp2_ick", 2354 .clk = "mcbsp2_ick",
2355 .addr = omap2430_mcbsp2_addrs, 2355 .addr = omap2430_mcbsp2_addrs,
2356 .addr_cnt = ARRAY_SIZE(omap2430_mcbsp2_addrs),
2357 .user = OCP_USER_MPU | OCP_USER_SDMA, 2356 .user = OCP_USER_MPU | OCP_USER_SDMA,
2358}; 2357};
2359 2358
@@ -2403,6 +2402,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp3_addrs[] = {
2403 .pa_end = 0x4808C0ff, 2402 .pa_end = 0x4808C0ff,
2404 .flags = ADDR_TYPE_RT 2403 .flags = ADDR_TYPE_RT
2405 }, 2404 },
2405 { }
2406}; 2406};
2407 2407
2408/* l4_core -> mcbsp3 */ 2408/* l4_core -> mcbsp3 */
@@ -2411,7 +2411,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp3 = {
2411 .slave = &omap2430_mcbsp3_hwmod, 2411 .slave = &omap2430_mcbsp3_hwmod,
2412 .clk = "mcbsp3_ick", 2412 .clk = "mcbsp3_ick",
2413 .addr = omap2430_mcbsp3_addrs, 2413 .addr = omap2430_mcbsp3_addrs,
2414 .addr_cnt = ARRAY_SIZE(omap2430_mcbsp3_addrs),
2415 .user = OCP_USER_MPU | OCP_USER_SDMA, 2414 .user = OCP_USER_MPU | OCP_USER_SDMA,
2416}; 2415};
2417 2416
@@ -2461,6 +2460,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp4_addrs[] = {
2461 .pa_end = 0x4808E0ff, 2460 .pa_end = 0x4808E0ff,
2462 .flags = ADDR_TYPE_RT 2461 .flags = ADDR_TYPE_RT
2463 }, 2462 },
2463 { }
2464}; 2464};
2465 2465
2466/* l4_core -> mcbsp4 */ 2466/* l4_core -> mcbsp4 */
@@ -2469,7 +2469,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp4 = {
2469 .slave = &omap2430_mcbsp4_hwmod, 2469 .slave = &omap2430_mcbsp4_hwmod,
2470 .clk = "mcbsp4_ick", 2470 .clk = "mcbsp4_ick",
2471 .addr = omap2430_mcbsp4_addrs, 2471 .addr = omap2430_mcbsp4_addrs,
2472 .addr_cnt = ARRAY_SIZE(omap2430_mcbsp4_addrs),
2473 .user = OCP_USER_MPU | OCP_USER_SDMA, 2472 .user = OCP_USER_MPU | OCP_USER_SDMA,
2474}; 2473};
2475 2474
@@ -2519,6 +2518,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp5_addrs[] = {
2519 .pa_end = 0x480960ff, 2518 .pa_end = 0x480960ff,
2520 .flags = ADDR_TYPE_RT 2519 .flags = ADDR_TYPE_RT
2521 }, 2520 },
2521 { }
2522}; 2522};
2523 2523
2524/* l4_core -> mcbsp5 */ 2524/* l4_core -> mcbsp5 */
@@ -2527,7 +2527,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp5 = {
2527 .slave = &omap2430_mcbsp5_hwmod, 2527 .slave = &omap2430_mcbsp5_hwmod,
2528 .clk = "mcbsp5_ick", 2528 .clk = "mcbsp5_ick",
2529 .addr = omap2430_mcbsp5_addrs, 2529 .addr = omap2430_mcbsp5_addrs,
2530 .addr_cnt = ARRAY_SIZE(omap2430_mcbsp5_addrs),
2531 .user = OCP_USER_MPU | OCP_USER_SDMA, 2530 .user = OCP_USER_MPU | OCP_USER_SDMA,
2532}; 2531};
2533 2532
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 909a84de6682..64107795f1ae 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * omap_hwmod_3xxx_data.c - hardware modules present on the OMAP3xxx chips 2 * omap_hwmod_3xxx_data.c - hardware modules present on the OMAP3xxx chips
3 * 3 *
4 * Copyright (C) 2009-2010 Nokia Corporation 4 * Copyright (C) 2009-2011 Nokia Corporation
5 * Paul Walmsley 5 * Paul Walmsley
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
@@ -111,6 +111,7 @@ static struct omap_hwmod_addr_space omap3xxx_l3_main_addrs[] = {
111 .pa_end = 0x6800ffff, 111 .pa_end = 0x6800ffff,
112 .flags = ADDR_TYPE_RT, 112 .flags = ADDR_TYPE_RT,
113 }, 113 },
114 { }
114}; 115};
115 116
116/* MPU -> L3 interface */ 117/* MPU -> L3 interface */
@@ -118,7 +119,6 @@ static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = {
118 .master = &omap3xxx_mpu_hwmod, 119 .master = &omap3xxx_mpu_hwmod,
119 .slave = &omap3xxx_l3_main_hwmod, 120 .slave = &omap3xxx_l3_main_hwmod,
120 .addr = omap3xxx_l3_main_addrs, 121 .addr = omap3xxx_l3_main_addrs,
121 .addr_cnt = ARRAY_SIZE(omap3xxx_l3_main_addrs),
122 .user = OCP_USER_MPU, 122 .user = OCP_USER_MPU,
123}; 123};
124 124
@@ -196,6 +196,7 @@ static struct omap_hwmod_addr_space omap3xxx_mmc1_addr_space[] = {
196 .pa_end = 0x4809c1ff, 196 .pa_end = 0x4809c1ff,
197 .flags = ADDR_TYPE_RT, 197 .flags = ADDR_TYPE_RT,
198 }, 198 },
199 { }
199}; 200};
200 201
201static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc1 = { 202static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc1 = {
@@ -203,7 +204,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc1 = {
203 .slave = &omap3xxx_mmc1_hwmod, 204 .slave = &omap3xxx_mmc1_hwmod,
204 .clk = "mmchs1_ick", 205 .clk = "mmchs1_ick",
205 .addr = omap3xxx_mmc1_addr_space, 206 .addr = omap3xxx_mmc1_addr_space,
206 .addr_cnt = ARRAY_SIZE(omap3xxx_mmc1_addr_space),
207 .user = OCP_USER_MPU | OCP_USER_SDMA, 207 .user = OCP_USER_MPU | OCP_USER_SDMA,
208 .flags = OMAP_FIREWALL_L4 208 .flags = OMAP_FIREWALL_L4
209}; 209};
@@ -215,6 +215,7 @@ static struct omap_hwmod_addr_space omap3xxx_mmc2_addr_space[] = {
215 .pa_end = 0x480b41ff, 215 .pa_end = 0x480b41ff,
216 .flags = ADDR_TYPE_RT, 216 .flags = ADDR_TYPE_RT,
217 }, 217 },
218 { }
218}; 219};
219 220
220static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc2 = { 221static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc2 = {
@@ -222,7 +223,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc2 = {
222 .slave = &omap3xxx_mmc2_hwmod, 223 .slave = &omap3xxx_mmc2_hwmod,
223 .clk = "mmchs2_ick", 224 .clk = "mmchs2_ick",
224 .addr = omap3xxx_mmc2_addr_space, 225 .addr = omap3xxx_mmc2_addr_space,
225 .addr_cnt = ARRAY_SIZE(omap3xxx_mmc2_addr_space),
226 .user = OCP_USER_MPU | OCP_USER_SDMA, 226 .user = OCP_USER_MPU | OCP_USER_SDMA,
227 .flags = OMAP_FIREWALL_L4 227 .flags = OMAP_FIREWALL_L4
228}; 228};
@@ -234,6 +234,7 @@ static struct omap_hwmod_addr_space omap3xxx_mmc3_addr_space[] = {
234 .pa_end = 0x480ad1ff, 234 .pa_end = 0x480ad1ff,
235 .flags = ADDR_TYPE_RT, 235 .flags = ADDR_TYPE_RT,
236 }, 236 },
237 { }
237}; 238};
238 239
239static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc3 = { 240static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc3 = {
@@ -241,7 +242,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc3 = {
241 .slave = &omap3xxx_mmc3_hwmod, 242 .slave = &omap3xxx_mmc3_hwmod,
242 .clk = "mmchs3_ick", 243 .clk = "mmchs3_ick",
243 .addr = omap3xxx_mmc3_addr_space, 244 .addr = omap3xxx_mmc3_addr_space,
244 .addr_cnt = ARRAY_SIZE(omap3xxx_mmc3_addr_space),
245 .user = OCP_USER_MPU | OCP_USER_SDMA, 245 .user = OCP_USER_MPU | OCP_USER_SDMA,
246 .flags = OMAP_FIREWALL_L4 246 .flags = OMAP_FIREWALL_L4
247}; 247};
@@ -253,6 +253,7 @@ static struct omap_hwmod_addr_space omap3xxx_uart1_addr_space[] = {
253 .pa_end = OMAP3_UART1_BASE + SZ_8K - 1, 253 .pa_end = OMAP3_UART1_BASE + SZ_8K - 1,
254 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 254 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
255 }, 255 },
256 { }
256}; 257};
257 258
258static struct omap_hwmod_ocp_if omap3_l4_core__uart1 = { 259static struct omap_hwmod_ocp_if omap3_l4_core__uart1 = {
@@ -260,7 +261,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__uart1 = {
260 .slave = &omap3xxx_uart1_hwmod, 261 .slave = &omap3xxx_uart1_hwmod,
261 .clk = "uart1_ick", 262 .clk = "uart1_ick",
262 .addr = omap3xxx_uart1_addr_space, 263 .addr = omap3xxx_uart1_addr_space,
263 .addr_cnt = ARRAY_SIZE(omap3xxx_uart1_addr_space),
264 .user = OCP_USER_MPU | OCP_USER_SDMA, 264 .user = OCP_USER_MPU | OCP_USER_SDMA,
265}; 265};
266 266
@@ -271,6 +271,7 @@ static struct omap_hwmod_addr_space omap3xxx_uart2_addr_space[] = {
271 .pa_end = OMAP3_UART2_BASE + SZ_1K - 1, 271 .pa_end = OMAP3_UART2_BASE + SZ_1K - 1,
272 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 272 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
273 }, 273 },
274 { }
274}; 275};
275 276
276static struct omap_hwmod_ocp_if omap3_l4_core__uart2 = { 277static struct omap_hwmod_ocp_if omap3_l4_core__uart2 = {
@@ -278,7 +279,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__uart2 = {
278 .slave = &omap3xxx_uart2_hwmod, 279 .slave = &omap3xxx_uart2_hwmod,
279 .clk = "uart2_ick", 280 .clk = "uart2_ick",
280 .addr = omap3xxx_uart2_addr_space, 281 .addr = omap3xxx_uart2_addr_space,
281 .addr_cnt = ARRAY_SIZE(omap3xxx_uart2_addr_space),
282 .user = OCP_USER_MPU | OCP_USER_SDMA, 282 .user = OCP_USER_MPU | OCP_USER_SDMA,
283}; 283};
284 284
@@ -289,6 +289,7 @@ static struct omap_hwmod_addr_space omap3xxx_uart3_addr_space[] = {
289 .pa_end = OMAP3_UART3_BASE + SZ_1K - 1, 289 .pa_end = OMAP3_UART3_BASE + SZ_1K - 1,
290 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 290 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
291 }, 291 },
292 { }
292}; 293};
293 294
294static struct omap_hwmod_ocp_if omap3_l4_per__uart3 = { 295static struct omap_hwmod_ocp_if omap3_l4_per__uart3 = {
@@ -296,7 +297,6 @@ static struct omap_hwmod_ocp_if omap3_l4_per__uart3 = {
296 .slave = &omap3xxx_uart3_hwmod, 297 .slave = &omap3xxx_uart3_hwmod,
297 .clk = "uart3_ick", 298 .clk = "uart3_ick",
298 .addr = omap3xxx_uart3_addr_space, 299 .addr = omap3xxx_uart3_addr_space,
299 .addr_cnt = ARRAY_SIZE(omap3xxx_uart3_addr_space),
300 .user = OCP_USER_MPU | OCP_USER_SDMA, 300 .user = OCP_USER_MPU | OCP_USER_SDMA,
301}; 301};
302 302
@@ -307,6 +307,7 @@ static struct omap_hwmod_addr_space omap3xxx_uart4_addr_space[] = {
307 .pa_end = OMAP3_UART4_BASE + SZ_1K - 1, 307 .pa_end = OMAP3_UART4_BASE + SZ_1K - 1,
308 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, 308 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
309 }, 309 },
310 { }
310}; 311};
311 312
312static struct omap_hwmod_ocp_if omap3_l4_per__uart4 = { 313static struct omap_hwmod_ocp_if omap3_l4_per__uart4 = {
@@ -314,7 +315,6 @@ static struct omap_hwmod_ocp_if omap3_l4_per__uart4 = {
314 .slave = &omap3xxx_uart4_hwmod, 315 .slave = &omap3xxx_uart4_hwmod,
315 .clk = "uart4_ick", 316 .clk = "uart4_ick",
316 .addr = omap3xxx_uart4_addr_space, 317 .addr = omap3xxx_uart4_addr_space,
317 .addr_cnt = ARRAY_SIZE(omap3xxx_uart4_addr_space),
318 .user = OCP_USER_MPU | OCP_USER_SDMA, 318 .user = OCP_USER_MPU | OCP_USER_SDMA,
319}; 319};
320 320
@@ -328,6 +328,7 @@ static struct omap_hwmod_addr_space omap3xxx_i2c1_addr_space[] = {
328 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1, 328 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1,
329 .flags = ADDR_TYPE_RT, 329 .flags = ADDR_TYPE_RT,
330 }, 330 },
331 { }
331}; 332};
332 333
333static struct omap_hwmod_ocp_if omap3_l4_core__i2c1 = { 334static struct omap_hwmod_ocp_if omap3_l4_core__i2c1 = {
@@ -335,7 +336,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c1 = {
335 .slave = &omap3xxx_i2c1_hwmod, 336 .slave = &omap3xxx_i2c1_hwmod,
336 .clk = "i2c1_ick", 337 .clk = "i2c1_ick",
337 .addr = omap3xxx_i2c1_addr_space, 338 .addr = omap3xxx_i2c1_addr_space,
338 .addr_cnt = ARRAY_SIZE(omap3xxx_i2c1_addr_space),
339 .fw = { 339 .fw = {
340 .omap2 = { 340 .omap2 = {
341 .l4_fw_region = OMAP3_L4_CORE_FW_I2C1_REGION, 341 .l4_fw_region = OMAP3_L4_CORE_FW_I2C1_REGION,
@@ -353,6 +353,7 @@ static struct omap_hwmod_addr_space omap3xxx_i2c2_addr_space[] = {
353 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1, 353 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1,
354 .flags = ADDR_TYPE_RT, 354 .flags = ADDR_TYPE_RT,
355 }, 355 },
356 { }
356}; 357};
357 358
358static struct omap_hwmod_ocp_if omap3_l4_core__i2c2 = { 359static struct omap_hwmod_ocp_if omap3_l4_core__i2c2 = {
@@ -360,7 +361,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c2 = {
360 .slave = &omap3xxx_i2c2_hwmod, 361 .slave = &omap3xxx_i2c2_hwmod,
361 .clk = "i2c2_ick", 362 .clk = "i2c2_ick",
362 .addr = omap3xxx_i2c2_addr_space, 363 .addr = omap3xxx_i2c2_addr_space,
363 .addr_cnt = ARRAY_SIZE(omap3xxx_i2c2_addr_space),
364 .fw = { 364 .fw = {
365 .omap2 = { 365 .omap2 = {
366 .l4_fw_region = OMAP3_L4_CORE_FW_I2C2_REGION, 366 .l4_fw_region = OMAP3_L4_CORE_FW_I2C2_REGION,
@@ -378,6 +378,7 @@ static struct omap_hwmod_addr_space omap3xxx_i2c3_addr_space[] = {
378 .pa_end = 0x48060000 + OMAP2_I2C_AS_LEN - 1, 378 .pa_end = 0x48060000 + OMAP2_I2C_AS_LEN - 1,
379 .flags = ADDR_TYPE_RT, 379 .flags = ADDR_TYPE_RT,
380 }, 380 },
381 { }
381}; 382};
382 383
383static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = { 384static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = {
@@ -385,7 +386,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = {
385 .slave = &omap3xxx_i2c3_hwmod, 386 .slave = &omap3xxx_i2c3_hwmod,
386 .clk = "i2c3_ick", 387 .clk = "i2c3_ick",
387 .addr = omap3xxx_i2c3_addr_space, 388 .addr = omap3xxx_i2c3_addr_space,
388 .addr_cnt = ARRAY_SIZE(omap3xxx_i2c3_addr_space),
389 .fw = { 389 .fw = {
390 .omap2 = { 390 .omap2 = {
391 .l4_fw_region = OMAP3_L4_CORE_FW_I2C3_REGION, 391 .l4_fw_region = OMAP3_L4_CORE_FW_I2C3_REGION,
@@ -403,6 +403,7 @@ static struct omap_hwmod_addr_space omap3_sr1_addr_space[] = {
403 .pa_end = OMAP34XX_SR1_BASE + SZ_1K - 1, 403 .pa_end = OMAP34XX_SR1_BASE + SZ_1K - 1,
404 .flags = ADDR_TYPE_RT, 404 .flags = ADDR_TYPE_RT,
405 }, 405 },
406 { }
406}; 407};
407 408
408static struct omap_hwmod_ocp_if omap3_l4_core__sr1 = { 409static struct omap_hwmod_ocp_if omap3_l4_core__sr1 = {
@@ -410,7 +411,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__sr1 = {
410 .slave = &omap34xx_sr1_hwmod, 411 .slave = &omap34xx_sr1_hwmod,
411 .clk = "sr_l4_ick", 412 .clk = "sr_l4_ick",
412 .addr = omap3_sr1_addr_space, 413 .addr = omap3_sr1_addr_space,
413 .addr_cnt = ARRAY_SIZE(omap3_sr1_addr_space),
414 .user = OCP_USER_MPU, 414 .user = OCP_USER_MPU,
415}; 415};
416 416
@@ -421,6 +421,7 @@ static struct omap_hwmod_addr_space omap3_sr2_addr_space[] = {
421 .pa_end = OMAP34XX_SR2_BASE + SZ_1K - 1, 421 .pa_end = OMAP34XX_SR2_BASE + SZ_1K - 1,
422 .flags = ADDR_TYPE_RT, 422 .flags = ADDR_TYPE_RT,
423 }, 423 },
424 { }
424}; 425};
425 426
426static struct omap_hwmod_ocp_if omap3_l4_core__sr2 = { 427static struct omap_hwmod_ocp_if omap3_l4_core__sr2 = {
@@ -428,7 +429,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__sr2 = {
428 .slave = &omap34xx_sr2_hwmod, 429 .slave = &omap34xx_sr2_hwmod,
429 .clk = "sr_l4_ick", 430 .clk = "sr_l4_ick",
430 .addr = omap3_sr2_addr_space, 431 .addr = omap3_sr2_addr_space,
431 .addr_cnt = ARRAY_SIZE(omap3_sr2_addr_space),
432 .user = OCP_USER_MPU, 432 .user = OCP_USER_MPU,
433}; 433};
434 434
@@ -442,6 +442,7 @@ static struct omap_hwmod_addr_space omap3xxx_usbhsotg_addrs[] = {
442 .pa_end = OMAP34XX_HSUSB_OTG_BASE + SZ_4K - 1, 442 .pa_end = OMAP34XX_HSUSB_OTG_BASE + SZ_4K - 1,
443 .flags = ADDR_TYPE_RT 443 .flags = ADDR_TYPE_RT
444 }, 444 },
445 { }
445}; 446};
446 447
447/* l4_core -> usbhsotg */ 448/* l4_core -> usbhsotg */
@@ -450,7 +451,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__usbhsotg = {
450 .slave = &omap3xxx_usbhsotg_hwmod, 451 .slave = &omap3xxx_usbhsotg_hwmod,
451 .clk = "l4_ick", 452 .clk = "l4_ick",
452 .addr = omap3xxx_usbhsotg_addrs, 453 .addr = omap3xxx_usbhsotg_addrs,
453 .addr_cnt = ARRAY_SIZE(omap3xxx_usbhsotg_addrs),
454 .user = OCP_USER_MPU, 454 .user = OCP_USER_MPU,
455}; 455};
456 456
@@ -468,6 +468,7 @@ static struct omap_hwmod_addr_space am35xx_usbhsotg_addrs[] = {
468 .pa_end = AM35XX_IPSS_USBOTGSS_BASE + SZ_4K - 1, 468 .pa_end = AM35XX_IPSS_USBOTGSS_BASE + SZ_4K - 1,
469 .flags = ADDR_TYPE_RT 469 .flags = ADDR_TYPE_RT
470 }, 470 },
471 { }
471}; 472};
472 473
473/* l4_core -> usbhsotg */ 474/* l4_core -> usbhsotg */
@@ -476,7 +477,6 @@ static struct omap_hwmod_ocp_if am35xx_l4_core__usbhsotg = {
476 .slave = &am35xx_usbhsotg_hwmod, 477 .slave = &am35xx_usbhsotg_hwmod,
477 .clk = "l4_ick", 478 .clk = "l4_ick",
478 .addr = am35xx_usbhsotg_addrs, 479 .addr = am35xx_usbhsotg_addrs,
479 .addr_cnt = ARRAY_SIZE(am35xx_usbhsotg_addrs),
480 .user = OCP_USER_MPU, 480 .user = OCP_USER_MPU,
481}; 481};
482 482
@@ -621,6 +621,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer1_addrs[] = {
621 .pa_end = 0x48318000 + SZ_1K - 1, 621 .pa_end = 0x48318000 + SZ_1K - 1,
622 .flags = ADDR_TYPE_RT 622 .flags = ADDR_TYPE_RT
623 }, 623 },
624 { }
624}; 625};
625 626
626/* l4_wkup -> timer1 */ 627/* l4_wkup -> timer1 */
@@ -629,7 +630,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__timer1 = {
629 .slave = &omap3xxx_timer1_hwmod, 630 .slave = &omap3xxx_timer1_hwmod,
630 .clk = "gpt1_ick", 631 .clk = "gpt1_ick",
631 .addr = omap3xxx_timer1_addrs, 632 .addr = omap3xxx_timer1_addrs,
632 .addr_cnt = ARRAY_SIZE(omap3xxx_timer1_addrs),
633 .user = OCP_USER_MPU | OCP_USER_SDMA, 633 .user = OCP_USER_MPU | OCP_USER_SDMA,
634}; 634};
635 635
@@ -671,6 +671,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer2_addrs[] = {
671 .pa_end = 0x49032000 + SZ_1K - 1, 671 .pa_end = 0x49032000 + SZ_1K - 1,
672 .flags = ADDR_TYPE_RT 672 .flags = ADDR_TYPE_RT
673 }, 673 },
674 { }
674}; 675};
675 676
676/* l4_per -> timer2 */ 677/* l4_per -> timer2 */
@@ -679,7 +680,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer2 = {
679 .slave = &omap3xxx_timer2_hwmod, 680 .slave = &omap3xxx_timer2_hwmod,
680 .clk = "gpt2_ick", 681 .clk = "gpt2_ick",
681 .addr = omap3xxx_timer2_addrs, 682 .addr = omap3xxx_timer2_addrs,
682 .addr_cnt = ARRAY_SIZE(omap3xxx_timer2_addrs),
683 .user = OCP_USER_MPU | OCP_USER_SDMA, 683 .user = OCP_USER_MPU | OCP_USER_SDMA,
684}; 684};
685 685
@@ -721,6 +721,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer3_addrs[] = {
721 .pa_end = 0x49034000 + SZ_1K - 1, 721 .pa_end = 0x49034000 + SZ_1K - 1,
722 .flags = ADDR_TYPE_RT 722 .flags = ADDR_TYPE_RT
723 }, 723 },
724 { }
724}; 725};
725 726
726/* l4_per -> timer3 */ 727/* l4_per -> timer3 */
@@ -729,7 +730,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer3 = {
729 .slave = &omap3xxx_timer3_hwmod, 730 .slave = &omap3xxx_timer3_hwmod,
730 .clk = "gpt3_ick", 731 .clk = "gpt3_ick",
731 .addr = omap3xxx_timer3_addrs, 732 .addr = omap3xxx_timer3_addrs,
732 .addr_cnt = ARRAY_SIZE(omap3xxx_timer3_addrs),
733 .user = OCP_USER_MPU | OCP_USER_SDMA, 733 .user = OCP_USER_MPU | OCP_USER_SDMA,
734}; 734};
735 735
@@ -771,6 +771,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer4_addrs[] = {
771 .pa_end = 0x49036000 + SZ_1K - 1, 771 .pa_end = 0x49036000 + SZ_1K - 1,
772 .flags = ADDR_TYPE_RT 772 .flags = ADDR_TYPE_RT
773 }, 773 },
774 { }
774}; 775};
775 776
776/* l4_per -> timer4 */ 777/* l4_per -> timer4 */
@@ -779,7 +780,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer4 = {
779 .slave = &omap3xxx_timer4_hwmod, 780 .slave = &omap3xxx_timer4_hwmod,
780 .clk = "gpt4_ick", 781 .clk = "gpt4_ick",
781 .addr = omap3xxx_timer4_addrs, 782 .addr = omap3xxx_timer4_addrs,
782 .addr_cnt = ARRAY_SIZE(omap3xxx_timer4_addrs),
783 .user = OCP_USER_MPU | OCP_USER_SDMA, 783 .user = OCP_USER_MPU | OCP_USER_SDMA,
784}; 784};
785 785
@@ -821,6 +821,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer5_addrs[] = {
821 .pa_end = 0x49038000 + SZ_1K - 1, 821 .pa_end = 0x49038000 + SZ_1K - 1,
822 .flags = ADDR_TYPE_RT 822 .flags = ADDR_TYPE_RT
823 }, 823 },
824 { }
824}; 825};
825 826
826/* l4_per -> timer5 */ 827/* l4_per -> timer5 */
@@ -829,7 +830,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer5 = {
829 .slave = &omap3xxx_timer5_hwmod, 830 .slave = &omap3xxx_timer5_hwmod,
830 .clk = "gpt5_ick", 831 .clk = "gpt5_ick",
831 .addr = omap3xxx_timer5_addrs, 832 .addr = omap3xxx_timer5_addrs,
832 .addr_cnt = ARRAY_SIZE(omap3xxx_timer5_addrs),
833 .user = OCP_USER_MPU | OCP_USER_SDMA, 833 .user = OCP_USER_MPU | OCP_USER_SDMA,
834}; 834};
835 835
@@ -871,6 +871,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer6_addrs[] = {
871 .pa_end = 0x4903A000 + SZ_1K - 1, 871 .pa_end = 0x4903A000 + SZ_1K - 1,
872 .flags = ADDR_TYPE_RT 872 .flags = ADDR_TYPE_RT
873 }, 873 },
874 { }
874}; 875};
875 876
876/* l4_per -> timer6 */ 877/* l4_per -> timer6 */
@@ -879,7 +880,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer6 = {
879 .slave = &omap3xxx_timer6_hwmod, 880 .slave = &omap3xxx_timer6_hwmod,
880 .clk = "gpt6_ick", 881 .clk = "gpt6_ick",
881 .addr = omap3xxx_timer6_addrs, 882 .addr = omap3xxx_timer6_addrs,
882 .addr_cnt = ARRAY_SIZE(omap3xxx_timer6_addrs),
883 .user = OCP_USER_MPU | OCP_USER_SDMA, 883 .user = OCP_USER_MPU | OCP_USER_SDMA,
884}; 884};
885 885
@@ -921,6 +921,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer7_addrs[] = {
921 .pa_end = 0x4903C000 + SZ_1K - 1, 921 .pa_end = 0x4903C000 + SZ_1K - 1,
922 .flags = ADDR_TYPE_RT 922 .flags = ADDR_TYPE_RT
923 }, 923 },
924 { }
924}; 925};
925 926
926/* l4_per -> timer7 */ 927/* l4_per -> timer7 */
@@ -929,7 +930,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer7 = {
929 .slave = &omap3xxx_timer7_hwmod, 930 .slave = &omap3xxx_timer7_hwmod,
930 .clk = "gpt7_ick", 931 .clk = "gpt7_ick",
931 .addr = omap3xxx_timer7_addrs, 932 .addr = omap3xxx_timer7_addrs,
932 .addr_cnt = ARRAY_SIZE(omap3xxx_timer7_addrs),
933 .user = OCP_USER_MPU | OCP_USER_SDMA, 933 .user = OCP_USER_MPU | OCP_USER_SDMA,
934}; 934};
935 935
@@ -971,6 +971,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer8_addrs[] = {
971 .pa_end = 0x4903E000 + SZ_1K - 1, 971 .pa_end = 0x4903E000 + SZ_1K - 1,
972 .flags = ADDR_TYPE_RT 972 .flags = ADDR_TYPE_RT
973 }, 973 },
974 { }
974}; 975};
975 976
976/* l4_per -> timer8 */ 977/* l4_per -> timer8 */
@@ -979,7 +980,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer8 = {
979 .slave = &omap3xxx_timer8_hwmod, 980 .slave = &omap3xxx_timer8_hwmod,
980 .clk = "gpt8_ick", 981 .clk = "gpt8_ick",
981 .addr = omap3xxx_timer8_addrs, 982 .addr = omap3xxx_timer8_addrs,
982 .addr_cnt = ARRAY_SIZE(omap3xxx_timer8_addrs),
983 .user = OCP_USER_MPU | OCP_USER_SDMA, 983 .user = OCP_USER_MPU | OCP_USER_SDMA,
984}; 984};
985 985
@@ -1021,6 +1021,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer9_addrs[] = {
1021 .pa_end = 0x49040000 + SZ_1K - 1, 1021 .pa_end = 0x49040000 + SZ_1K - 1,
1022 .flags = ADDR_TYPE_RT 1022 .flags = ADDR_TYPE_RT
1023 }, 1023 },
1024 { }
1024}; 1025};
1025 1026
1026/* l4_per -> timer9 */ 1027/* l4_per -> timer9 */
@@ -1029,7 +1030,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer9 = {
1029 .slave = &omap3xxx_timer9_hwmod, 1030 .slave = &omap3xxx_timer9_hwmod,
1030 .clk = "gpt9_ick", 1031 .clk = "gpt9_ick",
1031 .addr = omap3xxx_timer9_addrs, 1032 .addr = omap3xxx_timer9_addrs,
1032 .addr_cnt = ARRAY_SIZE(omap3xxx_timer9_addrs),
1033 .user = OCP_USER_MPU | OCP_USER_SDMA, 1033 .user = OCP_USER_MPU | OCP_USER_SDMA,
1034}; 1034};
1035 1035
@@ -1071,6 +1071,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer10_addrs[] = {
1071 .pa_end = 0x48086000 + SZ_1K - 1, 1071 .pa_end = 0x48086000 + SZ_1K - 1,
1072 .flags = ADDR_TYPE_RT 1072 .flags = ADDR_TYPE_RT
1073 }, 1073 },
1074 { }
1074}; 1075};
1075 1076
1076/* l4_core -> timer10 */ 1077/* l4_core -> timer10 */
@@ -1079,7 +1080,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer10 = {
1079 .slave = &omap3xxx_timer10_hwmod, 1080 .slave = &omap3xxx_timer10_hwmod,
1080 .clk = "gpt10_ick", 1081 .clk = "gpt10_ick",
1081 .addr = omap3xxx_timer10_addrs, 1082 .addr = omap3xxx_timer10_addrs,
1082 .addr_cnt = ARRAY_SIZE(omap3xxx_timer10_addrs),
1083 .user = OCP_USER_MPU | OCP_USER_SDMA, 1083 .user = OCP_USER_MPU | OCP_USER_SDMA,
1084}; 1084};
1085 1085
@@ -1121,6 +1121,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer11_addrs[] = {
1121 .pa_end = 0x48088000 + SZ_1K - 1, 1121 .pa_end = 0x48088000 + SZ_1K - 1,
1122 .flags = ADDR_TYPE_RT 1122 .flags = ADDR_TYPE_RT
1123 }, 1123 },
1124 { }
1124}; 1125};
1125 1126
1126/* l4_core -> timer11 */ 1127/* l4_core -> timer11 */
@@ -1129,7 +1130,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer11 = {
1129 .slave = &omap3xxx_timer11_hwmod, 1130 .slave = &omap3xxx_timer11_hwmod,
1130 .clk = "gpt11_ick", 1131 .clk = "gpt11_ick",
1131 .addr = omap3xxx_timer11_addrs, 1132 .addr = omap3xxx_timer11_addrs,
1132 .addr_cnt = ARRAY_SIZE(omap3xxx_timer11_addrs),
1133 .user = OCP_USER_MPU | OCP_USER_SDMA, 1133 .user = OCP_USER_MPU | OCP_USER_SDMA,
1134}; 1134};
1135 1135
@@ -1171,6 +1171,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer12_addrs[] = {
1171 .pa_end = 0x48304000 + SZ_1K - 1, 1171 .pa_end = 0x48304000 + SZ_1K - 1,
1172 .flags = ADDR_TYPE_RT 1172 .flags = ADDR_TYPE_RT
1173 }, 1173 },
1174 { }
1174}; 1175};
1175 1176
1176/* l4_core -> timer12 */ 1177/* l4_core -> timer12 */
@@ -1179,7 +1180,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer12 = {
1179 .slave = &omap3xxx_timer12_hwmod, 1180 .slave = &omap3xxx_timer12_hwmod,
1180 .clk = "gpt12_ick", 1181 .clk = "gpt12_ick",
1181 .addr = omap3xxx_timer12_addrs, 1182 .addr = omap3xxx_timer12_addrs,
1182 .addr_cnt = ARRAY_SIZE(omap3xxx_timer12_addrs),
1183 .user = OCP_USER_MPU | OCP_USER_SDMA, 1183 .user = OCP_USER_MPU | OCP_USER_SDMA,
1184}; 1184};
1185 1185
@@ -1216,6 +1216,7 @@ static struct omap_hwmod_addr_space omap3xxx_wd_timer2_addrs[] = {
1216 .pa_end = 0x4831407f, 1216 .pa_end = 0x4831407f,
1217 .flags = ADDR_TYPE_RT 1217 .flags = ADDR_TYPE_RT
1218 }, 1218 },
1219 { }
1219}; 1220};
1220 1221
1221static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2 = { 1222static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2 = {
@@ -1223,7 +1224,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2 = {
1223 .slave = &omap3xxx_wd_timer2_hwmod, 1224 .slave = &omap3xxx_wd_timer2_hwmod,
1224 .clk = "wdt2_ick", 1225 .clk = "wdt2_ick",
1225 .addr = omap3xxx_wd_timer2_addrs, 1226 .addr = omap3xxx_wd_timer2_addrs,
1226 .addr_cnt = ARRAY_SIZE(omap3xxx_wd_timer2_addrs),
1227 .user = OCP_USER_MPU | OCP_USER_SDMA, 1227 .user = OCP_USER_MPU | OCP_USER_SDMA,
1228}; 1228};
1229 1229
@@ -1497,6 +1497,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_addrs[] = {
1497 .pa_end = 0x480503FF, 1497 .pa_end = 0x480503FF,
1498 .flags = ADDR_TYPE_RT 1498 .flags = ADDR_TYPE_RT
1499 }, 1499 },
1500 { }
1500}; 1501};
1501 1502
1502/* l4_core -> dss */ 1503/* l4_core -> dss */
@@ -1505,7 +1506,6 @@ static struct omap_hwmod_ocp_if omap3430es1_l4_core__dss = {
1505 .slave = &omap3430es1_dss_core_hwmod, 1506 .slave = &omap3430es1_dss_core_hwmod,
1506 .clk = "dss_ick", 1507 .clk = "dss_ick",
1507 .addr = omap3xxx_dss_addrs, 1508 .addr = omap3xxx_dss_addrs,
1508 .addr_cnt = ARRAY_SIZE(omap3xxx_dss_addrs),
1509 .fw = { 1509 .fw = {
1510 .omap2 = { 1510 .omap2 = {
1511 .l4_fw_region = OMAP3ES1_L4_CORE_FW_DSS_CORE_REGION, 1511 .l4_fw_region = OMAP3ES1_L4_CORE_FW_DSS_CORE_REGION,
@@ -1521,7 +1521,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss = {
1521 .slave = &omap3xxx_dss_core_hwmod, 1521 .slave = &omap3xxx_dss_core_hwmod,
1522 .clk = "dss_ick", 1522 .clk = "dss_ick",
1523 .addr = omap3xxx_dss_addrs, 1523 .addr = omap3xxx_dss_addrs,
1524 .addr_cnt = ARRAY_SIZE(omap3xxx_dss_addrs),
1525 .fw = { 1524 .fw = {
1526 .omap2 = { 1525 .omap2 = {
1527 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_CORE_REGION, 1526 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_CORE_REGION,
@@ -1632,6 +1631,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_dispc_addrs[] = {
1632 .pa_end = 0x480507FF, 1631 .pa_end = 0x480507FF,
1633 .flags = ADDR_TYPE_RT 1632 .flags = ADDR_TYPE_RT
1634 }, 1633 },
1634 { }
1635}; 1635};
1636 1636
1637/* l4_core -> dss_dispc */ 1637/* l4_core -> dss_dispc */
@@ -1640,7 +1640,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dispc = {
1640 .slave = &omap3xxx_dss_dispc_hwmod, 1640 .slave = &omap3xxx_dss_dispc_hwmod,
1641 .clk = "dss_ick", 1641 .clk = "dss_ick",
1642 .addr = omap3xxx_dss_dispc_addrs, 1642 .addr = omap3xxx_dss_dispc_addrs,
1643 .addr_cnt = ARRAY_SIZE(omap3xxx_dss_dispc_addrs),
1644 .fw = { 1643 .fw = {
1645 .omap2 = { 1644 .omap2 = {
1646 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_DISPC_REGION, 1645 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_DISPC_REGION,
@@ -1697,6 +1696,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_dsi1_addrs[] = {
1697 .pa_end = 0x4804FFFF, 1696 .pa_end = 0x4804FFFF,
1698 .flags = ADDR_TYPE_RT 1697 .flags = ADDR_TYPE_RT
1699 }, 1698 },
1699 { }
1700}; 1700};
1701 1701
1702/* l4_core -> dss_dsi1 */ 1702/* l4_core -> dss_dsi1 */
@@ -1704,7 +1704,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dsi1 = {
1704 .master = &omap3xxx_l4_core_hwmod, 1704 .master = &omap3xxx_l4_core_hwmod,
1705 .slave = &omap3xxx_dss_dsi1_hwmod, 1705 .slave = &omap3xxx_dss_dsi1_hwmod,
1706 .addr = omap3xxx_dss_dsi1_addrs, 1706 .addr = omap3xxx_dss_dsi1_addrs,
1707 .addr_cnt = ARRAY_SIZE(omap3xxx_dss_dsi1_addrs),
1708 .fw = { 1707 .fw = {
1709 .omap2 = { 1708 .omap2 = {
1710 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_DSI_REGION, 1709 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_DSI_REGION,
@@ -1767,6 +1766,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_rfbi_addrs[] = {
1767 .pa_end = 0x48050BFF, 1766 .pa_end = 0x48050BFF,
1768 .flags = ADDR_TYPE_RT 1767 .flags = ADDR_TYPE_RT
1769 }, 1768 },
1769 { }
1770}; 1770};
1771 1771
1772/* l4_core -> dss_rfbi */ 1772/* l4_core -> dss_rfbi */
@@ -1775,7 +1775,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_rfbi = {
1775 .slave = &omap3xxx_dss_rfbi_hwmod, 1775 .slave = &omap3xxx_dss_rfbi_hwmod,
1776 .clk = "dss_ick", 1776 .clk = "dss_ick",
1777 .addr = omap3xxx_dss_rfbi_addrs, 1777 .addr = omap3xxx_dss_rfbi_addrs,
1778 .addr_cnt = ARRAY_SIZE(omap3xxx_dss_rfbi_addrs),
1779 .fw = { 1778 .fw = {
1780 .omap2 = { 1779 .omap2 = {
1781 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_RFBI_REGION, 1780 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_RFBI_REGION,
@@ -1826,6 +1825,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_venc_addrs[] = {
1826 .pa_end = 0x48050FFF, 1825 .pa_end = 0x48050FFF,
1827 .flags = ADDR_TYPE_RT 1826 .flags = ADDR_TYPE_RT
1828 }, 1827 },
1828 { }
1829}; 1829};
1830 1830
1831/* l4_core -> dss_venc */ 1831/* l4_core -> dss_venc */
@@ -1834,7 +1834,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_venc = {
1834 .slave = &omap3xxx_dss_venc_hwmod, 1834 .slave = &omap3xxx_dss_venc_hwmod,
1835 .clk = "dss_tv_fck", 1835 .clk = "dss_tv_fck",
1836 .addr = omap3xxx_dss_venc_addrs, 1836 .addr = omap3xxx_dss_venc_addrs,
1837 .addr_cnt = ARRAY_SIZE(omap3xxx_dss_venc_addrs),
1838 .fw = { 1837 .fw = {
1839 .omap2 = { 1838 .omap2 = {
1840 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_VENC_REGION, 1839 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_VENC_REGION,
@@ -2003,13 +2002,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio1_addrs[] = {
2003 .pa_end = 0x483101ff, 2002 .pa_end = 0x483101ff,
2004 .flags = ADDR_TYPE_RT 2003 .flags = ADDR_TYPE_RT
2005 }, 2004 },
2005 { }
2006}; 2006};
2007 2007
2008static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__gpio1 = { 2008static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__gpio1 = {
2009 .master = &omap3xxx_l4_wkup_hwmod, 2009 .master = &omap3xxx_l4_wkup_hwmod,
2010 .slave = &omap3xxx_gpio1_hwmod, 2010 .slave = &omap3xxx_gpio1_hwmod,
2011 .addr = omap3xxx_gpio1_addrs, 2011 .addr = omap3xxx_gpio1_addrs,
2012 .addr_cnt = ARRAY_SIZE(omap3xxx_gpio1_addrs),
2013 .user = OCP_USER_MPU | OCP_USER_SDMA, 2012 .user = OCP_USER_MPU | OCP_USER_SDMA,
2014}; 2013};
2015 2014
@@ -2020,13 +2019,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio2_addrs[] = {
2020 .pa_end = 0x490501ff, 2019 .pa_end = 0x490501ff,
2021 .flags = ADDR_TYPE_RT 2020 .flags = ADDR_TYPE_RT
2022 }, 2021 },
2022 { }
2023}; 2023};
2024 2024
2025static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio2 = { 2025static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio2 = {
2026 .master = &omap3xxx_l4_per_hwmod, 2026 .master = &omap3xxx_l4_per_hwmod,
2027 .slave = &omap3xxx_gpio2_hwmod, 2027 .slave = &omap3xxx_gpio2_hwmod,
2028 .addr = omap3xxx_gpio2_addrs, 2028 .addr = omap3xxx_gpio2_addrs,
2029 .addr_cnt = ARRAY_SIZE(omap3xxx_gpio2_addrs),
2030 .user = OCP_USER_MPU | OCP_USER_SDMA, 2029 .user = OCP_USER_MPU | OCP_USER_SDMA,
2031}; 2030};
2032 2031
@@ -2037,13 +2036,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio3_addrs[] = {
2037 .pa_end = 0x490521ff, 2036 .pa_end = 0x490521ff,
2038 .flags = ADDR_TYPE_RT 2037 .flags = ADDR_TYPE_RT
2039 }, 2038 },
2039 { }
2040}; 2040};
2041 2041
2042static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio3 = { 2042static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio3 = {
2043 .master = &omap3xxx_l4_per_hwmod, 2043 .master = &omap3xxx_l4_per_hwmod,
2044 .slave = &omap3xxx_gpio3_hwmod, 2044 .slave = &omap3xxx_gpio3_hwmod,
2045 .addr = omap3xxx_gpio3_addrs, 2045 .addr = omap3xxx_gpio3_addrs,
2046 .addr_cnt = ARRAY_SIZE(omap3xxx_gpio3_addrs),
2047 .user = OCP_USER_MPU | OCP_USER_SDMA, 2046 .user = OCP_USER_MPU | OCP_USER_SDMA,
2048}; 2047};
2049 2048
@@ -2054,13 +2053,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio4_addrs[] = {
2054 .pa_end = 0x490541ff, 2053 .pa_end = 0x490541ff,
2055 .flags = ADDR_TYPE_RT 2054 .flags = ADDR_TYPE_RT
2056 }, 2055 },
2056 { }
2057}; 2057};
2058 2058
2059static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio4 = { 2059static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio4 = {
2060 .master = &omap3xxx_l4_per_hwmod, 2060 .master = &omap3xxx_l4_per_hwmod,
2061 .slave = &omap3xxx_gpio4_hwmod, 2061 .slave = &omap3xxx_gpio4_hwmod,
2062 .addr = omap3xxx_gpio4_addrs, 2062 .addr = omap3xxx_gpio4_addrs,
2063 .addr_cnt = ARRAY_SIZE(omap3xxx_gpio4_addrs),
2064 .user = OCP_USER_MPU | OCP_USER_SDMA, 2063 .user = OCP_USER_MPU | OCP_USER_SDMA,
2065}; 2064};
2066 2065
@@ -2071,13 +2070,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio5_addrs[] = {
2071 .pa_end = 0x490561ff, 2070 .pa_end = 0x490561ff,
2072 .flags = ADDR_TYPE_RT 2071 .flags = ADDR_TYPE_RT
2073 }, 2072 },
2073 { }
2074}; 2074};
2075 2075
2076static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio5 = { 2076static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio5 = {
2077 .master = &omap3xxx_l4_per_hwmod, 2077 .master = &omap3xxx_l4_per_hwmod,
2078 .slave = &omap3xxx_gpio5_hwmod, 2078 .slave = &omap3xxx_gpio5_hwmod,
2079 .addr = omap3xxx_gpio5_addrs, 2079 .addr = omap3xxx_gpio5_addrs,
2080 .addr_cnt = ARRAY_SIZE(omap3xxx_gpio5_addrs),
2081 .user = OCP_USER_MPU | OCP_USER_SDMA, 2080 .user = OCP_USER_MPU | OCP_USER_SDMA,
2082}; 2081};
2083 2082
@@ -2088,13 +2087,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio6_addrs[] = {
2088 .pa_end = 0x490581ff, 2087 .pa_end = 0x490581ff,
2089 .flags = ADDR_TYPE_RT 2088 .flags = ADDR_TYPE_RT
2090 }, 2089 },
2090 { }
2091}; 2091};
2092 2092
2093static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio6 = { 2093static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio6 = {
2094 .master = &omap3xxx_l4_per_hwmod, 2094 .master = &omap3xxx_l4_per_hwmod,
2095 .slave = &omap3xxx_gpio6_hwmod, 2095 .slave = &omap3xxx_gpio6_hwmod,
2096 .addr = omap3xxx_gpio6_addrs, 2096 .addr = omap3xxx_gpio6_addrs,
2097 .addr_cnt = ARRAY_SIZE(omap3xxx_gpio6_addrs),
2098 .user = OCP_USER_MPU | OCP_USER_SDMA, 2097 .user = OCP_USER_MPU | OCP_USER_SDMA,
2099}; 2098};
2100 2099
@@ -2395,6 +2394,7 @@ static struct omap_hwmod_addr_space omap3xxx_dma_system_addrs[] = {
2395 .pa_end = 0x48056fff, 2394 .pa_end = 0x48056fff,
2396 .flags = ADDR_TYPE_RT 2395 .flags = ADDR_TYPE_RT
2397 }, 2396 },
2397 { }
2398}; 2398};
2399 2399
2400/* dma_system master ports */ 2400/* dma_system master ports */
@@ -2408,7 +2408,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dma_system = {
2408 .slave = &omap3xxx_dma_system_hwmod, 2408 .slave = &omap3xxx_dma_system_hwmod,
2409 .clk = "core_l4_ick", 2409 .clk = "core_l4_ick",
2410 .addr = omap3xxx_dma_system_addrs, 2410 .addr = omap3xxx_dma_system_addrs,
2411 .addr_cnt = ARRAY_SIZE(omap3xxx_dma_system_addrs),
2412 .user = OCP_USER_MPU | OCP_USER_SDMA, 2411 .user = OCP_USER_MPU | OCP_USER_SDMA,
2413}; 2412};
2414 2413
@@ -2480,6 +2479,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp1_addrs[] = {
2480 .pa_end = 0x480740ff, 2479 .pa_end = 0x480740ff,
2481 .flags = ADDR_TYPE_RT 2480 .flags = ADDR_TYPE_RT
2482 }, 2481 },
2482 { }
2483}; 2483};
2484 2484
2485/* l4_core -> mcbsp1 */ 2485/* l4_core -> mcbsp1 */
@@ -2488,7 +2488,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mcbsp1 = {
2488 .slave = &omap3xxx_mcbsp1_hwmod, 2488 .slave = &omap3xxx_mcbsp1_hwmod,
2489 .clk = "mcbsp1_ick", 2489 .clk = "mcbsp1_ick",
2490 .addr = omap3xxx_mcbsp1_addrs, 2490 .addr = omap3xxx_mcbsp1_addrs,
2491 .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp1_addrs),
2492 .user = OCP_USER_MPU | OCP_USER_SDMA, 2491 .user = OCP_USER_MPU | OCP_USER_SDMA,
2493}; 2492};
2494 2493
@@ -2538,6 +2537,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp2_addrs[] = {
2538 .pa_end = 0x490220ff, 2537 .pa_end = 0x490220ff,
2539 .flags = ADDR_TYPE_RT 2538 .flags = ADDR_TYPE_RT
2540 }, 2539 },
2540 { }
2541}; 2541};
2542 2542
2543/* l4_per -> mcbsp2 */ 2543/* l4_per -> mcbsp2 */
@@ -2546,7 +2546,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp2 = {
2546 .slave = &omap3xxx_mcbsp2_hwmod, 2546 .slave = &omap3xxx_mcbsp2_hwmod,
2547 .clk = "mcbsp2_ick", 2547 .clk = "mcbsp2_ick",
2548 .addr = omap3xxx_mcbsp2_addrs, 2548 .addr = omap3xxx_mcbsp2_addrs,
2549 .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp2_addrs), 2549
2550 .user = OCP_USER_MPU | OCP_USER_SDMA, 2550 .user = OCP_USER_MPU | OCP_USER_SDMA,
2551}; 2551};
2552 2552
@@ -2601,6 +2601,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp3_addrs[] = {
2601 .pa_end = 0x490240ff, 2601 .pa_end = 0x490240ff,
2602 .flags = ADDR_TYPE_RT 2602 .flags = ADDR_TYPE_RT
2603 }, 2603 },
2604 { }
2604}; 2605};
2605 2606
2606/* l4_per -> mcbsp3 */ 2607/* l4_per -> mcbsp3 */
@@ -2609,7 +2610,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp3 = {
2609 .slave = &omap3xxx_mcbsp3_hwmod, 2610 .slave = &omap3xxx_mcbsp3_hwmod,
2610 .clk = "mcbsp3_ick", 2611 .clk = "mcbsp3_ick",
2611 .addr = omap3xxx_mcbsp3_addrs, 2612 .addr = omap3xxx_mcbsp3_addrs,
2612 .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp3_addrs),
2613 .user = OCP_USER_MPU | OCP_USER_SDMA, 2613 .user = OCP_USER_MPU | OCP_USER_SDMA,
2614}; 2614};
2615 2615
@@ -2664,6 +2664,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp4_addrs[] = {
2664 .pa_end = 0x490260ff, 2664 .pa_end = 0x490260ff,
2665 .flags = ADDR_TYPE_RT 2665 .flags = ADDR_TYPE_RT
2666 }, 2666 },
2667 { }
2667}; 2668};
2668 2669
2669/* l4_per -> mcbsp4 */ 2670/* l4_per -> mcbsp4 */
@@ -2672,7 +2673,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp4 = {
2672 .slave = &omap3xxx_mcbsp4_hwmod, 2673 .slave = &omap3xxx_mcbsp4_hwmod,
2673 .clk = "mcbsp4_ick", 2674 .clk = "mcbsp4_ick",
2674 .addr = omap3xxx_mcbsp4_addrs, 2675 .addr = omap3xxx_mcbsp4_addrs,
2675 .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp4_addrs),
2676 .user = OCP_USER_MPU | OCP_USER_SDMA, 2676 .user = OCP_USER_MPU | OCP_USER_SDMA,
2677}; 2677};
2678 2678
@@ -2722,6 +2722,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp5_addrs[] = {
2722 .pa_end = 0x480960ff, 2722 .pa_end = 0x480960ff,
2723 .flags = ADDR_TYPE_RT 2723 .flags = ADDR_TYPE_RT
2724 }, 2724 },
2725 { }
2725}; 2726};
2726 2727
2727/* l4_core -> mcbsp5 */ 2728/* l4_core -> mcbsp5 */
@@ -2730,7 +2731,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mcbsp5 = {
2730 .slave = &omap3xxx_mcbsp5_hwmod, 2731 .slave = &omap3xxx_mcbsp5_hwmod,
2731 .clk = "mcbsp5_ick", 2732 .clk = "mcbsp5_ick",
2732 .addr = omap3xxx_mcbsp5_addrs, 2733 .addr = omap3xxx_mcbsp5_addrs,
2733 .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp5_addrs),
2734 .user = OCP_USER_MPU | OCP_USER_SDMA, 2734 .user = OCP_USER_MPU | OCP_USER_SDMA,
2735}; 2735};
2736 2736
@@ -2785,6 +2785,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp2_sidetone_addrs[] = {
2785 .pa_end = 0x490280ff, 2785 .pa_end = 0x490280ff,
2786 .flags = ADDR_TYPE_RT 2786 .flags = ADDR_TYPE_RT
2787 }, 2787 },
2788 { }
2788}; 2789};
2789 2790
2790/* l4_per -> mcbsp2_sidetone */ 2791/* l4_per -> mcbsp2_sidetone */
@@ -2793,7 +2794,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp2_sidetone = {
2793 .slave = &omap3xxx_mcbsp2_sidetone_hwmod, 2794 .slave = &omap3xxx_mcbsp2_sidetone_hwmod,
2794 .clk = "mcbsp2_ick", 2795 .clk = "mcbsp2_ick",
2795 .addr = omap3xxx_mcbsp2_sidetone_addrs, 2796 .addr = omap3xxx_mcbsp2_sidetone_addrs,
2796 .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp2_sidetone_addrs),
2797 .user = OCP_USER_MPU, 2797 .user = OCP_USER_MPU,
2798}; 2798};
2799 2799
@@ -2834,6 +2834,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp3_sidetone_addrs[] = {
2834 .pa_end = 0x4902A0ff, 2834 .pa_end = 0x4902A0ff,
2835 .flags = ADDR_TYPE_RT 2835 .flags = ADDR_TYPE_RT
2836 }, 2836 },
2837 { }
2837}; 2838};
2838 2839
2839/* l4_per -> mcbsp3_sidetone */ 2840/* l4_per -> mcbsp3_sidetone */
@@ -2842,7 +2843,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp3_sidetone = {
2842 .slave = &omap3xxx_mcbsp3_sidetone_hwmod, 2843 .slave = &omap3xxx_mcbsp3_sidetone_hwmod,
2843 .clk = "mcbsp3_ick", 2844 .clk = "mcbsp3_ick",
2844 .addr = omap3xxx_mcbsp3_sidetone_addrs, 2845 .addr = omap3xxx_mcbsp3_sidetone_addrs,
2845 .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp3_sidetone_addrs),
2846 .user = OCP_USER_MPU, 2846 .user = OCP_USER_MPU,
2847}; 2847};
2848 2848
@@ -3033,6 +3033,7 @@ static struct omap_hwmod_addr_space omap3xxx_mailbox_addrs[] = {
3033 .pa_end = 0x480941ff, 3033 .pa_end = 0x480941ff,
3034 .flags = ADDR_TYPE_RT, 3034 .flags = ADDR_TYPE_RT,
3035 }, 3035 },
3036 { }
3036}; 3037};
3037 3038
3038/* l4_core -> mailbox */ 3039/* l4_core -> mailbox */
@@ -3040,7 +3041,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mailbox = {
3040 .master = &omap3xxx_l4_core_hwmod, 3041 .master = &omap3xxx_l4_core_hwmod,
3041 .slave = &omap3xxx_mailbox_hwmod, 3042 .slave = &omap3xxx_mailbox_hwmod,
3042 .addr = omap3xxx_mailbox_addrs, 3043 .addr = omap3xxx_mailbox_addrs,
3043 .addr_cnt = ARRAY_SIZE(omap3xxx_mailbox_addrs),
3044 .user = OCP_USER_MPU | OCP_USER_SDMA, 3044 .user = OCP_USER_MPU | OCP_USER_SDMA,
3045}; 3045};
3046 3046
@@ -3076,6 +3076,7 @@ static struct omap_hwmod_addr_space omap34xx_mcspi1_addr_space[] = {
3076 .pa_end = 0x480980ff, 3076 .pa_end = 0x480980ff,
3077 .flags = ADDR_TYPE_RT, 3077 .flags = ADDR_TYPE_RT,
3078 }, 3078 },
3079 { }
3079}; 3080};
3080 3081
3081static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi1 = { 3082static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi1 = {
@@ -3083,7 +3084,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi1 = {
3083 .slave = &omap34xx_mcspi1, 3084 .slave = &omap34xx_mcspi1,
3084 .clk = "mcspi1_ick", 3085 .clk = "mcspi1_ick",
3085 .addr = omap34xx_mcspi1_addr_space, 3086 .addr = omap34xx_mcspi1_addr_space,
3086 .addr_cnt = ARRAY_SIZE(omap34xx_mcspi1_addr_space),
3087 .user = OCP_USER_MPU | OCP_USER_SDMA, 3087 .user = OCP_USER_MPU | OCP_USER_SDMA,
3088}; 3088};
3089 3089
@@ -3094,6 +3094,7 @@ static struct omap_hwmod_addr_space omap34xx_mcspi2_addr_space[] = {
3094 .pa_end = 0x4809a0ff, 3094 .pa_end = 0x4809a0ff,
3095 .flags = ADDR_TYPE_RT, 3095 .flags = ADDR_TYPE_RT,
3096 }, 3096 },
3097 { }
3097}; 3098};
3098 3099
3099static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi2 = { 3100static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi2 = {
@@ -3101,7 +3102,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi2 = {
3101 .slave = &omap34xx_mcspi2, 3102 .slave = &omap34xx_mcspi2,
3102 .clk = "mcspi2_ick", 3103 .clk = "mcspi2_ick",
3103 .addr = omap34xx_mcspi2_addr_space, 3104 .addr = omap34xx_mcspi2_addr_space,
3104 .addr_cnt = ARRAY_SIZE(omap34xx_mcspi2_addr_space),
3105 .user = OCP_USER_MPU | OCP_USER_SDMA, 3105 .user = OCP_USER_MPU | OCP_USER_SDMA,
3106}; 3106};
3107 3107
@@ -3112,6 +3112,7 @@ static struct omap_hwmod_addr_space omap34xx_mcspi3_addr_space[] = {
3112 .pa_end = 0x480b80ff, 3112 .pa_end = 0x480b80ff,
3113 .flags = ADDR_TYPE_RT, 3113 .flags = ADDR_TYPE_RT,
3114 }, 3114 },
3115 { }
3115}; 3116};
3116 3117
3117static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi3 = { 3118static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi3 = {
@@ -3119,7 +3120,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi3 = {
3119 .slave = &omap34xx_mcspi3, 3120 .slave = &omap34xx_mcspi3,
3120 .clk = "mcspi3_ick", 3121 .clk = "mcspi3_ick",
3121 .addr = omap34xx_mcspi3_addr_space, 3122 .addr = omap34xx_mcspi3_addr_space,
3122 .addr_cnt = ARRAY_SIZE(omap34xx_mcspi3_addr_space),
3123 .user = OCP_USER_MPU | OCP_USER_SDMA, 3123 .user = OCP_USER_MPU | OCP_USER_SDMA,
3124}; 3124};
3125 3125
@@ -3130,6 +3130,7 @@ static struct omap_hwmod_addr_space omap34xx_mcspi4_addr_space[] = {
3130 .pa_end = 0x480ba0ff, 3130 .pa_end = 0x480ba0ff,
3131 .flags = ADDR_TYPE_RT, 3131 .flags = ADDR_TYPE_RT,
3132 }, 3132 },
3133 { }
3133}; 3134};
3134 3135
3135static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi4 = { 3136static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi4 = {
@@ -3137,7 +3138,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi4 = {
3137 .slave = &omap34xx_mcspi4, 3138 .slave = &omap34xx_mcspi4,
3138 .clk = "mcspi4_ick", 3139 .clk = "mcspi4_ick",
3139 .addr = omap34xx_mcspi4_addr_space, 3140 .addr = omap34xx_mcspi4_addr_space,
3140 .addr_cnt = ARRAY_SIZE(omap34xx_mcspi4_addr_space),
3141 .user = OCP_USER_MPU | OCP_USER_SDMA, 3141 .user = OCP_USER_MPU | OCP_USER_SDMA,
3142}; 3142};
3143 3143
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index e1c69ffe0f69..81fd313bb1ad 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -95,6 +95,7 @@ static struct omap_hwmod_addr_space omap44xx_dmm_addrs[] = {
95 .pa_end = 0x4e0007ff, 95 .pa_end = 0x4e0007ff,
96 .flags = ADDR_TYPE_RT 96 .flags = ADDR_TYPE_RT
97 }, 97 },
98 { }
98}; 99};
99 100
100/* mpu -> dmm */ 101/* mpu -> dmm */
@@ -103,7 +104,6 @@ static struct omap_hwmod_ocp_if omap44xx_mpu__dmm = {
103 .slave = &omap44xx_dmm_hwmod, 104 .slave = &omap44xx_dmm_hwmod,
104 .clk = "l3_div_ck", 105 .clk = "l3_div_ck",
105 .addr = omap44xx_dmm_addrs, 106 .addr = omap44xx_dmm_addrs,
106 .addr_cnt = ARRAY_SIZE(omap44xx_dmm_addrs),
107 .user = OCP_USER_MPU, 107 .user = OCP_USER_MPU,
108}; 108};
109 109
@@ -150,6 +150,7 @@ static struct omap_hwmod_addr_space omap44xx_emif_fw_addrs[] = {
150 .pa_end = 0x4a20c0ff, 150 .pa_end = 0x4a20c0ff,
151 .flags = ADDR_TYPE_RT 151 .flags = ADDR_TYPE_RT
152 }, 152 },
153 { }
153}; 154};
154 155
155/* l4_cfg -> emif_fw */ 156/* l4_cfg -> emif_fw */
@@ -158,7 +159,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__emif_fw = {
158 .slave = &omap44xx_emif_fw_hwmod, 159 .slave = &omap44xx_emif_fw_hwmod,
159 .clk = "l4_div_ck", 160 .clk = "l4_div_ck",
160 .addr = omap44xx_emif_fw_addrs, 161 .addr = omap44xx_emif_fw_addrs,
161 .addr_cnt = ARRAY_SIZE(omap44xx_emif_fw_addrs),
162 .user = OCP_USER_MPU, 162 .user = OCP_USER_MPU,
163}; 163};
164 164
@@ -276,6 +276,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_1_addrs[] = {
276 .pa_end = 0x44000fff, 276 .pa_end = 0x44000fff,
277 .flags = ADDR_TYPE_RT, 277 .flags = ADDR_TYPE_RT,
278 }, 278 },
279 { }
279}; 280};
280 281
281/* mpu -> l3_main_1 */ 282/* mpu -> l3_main_1 */
@@ -284,7 +285,6 @@ static struct omap_hwmod_ocp_if omap44xx_mpu__l3_main_1 = {
284 .slave = &omap44xx_l3_main_1_hwmod, 285 .slave = &omap44xx_l3_main_1_hwmod,
285 .clk = "l3_div_ck", 286 .clk = "l3_div_ck",
286 .addr = omap44xx_l3_main_1_addrs, 287 .addr = omap44xx_l3_main_1_addrs,
287 .addr_cnt = ARRAY_SIZE(omap44xx_l3_main_1_addrs),
288 .user = OCP_USER_MPU | OCP_USER_SDMA, 288 .user = OCP_USER_MPU | OCP_USER_SDMA,
289}; 289};
290 290
@@ -356,6 +356,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_2_addrs[] = {
356 .pa_end = 0x44801fff, 356 .pa_end = 0x44801fff,
357 .flags = ADDR_TYPE_RT, 357 .flags = ADDR_TYPE_RT,
358 }, 358 },
359 { }
359}; 360};
360 361
361/* l3_main_1 -> l3_main_2 */ 362/* l3_main_1 -> l3_main_2 */
@@ -364,7 +365,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_2 = {
364 .slave = &omap44xx_l3_main_2_hwmod, 365 .slave = &omap44xx_l3_main_2_hwmod,
365 .clk = "l3_div_ck", 366 .clk = "l3_div_ck",
366 .addr = omap44xx_l3_main_2_addrs, 367 .addr = omap44xx_l3_main_2_addrs,
367 .addr_cnt = ARRAY_SIZE(omap44xx_l3_main_2_addrs),
368 .user = OCP_USER_MPU | OCP_USER_SDMA, 368 .user = OCP_USER_MPU | OCP_USER_SDMA,
369}; 369};
370 370
@@ -411,6 +411,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = {
411 .pa_end = 0x45000fff, 411 .pa_end = 0x45000fff,
412 .flags = ADDR_TYPE_RT, 412 .flags = ADDR_TYPE_RT,
413 }, 413 },
414 { }
414}; 415};
415 416
416/* l3_main_1 -> l3_main_3 */ 417/* l3_main_1 -> l3_main_3 */
@@ -419,7 +420,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_3 = {
419 .slave = &omap44xx_l3_main_3_hwmod, 420 .slave = &omap44xx_l3_main_3_hwmod,
420 .clk = "l3_div_ck", 421 .clk = "l3_div_ck",
421 .addr = omap44xx_l3_main_3_addrs, 422 .addr = omap44xx_l3_main_3_addrs,
422 .addr_cnt = ARRAY_SIZE(omap44xx_l3_main_3_addrs),
423 .user = OCP_USER_MPU | OCP_USER_SDMA, 423 .user = OCP_USER_MPU | OCP_USER_SDMA,
424}; 424};
425 425
@@ -696,6 +696,7 @@ static struct omap_hwmod_addr_space omap44xx_aess_addrs[] = {
696 .pa_end = 0x401f13ff, 696 .pa_end = 0x401f13ff,
697 .flags = ADDR_TYPE_RT 697 .flags = ADDR_TYPE_RT
698 }, 698 },
699 { }
699}; 700};
700 701
701/* l4_abe -> aess */ 702/* l4_abe -> aess */
@@ -704,7 +705,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess = {
704 .slave = &omap44xx_aess_hwmod, 705 .slave = &omap44xx_aess_hwmod,
705 .clk = "ocp_abe_iclk", 706 .clk = "ocp_abe_iclk",
706 .addr = omap44xx_aess_addrs, 707 .addr = omap44xx_aess_addrs,
707 .addr_cnt = ARRAY_SIZE(omap44xx_aess_addrs),
708 .user = OCP_USER_MPU, 708 .user = OCP_USER_MPU,
709}; 709};
710 710
@@ -714,6 +714,7 @@ static struct omap_hwmod_addr_space omap44xx_aess_dma_addrs[] = {
714 .pa_end = 0x490f13ff, 714 .pa_end = 0x490f13ff,
715 .flags = ADDR_TYPE_RT 715 .flags = ADDR_TYPE_RT
716 }, 716 },
717 { }
717}; 718};
718 719
719/* l4_abe -> aess (dma) */ 720/* l4_abe -> aess (dma) */
@@ -722,7 +723,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess_dma = {
722 .slave = &omap44xx_aess_hwmod, 723 .slave = &omap44xx_aess_hwmod,
723 .clk = "ocp_abe_iclk", 724 .clk = "ocp_abe_iclk",
724 .addr = omap44xx_aess_dma_addrs, 725 .addr = omap44xx_aess_dma_addrs,
725 .addr_cnt = ARRAY_SIZE(omap44xx_aess_dma_addrs),
726 .user = OCP_USER_SDMA, 726 .user = OCP_USER_SDMA,
727}; 727};
728 728
@@ -806,6 +806,7 @@ static struct omap_hwmod_addr_space omap44xx_counter_32k_addrs[] = {
806 .pa_end = 0x4a30401f, 806 .pa_end = 0x4a30401f,
807 .flags = ADDR_TYPE_RT 807 .flags = ADDR_TYPE_RT
808 }, 808 },
809 { }
809}; 810};
810 811
811/* l4_wkup -> counter_32k */ 812/* l4_wkup -> counter_32k */
@@ -814,7 +815,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__counter_32k = {
814 .slave = &omap44xx_counter_32k_hwmod, 815 .slave = &omap44xx_counter_32k_hwmod,
815 .clk = "l4_wkup_clk_mux_ck", 816 .clk = "l4_wkup_clk_mux_ck",
816 .addr = omap44xx_counter_32k_addrs, 817 .addr = omap44xx_counter_32k_addrs,
817 .addr_cnt = ARRAY_SIZE(omap44xx_counter_32k_addrs),
818 .user = OCP_USER_MPU | OCP_USER_SDMA, 818 .user = OCP_USER_MPU | OCP_USER_SDMA,
819}; 819};
820 820
@@ -888,6 +888,7 @@ static struct omap_hwmod_addr_space omap44xx_dma_system_addrs[] = {
888 .pa_end = 0x4a056fff, 888 .pa_end = 0x4a056fff,
889 .flags = ADDR_TYPE_RT 889 .flags = ADDR_TYPE_RT
890 }, 890 },
891 { }
891}; 892};
892 893
893/* l4_cfg -> dma_system */ 894/* l4_cfg -> dma_system */
@@ -896,7 +897,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__dma_system = {
896 .slave = &omap44xx_dma_system_hwmod, 897 .slave = &omap44xx_dma_system_hwmod,
897 .clk = "l4_div_ck", 898 .clk = "l4_div_ck",
898 .addr = omap44xx_dma_system_addrs, 899 .addr = omap44xx_dma_system_addrs,
899 .addr_cnt = ARRAY_SIZE(omap44xx_dma_system_addrs),
900 .user = OCP_USER_MPU | OCP_USER_SDMA, 900 .user = OCP_USER_MPU | OCP_USER_SDMA,
901}; 901};
902 902
@@ -960,6 +960,7 @@ static struct omap_hwmod_addr_space omap44xx_dmic_addrs[] = {
960 .pa_end = 0x4012e07f, 960 .pa_end = 0x4012e07f,
961 .flags = ADDR_TYPE_RT 961 .flags = ADDR_TYPE_RT
962 }, 962 },
963 { }
963}; 964};
964 965
965/* l4_abe -> dmic */ 966/* l4_abe -> dmic */
@@ -968,7 +969,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic = {
968 .slave = &omap44xx_dmic_hwmod, 969 .slave = &omap44xx_dmic_hwmod,
969 .clk = "ocp_abe_iclk", 970 .clk = "ocp_abe_iclk",
970 .addr = omap44xx_dmic_addrs, 971 .addr = omap44xx_dmic_addrs,
971 .addr_cnt = ARRAY_SIZE(omap44xx_dmic_addrs),
972 .user = OCP_USER_MPU, 972 .user = OCP_USER_MPU,
973}; 973};
974 974
@@ -978,6 +978,7 @@ static struct omap_hwmod_addr_space omap44xx_dmic_dma_addrs[] = {
978 .pa_end = 0x4902e07f, 978 .pa_end = 0x4902e07f,
979 .flags = ADDR_TYPE_RT 979 .flags = ADDR_TYPE_RT
980 }, 980 },
981 { }
981}; 982};
982 983
983/* l4_abe -> dmic (dma) */ 984/* l4_abe -> dmic (dma) */
@@ -986,7 +987,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic_dma = {
986 .slave = &omap44xx_dmic_hwmod, 987 .slave = &omap44xx_dmic_hwmod,
987 .clk = "ocp_abe_iclk", 988 .clk = "ocp_abe_iclk",
988 .addr = omap44xx_dmic_dma_addrs, 989 .addr = omap44xx_dmic_dma_addrs,
989 .addr_cnt = ARRAY_SIZE(omap44xx_dmic_dma_addrs),
990 .user = OCP_USER_SDMA, 990 .user = OCP_USER_SDMA,
991}; 991};
992 992
@@ -1127,6 +1127,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dma_addrs[] = {
1127 .pa_end = 0x5800007f, 1127 .pa_end = 0x5800007f,
1128 .flags = ADDR_TYPE_RT 1128 .flags = ADDR_TYPE_RT
1129 }, 1129 },
1130 { }
1130}; 1131};
1131 1132
1132/* l3_main_2 -> dss */ 1133/* l3_main_2 -> dss */
@@ -1135,7 +1136,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss = {
1135 .slave = &omap44xx_dss_hwmod, 1136 .slave = &omap44xx_dss_hwmod,
1136 .clk = "l3_div_ck", 1137 .clk = "l3_div_ck",
1137 .addr = omap44xx_dss_dma_addrs, 1138 .addr = omap44xx_dss_dma_addrs,
1138 .addr_cnt = ARRAY_SIZE(omap44xx_dss_dma_addrs),
1139 .user = OCP_USER_SDMA, 1139 .user = OCP_USER_SDMA,
1140}; 1140};
1141 1141
@@ -1145,6 +1145,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_addrs[] = {
1145 .pa_end = 0x4804007f, 1145 .pa_end = 0x4804007f,
1146 .flags = ADDR_TYPE_RT 1146 .flags = ADDR_TYPE_RT
1147 }, 1147 },
1148 { }
1148}; 1149};
1149 1150
1150/* l4_per -> dss */ 1151/* l4_per -> dss */
@@ -1153,7 +1154,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss = {
1153 .slave = &omap44xx_dss_hwmod, 1154 .slave = &omap44xx_dss_hwmod,
1154 .clk = "l4_div_ck", 1155 .clk = "l4_div_ck",
1155 .addr = omap44xx_dss_addrs, 1156 .addr = omap44xx_dss_addrs,
1156 .addr_cnt = ARRAY_SIZE(omap44xx_dss_addrs),
1157 .user = OCP_USER_MPU, 1157 .user = OCP_USER_MPU,
1158}; 1158};
1159 1159
@@ -1227,6 +1227,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dispc_dma_addrs[] = {
1227 .pa_end = 0x58001fff, 1227 .pa_end = 0x58001fff,
1228 .flags = ADDR_TYPE_RT 1228 .flags = ADDR_TYPE_RT
1229 }, 1229 },
1230 { }
1230}; 1231};
1231 1232
1232/* l3_main_2 -> dss_dispc */ 1233/* l3_main_2 -> dss_dispc */
@@ -1235,7 +1236,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dispc = {
1235 .slave = &omap44xx_dss_dispc_hwmod, 1236 .slave = &omap44xx_dss_dispc_hwmod,
1236 .clk = "l3_div_ck", 1237 .clk = "l3_div_ck",
1237 .addr = omap44xx_dss_dispc_dma_addrs, 1238 .addr = omap44xx_dss_dispc_dma_addrs,
1238 .addr_cnt = ARRAY_SIZE(omap44xx_dss_dispc_dma_addrs),
1239 .user = OCP_USER_SDMA, 1239 .user = OCP_USER_SDMA,
1240}; 1240};
1241 1241
@@ -1245,6 +1245,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dispc_addrs[] = {
1245 .pa_end = 0x48041fff, 1245 .pa_end = 0x48041fff,
1246 .flags = ADDR_TYPE_RT 1246 .flags = ADDR_TYPE_RT
1247 }, 1247 },
1248 { }
1248}; 1249};
1249 1250
1250/* l4_per -> dss_dispc */ 1251/* l4_per -> dss_dispc */
@@ -1253,7 +1254,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dispc = {
1253 .slave = &omap44xx_dss_dispc_hwmod, 1254 .slave = &omap44xx_dss_dispc_hwmod,
1254 .clk = "l4_div_ck", 1255 .clk = "l4_div_ck",
1255 .addr = omap44xx_dss_dispc_addrs, 1256 .addr = omap44xx_dss_dispc_addrs,
1256 .addr_cnt = ARRAY_SIZE(omap44xx_dss_dispc_addrs),
1257 .user = OCP_USER_MPU, 1257 .user = OCP_USER_MPU,
1258}; 1258};
1259 1259
@@ -1318,6 +1318,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dsi1_dma_addrs[] = {
1318 .pa_end = 0x580041ff, 1318 .pa_end = 0x580041ff,
1319 .flags = ADDR_TYPE_RT 1319 .flags = ADDR_TYPE_RT
1320 }, 1320 },
1321 { }
1321}; 1322};
1322 1323
1323/* l3_main_2 -> dss_dsi1 */ 1324/* l3_main_2 -> dss_dsi1 */
@@ -1326,7 +1327,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dsi1 = {
1326 .slave = &omap44xx_dss_dsi1_hwmod, 1327 .slave = &omap44xx_dss_dsi1_hwmod,
1327 .clk = "l3_div_ck", 1328 .clk = "l3_div_ck",
1328 .addr = omap44xx_dss_dsi1_dma_addrs, 1329 .addr = omap44xx_dss_dsi1_dma_addrs,
1329 .addr_cnt = ARRAY_SIZE(omap44xx_dss_dsi1_dma_addrs),
1330 .user = OCP_USER_SDMA, 1330 .user = OCP_USER_SDMA,
1331}; 1331};
1332 1332
@@ -1336,6 +1336,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dsi1_addrs[] = {
1336 .pa_end = 0x480441ff, 1336 .pa_end = 0x480441ff,
1337 .flags = ADDR_TYPE_RT 1337 .flags = ADDR_TYPE_RT
1338 }, 1338 },
1339 { }
1339}; 1340};
1340 1341
1341/* l4_per -> dss_dsi1 */ 1342/* l4_per -> dss_dsi1 */
@@ -1344,7 +1345,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dsi1 = {
1344 .slave = &omap44xx_dss_dsi1_hwmod, 1345 .slave = &omap44xx_dss_dsi1_hwmod,
1345 .clk = "l4_div_ck", 1346 .clk = "l4_div_ck",
1346 .addr = omap44xx_dss_dsi1_addrs, 1347 .addr = omap44xx_dss_dsi1_addrs,
1347 .addr_cnt = ARRAY_SIZE(omap44xx_dss_dsi1_addrs),
1348 .user = OCP_USER_MPU, 1348 .user = OCP_USER_MPU,
1349}; 1349};
1350 1350
@@ -1388,6 +1388,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dsi2_dma_addrs[] = {
1388 .pa_end = 0x580051ff, 1388 .pa_end = 0x580051ff,
1389 .flags = ADDR_TYPE_RT 1389 .flags = ADDR_TYPE_RT
1390 }, 1390 },
1391 { }
1391}; 1392};
1392 1393
1393/* l3_main_2 -> dss_dsi2 */ 1394/* l3_main_2 -> dss_dsi2 */
@@ -1396,7 +1397,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dsi2 = {
1396 .slave = &omap44xx_dss_dsi2_hwmod, 1397 .slave = &omap44xx_dss_dsi2_hwmod,
1397 .clk = "l3_div_ck", 1398 .clk = "l3_div_ck",
1398 .addr = omap44xx_dss_dsi2_dma_addrs, 1399 .addr = omap44xx_dss_dsi2_dma_addrs,
1399 .addr_cnt = ARRAY_SIZE(omap44xx_dss_dsi2_dma_addrs),
1400 .user = OCP_USER_SDMA, 1400 .user = OCP_USER_SDMA,
1401}; 1401};
1402 1402
@@ -1406,6 +1406,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dsi2_addrs[] = {
1406 .pa_end = 0x480451ff, 1406 .pa_end = 0x480451ff,
1407 .flags = ADDR_TYPE_RT 1407 .flags = ADDR_TYPE_RT
1408 }, 1408 },
1409 { }
1409}; 1410};
1410 1411
1411/* l4_per -> dss_dsi2 */ 1412/* l4_per -> dss_dsi2 */
@@ -1414,7 +1415,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dsi2 = {
1414 .slave = &omap44xx_dss_dsi2_hwmod, 1415 .slave = &omap44xx_dss_dsi2_hwmod,
1415 .clk = "l4_div_ck", 1416 .clk = "l4_div_ck",
1416 .addr = omap44xx_dss_dsi2_addrs, 1417 .addr = omap44xx_dss_dsi2_addrs,
1417 .addr_cnt = ARRAY_SIZE(omap44xx_dss_dsi2_addrs),
1418 .user = OCP_USER_MPU, 1418 .user = OCP_USER_MPU,
1419}; 1419};
1420 1420
@@ -1478,6 +1478,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_hdmi_dma_addrs[] = {
1478 .pa_end = 0x58006fff, 1478 .pa_end = 0x58006fff,
1479 .flags = ADDR_TYPE_RT 1479 .flags = ADDR_TYPE_RT
1480 }, 1480 },
1481 { }
1481}; 1482};
1482 1483
1483/* l3_main_2 -> dss_hdmi */ 1484/* l3_main_2 -> dss_hdmi */
@@ -1486,7 +1487,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_hdmi = {
1486 .slave = &omap44xx_dss_hdmi_hwmod, 1487 .slave = &omap44xx_dss_hdmi_hwmod,
1487 .clk = "l3_div_ck", 1488 .clk = "l3_div_ck",
1488 .addr = omap44xx_dss_hdmi_dma_addrs, 1489 .addr = omap44xx_dss_hdmi_dma_addrs,
1489 .addr_cnt = ARRAY_SIZE(omap44xx_dss_hdmi_dma_addrs),
1490 .user = OCP_USER_SDMA, 1490 .user = OCP_USER_SDMA,
1491}; 1491};
1492 1492
@@ -1496,6 +1496,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_hdmi_addrs[] = {
1496 .pa_end = 0x48046fff, 1496 .pa_end = 0x48046fff,
1497 .flags = ADDR_TYPE_RT 1497 .flags = ADDR_TYPE_RT
1498 }, 1498 },
1499 { }
1499}; 1500};
1500 1501
1501/* l4_per -> dss_hdmi */ 1502/* l4_per -> dss_hdmi */
@@ -1504,7 +1505,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_hdmi = {
1504 .slave = &omap44xx_dss_hdmi_hwmod, 1505 .slave = &omap44xx_dss_hdmi_hwmod,
1505 .clk = "l4_div_ck", 1506 .clk = "l4_div_ck",
1506 .addr = omap44xx_dss_hdmi_addrs, 1507 .addr = omap44xx_dss_hdmi_addrs,
1507 .addr_cnt = ARRAY_SIZE(omap44xx_dss_hdmi_addrs),
1508 .user = OCP_USER_MPU, 1508 .user = OCP_USER_MPU,
1509}; 1509};
1510 1510
@@ -1564,6 +1564,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_rfbi_dma_addrs[] = {
1564 .pa_end = 0x580020ff, 1564 .pa_end = 0x580020ff,
1565 .flags = ADDR_TYPE_RT 1565 .flags = ADDR_TYPE_RT
1566 }, 1566 },
1567 { }
1567}; 1568};
1568 1569
1569/* l3_main_2 -> dss_rfbi */ 1570/* l3_main_2 -> dss_rfbi */
@@ -1572,7 +1573,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_rfbi = {
1572 .slave = &omap44xx_dss_rfbi_hwmod, 1573 .slave = &omap44xx_dss_rfbi_hwmod,
1573 .clk = "l3_div_ck", 1574 .clk = "l3_div_ck",
1574 .addr = omap44xx_dss_rfbi_dma_addrs, 1575 .addr = omap44xx_dss_rfbi_dma_addrs,
1575 .addr_cnt = ARRAY_SIZE(omap44xx_dss_rfbi_dma_addrs),
1576 .user = OCP_USER_SDMA, 1576 .user = OCP_USER_SDMA,
1577}; 1577};
1578 1578
@@ -1582,6 +1582,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_rfbi_addrs[] = {
1582 .pa_end = 0x480420ff, 1582 .pa_end = 0x480420ff,
1583 .flags = ADDR_TYPE_RT 1583 .flags = ADDR_TYPE_RT
1584 }, 1584 },
1585 { }
1585}; 1586};
1586 1587
1587/* l4_per -> dss_rfbi */ 1588/* l4_per -> dss_rfbi */
@@ -1590,7 +1591,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_rfbi = {
1590 .slave = &omap44xx_dss_rfbi_hwmod, 1591 .slave = &omap44xx_dss_rfbi_hwmod,
1591 .clk = "l4_div_ck", 1592 .clk = "l4_div_ck",
1592 .addr = omap44xx_dss_rfbi_addrs, 1593 .addr = omap44xx_dss_rfbi_addrs,
1593 .addr_cnt = ARRAY_SIZE(omap44xx_dss_rfbi_addrs),
1594 .user = OCP_USER_MPU, 1594 .user = OCP_USER_MPU,
1595}; 1595};
1596 1596
@@ -1633,6 +1633,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_venc_dma_addrs[] = {
1633 .pa_end = 0x580030ff, 1633 .pa_end = 0x580030ff,
1634 .flags = ADDR_TYPE_RT 1634 .flags = ADDR_TYPE_RT
1635 }, 1635 },
1636 { }
1636}; 1637};
1637 1638
1638/* l3_main_2 -> dss_venc */ 1639/* l3_main_2 -> dss_venc */
@@ -1641,7 +1642,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_venc = {
1641 .slave = &omap44xx_dss_venc_hwmod, 1642 .slave = &omap44xx_dss_venc_hwmod,
1642 .clk = "l3_div_ck", 1643 .clk = "l3_div_ck",
1643 .addr = omap44xx_dss_venc_dma_addrs, 1644 .addr = omap44xx_dss_venc_dma_addrs,
1644 .addr_cnt = ARRAY_SIZE(omap44xx_dss_venc_dma_addrs),
1645 .user = OCP_USER_SDMA, 1645 .user = OCP_USER_SDMA,
1646}; 1646};
1647 1647
@@ -1651,6 +1651,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_venc_addrs[] = {
1651 .pa_end = 0x480430ff, 1651 .pa_end = 0x480430ff,
1652 .flags = ADDR_TYPE_RT 1652 .flags = ADDR_TYPE_RT
1653 }, 1653 },
1654 { }
1654}; 1655};
1655 1656
1656/* l4_per -> dss_venc */ 1657/* l4_per -> dss_venc */
@@ -1659,7 +1660,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_venc = {
1659 .slave = &omap44xx_dss_venc_hwmod, 1660 .slave = &omap44xx_dss_venc_hwmod,
1660 .clk = "l4_div_ck", 1661 .clk = "l4_div_ck",
1661 .addr = omap44xx_dss_venc_addrs, 1662 .addr = omap44xx_dss_venc_addrs,
1662 .addr_cnt = ARRAY_SIZE(omap44xx_dss_venc_addrs),
1663 .user = OCP_USER_MPU, 1663 .user = OCP_USER_MPU,
1664}; 1664};
1665 1665
@@ -1724,6 +1724,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio1_addrs[] = {
1724 .pa_end = 0x4a3101ff, 1724 .pa_end = 0x4a3101ff,
1725 .flags = ADDR_TYPE_RT 1725 .flags = ADDR_TYPE_RT
1726 }, 1726 },
1727 { }
1727}; 1728};
1728 1729
1729/* l4_wkup -> gpio1 */ 1730/* l4_wkup -> gpio1 */
@@ -1732,7 +1733,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__gpio1 = {
1732 .slave = &omap44xx_gpio1_hwmod, 1733 .slave = &omap44xx_gpio1_hwmod,
1733 .clk = "l4_wkup_clk_mux_ck", 1734 .clk = "l4_wkup_clk_mux_ck",
1734 .addr = omap44xx_gpio1_addrs, 1735 .addr = omap44xx_gpio1_addrs,
1735 .addr_cnt = ARRAY_SIZE(omap44xx_gpio1_addrs),
1736 .user = OCP_USER_MPU | OCP_USER_SDMA, 1736 .user = OCP_USER_MPU | OCP_USER_SDMA,
1737}; 1737};
1738 1738
@@ -1776,6 +1776,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio2_addrs[] = {
1776 .pa_end = 0x480551ff, 1776 .pa_end = 0x480551ff,
1777 .flags = ADDR_TYPE_RT 1777 .flags = ADDR_TYPE_RT
1778 }, 1778 },
1779 { }
1779}; 1780};
1780 1781
1781/* l4_per -> gpio2 */ 1782/* l4_per -> gpio2 */
@@ -1784,7 +1785,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio2 = {
1784 .slave = &omap44xx_gpio2_hwmod, 1785 .slave = &omap44xx_gpio2_hwmod,
1785 .clk = "l4_div_ck", 1786 .clk = "l4_div_ck",
1786 .addr = omap44xx_gpio2_addrs, 1787 .addr = omap44xx_gpio2_addrs,
1787 .addr_cnt = ARRAY_SIZE(omap44xx_gpio2_addrs),
1788 .user = OCP_USER_MPU | OCP_USER_SDMA, 1788 .user = OCP_USER_MPU | OCP_USER_SDMA,
1789}; 1789};
1790 1790
@@ -1829,6 +1829,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio3_addrs[] = {
1829 .pa_end = 0x480571ff, 1829 .pa_end = 0x480571ff,
1830 .flags = ADDR_TYPE_RT 1830 .flags = ADDR_TYPE_RT
1831 }, 1831 },
1832 { }
1832}; 1833};
1833 1834
1834/* l4_per -> gpio3 */ 1835/* l4_per -> gpio3 */
@@ -1837,7 +1838,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio3 = {
1837 .slave = &omap44xx_gpio3_hwmod, 1838 .slave = &omap44xx_gpio3_hwmod,
1838 .clk = "l4_div_ck", 1839 .clk = "l4_div_ck",
1839 .addr = omap44xx_gpio3_addrs, 1840 .addr = omap44xx_gpio3_addrs,
1840 .addr_cnt = ARRAY_SIZE(omap44xx_gpio3_addrs),
1841 .user = OCP_USER_MPU | OCP_USER_SDMA, 1841 .user = OCP_USER_MPU | OCP_USER_SDMA,
1842}; 1842};
1843 1843
@@ -1882,6 +1882,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio4_addrs[] = {
1882 .pa_end = 0x480591ff, 1882 .pa_end = 0x480591ff,
1883 .flags = ADDR_TYPE_RT 1883 .flags = ADDR_TYPE_RT
1884 }, 1884 },
1885 { }
1885}; 1886};
1886 1887
1887/* l4_per -> gpio4 */ 1888/* l4_per -> gpio4 */
@@ -1890,7 +1891,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio4 = {
1890 .slave = &omap44xx_gpio4_hwmod, 1891 .slave = &omap44xx_gpio4_hwmod,
1891 .clk = "l4_div_ck", 1892 .clk = "l4_div_ck",
1892 .addr = omap44xx_gpio4_addrs, 1893 .addr = omap44xx_gpio4_addrs,
1893 .addr_cnt = ARRAY_SIZE(omap44xx_gpio4_addrs),
1894 .user = OCP_USER_MPU | OCP_USER_SDMA, 1894 .user = OCP_USER_MPU | OCP_USER_SDMA,
1895}; 1895};
1896 1896
@@ -1935,6 +1935,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio5_addrs[] = {
1935 .pa_end = 0x4805b1ff, 1935 .pa_end = 0x4805b1ff,
1936 .flags = ADDR_TYPE_RT 1936 .flags = ADDR_TYPE_RT
1937 }, 1937 },
1938 { }
1938}; 1939};
1939 1940
1940/* l4_per -> gpio5 */ 1941/* l4_per -> gpio5 */
@@ -1943,7 +1944,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio5 = {
1943 .slave = &omap44xx_gpio5_hwmod, 1944 .slave = &omap44xx_gpio5_hwmod,
1944 .clk = "l4_div_ck", 1945 .clk = "l4_div_ck",
1945 .addr = omap44xx_gpio5_addrs, 1946 .addr = omap44xx_gpio5_addrs,
1946 .addr_cnt = ARRAY_SIZE(omap44xx_gpio5_addrs),
1947 .user = OCP_USER_MPU | OCP_USER_SDMA, 1947 .user = OCP_USER_MPU | OCP_USER_SDMA,
1948}; 1948};
1949 1949
@@ -1988,6 +1988,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio6_addrs[] = {
1988 .pa_end = 0x4805d1ff, 1988 .pa_end = 0x4805d1ff,
1989 .flags = ADDR_TYPE_RT 1989 .flags = ADDR_TYPE_RT
1990 }, 1990 },
1991 { }
1991}; 1992};
1992 1993
1993/* l4_per -> gpio6 */ 1994/* l4_per -> gpio6 */
@@ -1996,7 +1997,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio6 = {
1996 .slave = &omap44xx_gpio6_hwmod, 1997 .slave = &omap44xx_gpio6_hwmod,
1997 .clk = "l4_div_ck", 1998 .clk = "l4_div_ck",
1998 .addr = omap44xx_gpio6_addrs, 1999 .addr = omap44xx_gpio6_addrs,
1999 .addr_cnt = ARRAY_SIZE(omap44xx_gpio6_addrs),
2000 .user = OCP_USER_MPU | OCP_USER_SDMA, 2000 .user = OCP_USER_MPU | OCP_USER_SDMA,
2001}; 2001};
2002 2002
@@ -2071,6 +2071,7 @@ static struct omap_hwmod_addr_space omap44xx_hsi_addrs[] = {
2071 .pa_end = 0x4a05bfff, 2071 .pa_end = 0x4a05bfff,
2072 .flags = ADDR_TYPE_RT 2072 .flags = ADDR_TYPE_RT
2073 }, 2073 },
2074 { }
2074}; 2075};
2075 2076
2076/* l4_cfg -> hsi */ 2077/* l4_cfg -> hsi */
@@ -2079,7 +2080,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__hsi = {
2079 .slave = &omap44xx_hsi_hwmod, 2080 .slave = &omap44xx_hsi_hwmod,
2080 .clk = "l4_div_ck", 2081 .clk = "l4_div_ck",
2081 .addr = omap44xx_hsi_addrs, 2082 .addr = omap44xx_hsi_addrs,
2082 .addr_cnt = ARRAY_SIZE(omap44xx_hsi_addrs),
2083 .user = OCP_USER_MPU | OCP_USER_SDMA, 2083 .user = OCP_USER_MPU | OCP_USER_SDMA,
2084}; 2084};
2085 2085
@@ -2144,6 +2144,7 @@ static struct omap_hwmod_addr_space omap44xx_i2c1_addrs[] = {
2144 .pa_end = 0x480700ff, 2144 .pa_end = 0x480700ff,
2145 .flags = ADDR_TYPE_RT 2145 .flags = ADDR_TYPE_RT
2146 }, 2146 },
2147 { }
2147}; 2148};
2148 2149
2149/* l4_per -> i2c1 */ 2150/* l4_per -> i2c1 */
@@ -2152,7 +2153,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c1 = {
2152 .slave = &omap44xx_i2c1_hwmod, 2153 .slave = &omap44xx_i2c1_hwmod,
2153 .clk = "l4_div_ck", 2154 .clk = "l4_div_ck",
2154 .addr = omap44xx_i2c1_addrs, 2155 .addr = omap44xx_i2c1_addrs,
2155 .addr_cnt = ARRAY_SIZE(omap44xx_i2c1_addrs),
2156 .user = OCP_USER_MPU | OCP_USER_SDMA, 2156 .user = OCP_USER_MPU | OCP_USER_SDMA,
2157}; 2157};
2158 2158
@@ -2197,6 +2197,7 @@ static struct omap_hwmod_addr_space omap44xx_i2c2_addrs[] = {
2197 .pa_end = 0x480720ff, 2197 .pa_end = 0x480720ff,
2198 .flags = ADDR_TYPE_RT 2198 .flags = ADDR_TYPE_RT
2199 }, 2199 },
2200 { }
2200}; 2201};
2201 2202
2202/* l4_per -> i2c2 */ 2203/* l4_per -> i2c2 */
@@ -2205,7 +2206,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c2 = {
2205 .slave = &omap44xx_i2c2_hwmod, 2206 .slave = &omap44xx_i2c2_hwmod,
2206 .clk = "l4_div_ck", 2207 .clk = "l4_div_ck",
2207 .addr = omap44xx_i2c2_addrs, 2208 .addr = omap44xx_i2c2_addrs,
2208 .addr_cnt = ARRAY_SIZE(omap44xx_i2c2_addrs),
2209 .user = OCP_USER_MPU | OCP_USER_SDMA, 2209 .user = OCP_USER_MPU | OCP_USER_SDMA,
2210}; 2210};
2211 2211
@@ -2250,6 +2250,7 @@ static struct omap_hwmod_addr_space omap44xx_i2c3_addrs[] = {
2250 .pa_end = 0x480600ff, 2250 .pa_end = 0x480600ff,
2251 .flags = ADDR_TYPE_RT 2251 .flags = ADDR_TYPE_RT
2252 }, 2252 },
2253 { }
2253}; 2254};
2254 2255
2255/* l4_per -> i2c3 */ 2256/* l4_per -> i2c3 */
@@ -2258,7 +2259,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c3 = {
2258 .slave = &omap44xx_i2c3_hwmod, 2259 .slave = &omap44xx_i2c3_hwmod,
2259 .clk = "l4_div_ck", 2260 .clk = "l4_div_ck",
2260 .addr = omap44xx_i2c3_addrs, 2261 .addr = omap44xx_i2c3_addrs,
2261 .addr_cnt = ARRAY_SIZE(omap44xx_i2c3_addrs),
2262 .user = OCP_USER_MPU | OCP_USER_SDMA, 2262 .user = OCP_USER_MPU | OCP_USER_SDMA,
2263}; 2263};
2264 2264
@@ -2303,6 +2303,7 @@ static struct omap_hwmod_addr_space omap44xx_i2c4_addrs[] = {
2303 .pa_end = 0x483500ff, 2303 .pa_end = 0x483500ff,
2304 .flags = ADDR_TYPE_RT 2304 .flags = ADDR_TYPE_RT
2305 }, 2305 },
2306 { }
2306}; 2307};
2307 2308
2308/* l4_per -> i2c4 */ 2309/* l4_per -> i2c4 */
@@ -2311,7 +2312,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c4 = {
2311 .slave = &omap44xx_i2c4_hwmod, 2312 .slave = &omap44xx_i2c4_hwmod,
2312 .clk = "l4_div_ck", 2313 .clk = "l4_div_ck",
2313 .addr = omap44xx_i2c4_addrs, 2314 .addr = omap44xx_i2c4_addrs,
2314 .addr_cnt = ARRAY_SIZE(omap44xx_i2c4_addrs),
2315 .user = OCP_USER_MPU | OCP_USER_SDMA, 2315 .user = OCP_USER_MPU | OCP_USER_SDMA,
2316}; 2316};
2317 2317
@@ -2478,6 +2478,7 @@ static struct omap_hwmod_addr_space omap44xx_iss_addrs[] = {
2478 .pa_end = 0x520000ff, 2478 .pa_end = 0x520000ff,
2479 .flags = ADDR_TYPE_RT 2479 .flags = ADDR_TYPE_RT
2480 }, 2480 },
2481 { }
2481}; 2482};
2482 2483
2483/* l3_main_2 -> iss */ 2484/* l3_main_2 -> iss */
@@ -2486,7 +2487,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__iss = {
2486 .slave = &omap44xx_iss_hwmod, 2487 .slave = &omap44xx_iss_hwmod,
2487 .clk = "l3_div_ck", 2488 .clk = "l3_div_ck",
2488 .addr = omap44xx_iss_addrs, 2489 .addr = omap44xx_iss_addrs,
2489 .addr_cnt = ARRAY_SIZE(omap44xx_iss_addrs),
2490 .user = OCP_USER_MPU | OCP_USER_SDMA, 2490 .user = OCP_USER_MPU | OCP_USER_SDMA,
2491}; 2491};
2492 2492
@@ -2561,6 +2561,7 @@ static struct omap_hwmod_addr_space omap44xx_iva_addrs[] = {
2561 .pa_end = 0x5a07ffff, 2561 .pa_end = 0x5a07ffff,
2562 .flags = ADDR_TYPE_RT 2562 .flags = ADDR_TYPE_RT
2563 }, 2563 },
2564 { }
2564}; 2565};
2565 2566
2566/* l3_main_2 -> iva */ 2567/* l3_main_2 -> iva */
@@ -2569,7 +2570,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__iva = {
2569 .slave = &omap44xx_iva_hwmod, 2570 .slave = &omap44xx_iva_hwmod,
2570 .clk = "l3_div_ck", 2571 .clk = "l3_div_ck",
2571 .addr = omap44xx_iva_addrs, 2572 .addr = omap44xx_iva_addrs,
2572 .addr_cnt = ARRAY_SIZE(omap44xx_iva_addrs),
2573 .user = OCP_USER_MPU, 2573 .user = OCP_USER_MPU,
2574}; 2574};
2575 2575
@@ -2664,6 +2664,7 @@ static struct omap_hwmod_addr_space omap44xx_kbd_addrs[] = {
2664 .pa_end = 0x4a31c07f, 2664 .pa_end = 0x4a31c07f,
2665 .flags = ADDR_TYPE_RT 2665 .flags = ADDR_TYPE_RT
2666 }, 2666 },
2667 { }
2667}; 2668};
2668 2669
2669/* l4_wkup -> kbd */ 2670/* l4_wkup -> kbd */
@@ -2672,7 +2673,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__kbd = {
2672 .slave = &omap44xx_kbd_hwmod, 2673 .slave = &omap44xx_kbd_hwmod,
2673 .clk = "l4_wkup_clk_mux_ck", 2674 .clk = "l4_wkup_clk_mux_ck",
2674 .addr = omap44xx_kbd_addrs, 2675 .addr = omap44xx_kbd_addrs,
2675 .addr_cnt = ARRAY_SIZE(omap44xx_kbd_addrs),
2676 .user = OCP_USER_MPU | OCP_USER_SDMA, 2676 .user = OCP_USER_MPU | OCP_USER_SDMA,
2677}; 2677};
2678 2678
@@ -2729,6 +2729,7 @@ static struct omap_hwmod_addr_space omap44xx_mailbox_addrs[] = {
2729 .pa_end = 0x4a0f41ff, 2729 .pa_end = 0x4a0f41ff,
2730 .flags = ADDR_TYPE_RT 2730 .flags = ADDR_TYPE_RT
2731 }, 2731 },
2732 { }
2732}; 2733};
2733 2734
2734/* l4_cfg -> mailbox */ 2735/* l4_cfg -> mailbox */
@@ -2737,7 +2738,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__mailbox = {
2737 .slave = &omap44xx_mailbox_hwmod, 2738 .slave = &omap44xx_mailbox_hwmod,
2738 .clk = "l4_div_ck", 2739 .clk = "l4_div_ck",
2739 .addr = omap44xx_mailbox_addrs, 2740 .addr = omap44xx_mailbox_addrs,
2740 .addr_cnt = ARRAY_SIZE(omap44xx_mailbox_addrs),
2741 .user = OCP_USER_MPU | OCP_USER_SDMA, 2741 .user = OCP_USER_MPU | OCP_USER_SDMA,
2742}; 2742};
2743 2743
@@ -2798,6 +2798,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp1_addrs[] = {
2798 .pa_end = 0x401220ff, 2798 .pa_end = 0x401220ff,
2799 .flags = ADDR_TYPE_RT 2799 .flags = ADDR_TYPE_RT
2800 }, 2800 },
2801 { }
2801}; 2802};
2802 2803
2803/* l4_abe -> mcbsp1 */ 2804/* l4_abe -> mcbsp1 */
@@ -2806,7 +2807,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp1 = {
2806 .slave = &omap44xx_mcbsp1_hwmod, 2807 .slave = &omap44xx_mcbsp1_hwmod,
2807 .clk = "ocp_abe_iclk", 2808 .clk = "ocp_abe_iclk",
2808 .addr = omap44xx_mcbsp1_addrs, 2809 .addr = omap44xx_mcbsp1_addrs,
2809 .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp1_addrs),
2810 .user = OCP_USER_MPU, 2810 .user = OCP_USER_MPU,
2811}; 2811};
2812 2812
@@ -2817,6 +2817,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp1_dma_addrs[] = {
2817 .pa_end = 0x490220ff, 2817 .pa_end = 0x490220ff,
2818 .flags = ADDR_TYPE_RT 2818 .flags = ADDR_TYPE_RT
2819 }, 2819 },
2820 { }
2820}; 2821};
2821 2822
2822/* l4_abe -> mcbsp1 (dma) */ 2823/* l4_abe -> mcbsp1 (dma) */
@@ -2825,7 +2826,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp1_dma = {
2825 .slave = &omap44xx_mcbsp1_hwmod, 2826 .slave = &omap44xx_mcbsp1_hwmod,
2826 .clk = "ocp_abe_iclk", 2827 .clk = "ocp_abe_iclk",
2827 .addr = omap44xx_mcbsp1_dma_addrs, 2828 .addr = omap44xx_mcbsp1_dma_addrs,
2828 .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp1_dma_addrs),
2829 .user = OCP_USER_SDMA, 2829 .user = OCP_USER_SDMA,
2830}; 2830};
2831 2831
@@ -2871,6 +2871,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp2_addrs[] = {
2871 .pa_end = 0x401240ff, 2871 .pa_end = 0x401240ff,
2872 .flags = ADDR_TYPE_RT 2872 .flags = ADDR_TYPE_RT
2873 }, 2873 },
2874 { }
2874}; 2875};
2875 2876
2876/* l4_abe -> mcbsp2 */ 2877/* l4_abe -> mcbsp2 */
@@ -2879,7 +2880,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp2 = {
2879 .slave = &omap44xx_mcbsp2_hwmod, 2880 .slave = &omap44xx_mcbsp2_hwmod,
2880 .clk = "ocp_abe_iclk", 2881 .clk = "ocp_abe_iclk",
2881 .addr = omap44xx_mcbsp2_addrs, 2882 .addr = omap44xx_mcbsp2_addrs,
2882 .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp2_addrs),
2883 .user = OCP_USER_MPU, 2883 .user = OCP_USER_MPU,
2884}; 2884};
2885 2885
@@ -2890,6 +2890,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp2_dma_addrs[] = {
2890 .pa_end = 0x490240ff, 2890 .pa_end = 0x490240ff,
2891 .flags = ADDR_TYPE_RT 2891 .flags = ADDR_TYPE_RT
2892 }, 2892 },
2893 { }
2893}; 2894};
2894 2895
2895/* l4_abe -> mcbsp2 (dma) */ 2896/* l4_abe -> mcbsp2 (dma) */
@@ -2898,7 +2899,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp2_dma = {
2898 .slave = &omap44xx_mcbsp2_hwmod, 2899 .slave = &omap44xx_mcbsp2_hwmod,
2899 .clk = "ocp_abe_iclk", 2900 .clk = "ocp_abe_iclk",
2900 .addr = omap44xx_mcbsp2_dma_addrs, 2901 .addr = omap44xx_mcbsp2_dma_addrs,
2901 .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp2_dma_addrs),
2902 .user = OCP_USER_SDMA, 2902 .user = OCP_USER_SDMA,
2903}; 2903};
2904 2904
@@ -2944,6 +2944,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp3_addrs[] = {
2944 .pa_end = 0x401260ff, 2944 .pa_end = 0x401260ff,
2945 .flags = ADDR_TYPE_RT 2945 .flags = ADDR_TYPE_RT
2946 }, 2946 },
2947 { }
2947}; 2948};
2948 2949
2949/* l4_abe -> mcbsp3 */ 2950/* l4_abe -> mcbsp3 */
@@ -2952,7 +2953,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp3 = {
2952 .slave = &omap44xx_mcbsp3_hwmod, 2953 .slave = &omap44xx_mcbsp3_hwmod,
2953 .clk = "ocp_abe_iclk", 2954 .clk = "ocp_abe_iclk",
2954 .addr = omap44xx_mcbsp3_addrs, 2955 .addr = omap44xx_mcbsp3_addrs,
2955 .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp3_addrs),
2956 .user = OCP_USER_MPU, 2956 .user = OCP_USER_MPU,
2957}; 2957};
2958 2958
@@ -2963,6 +2963,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp3_dma_addrs[] = {
2963 .pa_end = 0x490260ff, 2963 .pa_end = 0x490260ff,
2964 .flags = ADDR_TYPE_RT 2964 .flags = ADDR_TYPE_RT
2965 }, 2965 },
2966 { }
2966}; 2967};
2967 2968
2968/* l4_abe -> mcbsp3 (dma) */ 2969/* l4_abe -> mcbsp3 (dma) */
@@ -2971,7 +2972,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp3_dma = {
2971 .slave = &omap44xx_mcbsp3_hwmod, 2972 .slave = &omap44xx_mcbsp3_hwmod,
2972 .clk = "ocp_abe_iclk", 2973 .clk = "ocp_abe_iclk",
2973 .addr = omap44xx_mcbsp3_dma_addrs, 2974 .addr = omap44xx_mcbsp3_dma_addrs,
2974 .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp3_dma_addrs),
2975 .user = OCP_USER_SDMA, 2975 .user = OCP_USER_SDMA,
2976}; 2976};
2977 2977
@@ -3016,6 +3016,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp4_addrs[] = {
3016 .pa_end = 0x480960ff, 3016 .pa_end = 0x480960ff,
3017 .flags = ADDR_TYPE_RT 3017 .flags = ADDR_TYPE_RT
3018 }, 3018 },
3019 { }
3019}; 3020};
3020 3021
3021/* l4_per -> mcbsp4 */ 3022/* l4_per -> mcbsp4 */
@@ -3024,7 +3025,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcbsp4 = {
3024 .slave = &omap44xx_mcbsp4_hwmod, 3025 .slave = &omap44xx_mcbsp4_hwmod,
3025 .clk = "l4_div_ck", 3026 .clk = "l4_div_ck",
3026 .addr = omap44xx_mcbsp4_addrs, 3027 .addr = omap44xx_mcbsp4_addrs,
3027 .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp4_addrs),
3028 .user = OCP_USER_MPU | OCP_USER_SDMA, 3028 .user = OCP_USER_MPU | OCP_USER_SDMA,
3029}; 3029};
3030 3030
@@ -3089,6 +3089,7 @@ static struct omap_hwmod_addr_space omap44xx_mcpdm_addrs[] = {
3089 .pa_end = 0x4013207f, 3089 .pa_end = 0x4013207f,
3090 .flags = ADDR_TYPE_RT 3090 .flags = ADDR_TYPE_RT
3091 }, 3091 },
3092 { }
3092}; 3093};
3093 3094
3094/* l4_abe -> mcpdm */ 3095/* l4_abe -> mcpdm */
@@ -3097,7 +3098,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcpdm = {
3097 .slave = &omap44xx_mcpdm_hwmod, 3098 .slave = &omap44xx_mcpdm_hwmod,
3098 .clk = "ocp_abe_iclk", 3099 .clk = "ocp_abe_iclk",
3099 .addr = omap44xx_mcpdm_addrs, 3100 .addr = omap44xx_mcpdm_addrs,
3100 .addr_cnt = ARRAY_SIZE(omap44xx_mcpdm_addrs),
3101 .user = OCP_USER_MPU, 3101 .user = OCP_USER_MPU,
3102}; 3102};
3103 3103
@@ -3107,6 +3107,7 @@ static struct omap_hwmod_addr_space omap44xx_mcpdm_dma_addrs[] = {
3107 .pa_end = 0x4903207f, 3107 .pa_end = 0x4903207f,
3108 .flags = ADDR_TYPE_RT 3108 .flags = ADDR_TYPE_RT
3109 }, 3109 },
3110 { }
3110}; 3111};
3111 3112
3112/* l4_abe -> mcpdm (dma) */ 3113/* l4_abe -> mcpdm (dma) */
@@ -3115,7 +3116,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcpdm_dma = {
3115 .slave = &omap44xx_mcpdm_hwmod, 3116 .slave = &omap44xx_mcpdm_hwmod,
3116 .clk = "ocp_abe_iclk", 3117 .clk = "ocp_abe_iclk",
3117 .addr = omap44xx_mcpdm_dma_addrs, 3118 .addr = omap44xx_mcpdm_dma_addrs,
3118 .addr_cnt = ARRAY_SIZE(omap44xx_mcpdm_dma_addrs),
3119 .user = OCP_USER_SDMA, 3119 .user = OCP_USER_SDMA,
3120}; 3120};
3121 3121
@@ -3188,6 +3188,7 @@ static struct omap_hwmod_addr_space omap44xx_mcspi1_addrs[] = {
3188 .pa_end = 0x480981ff, 3188 .pa_end = 0x480981ff,
3189 .flags = ADDR_TYPE_RT 3189 .flags = ADDR_TYPE_RT
3190 }, 3190 },
3191 { }
3191}; 3192};
3192 3193
3193/* l4_per -> mcspi1 */ 3194/* l4_per -> mcspi1 */
@@ -3196,7 +3197,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi1 = {
3196 .slave = &omap44xx_mcspi1_hwmod, 3197 .slave = &omap44xx_mcspi1_hwmod,
3197 .clk = "l4_div_ck", 3198 .clk = "l4_div_ck",
3198 .addr = omap44xx_mcspi1_addrs, 3199 .addr = omap44xx_mcspi1_addrs,
3199 .addr_cnt = ARRAY_SIZE(omap44xx_mcspi1_addrs),
3200 .user = OCP_USER_MPU | OCP_USER_SDMA, 3200 .user = OCP_USER_MPU | OCP_USER_SDMA,
3201}; 3201};
3202 3202
@@ -3248,6 +3248,7 @@ static struct omap_hwmod_addr_space omap44xx_mcspi2_addrs[] = {
3248 .pa_end = 0x4809a1ff, 3248 .pa_end = 0x4809a1ff,
3249 .flags = ADDR_TYPE_RT 3249 .flags = ADDR_TYPE_RT
3250 }, 3250 },
3251 { }
3251}; 3252};
3252 3253
3253/* l4_per -> mcspi2 */ 3254/* l4_per -> mcspi2 */
@@ -3256,7 +3257,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi2 = {
3256 .slave = &omap44xx_mcspi2_hwmod, 3257 .slave = &omap44xx_mcspi2_hwmod,
3257 .clk = "l4_div_ck", 3258 .clk = "l4_div_ck",
3258 .addr = omap44xx_mcspi2_addrs, 3259 .addr = omap44xx_mcspi2_addrs,
3259 .addr_cnt = ARRAY_SIZE(omap44xx_mcspi2_addrs),
3260 .user = OCP_USER_MPU | OCP_USER_SDMA, 3260 .user = OCP_USER_MPU | OCP_USER_SDMA,
3261}; 3261};
3262 3262
@@ -3308,6 +3308,7 @@ static struct omap_hwmod_addr_space omap44xx_mcspi3_addrs[] = {
3308 .pa_end = 0x480b81ff, 3308 .pa_end = 0x480b81ff,
3309 .flags = ADDR_TYPE_RT 3309 .flags = ADDR_TYPE_RT
3310 }, 3310 },
3311 { }
3311}; 3312};
3312 3313
3313/* l4_per -> mcspi3 */ 3314/* l4_per -> mcspi3 */
@@ -3316,7 +3317,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi3 = {
3316 .slave = &omap44xx_mcspi3_hwmod, 3317 .slave = &omap44xx_mcspi3_hwmod,
3317 .clk = "l4_div_ck", 3318 .clk = "l4_div_ck",
3318 .addr = omap44xx_mcspi3_addrs, 3319 .addr = omap44xx_mcspi3_addrs,
3319 .addr_cnt = ARRAY_SIZE(omap44xx_mcspi3_addrs),
3320 .user = OCP_USER_MPU | OCP_USER_SDMA, 3320 .user = OCP_USER_MPU | OCP_USER_SDMA,
3321}; 3321};
3322 3322
@@ -3366,6 +3366,7 @@ static struct omap_hwmod_addr_space omap44xx_mcspi4_addrs[] = {
3366 .pa_end = 0x480ba1ff, 3366 .pa_end = 0x480ba1ff,
3367 .flags = ADDR_TYPE_RT 3367 .flags = ADDR_TYPE_RT
3368 }, 3368 },
3369 { }
3369}; 3370};
3370 3371
3371/* l4_per -> mcspi4 */ 3372/* l4_per -> mcspi4 */
@@ -3374,7 +3375,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi4 = {
3374 .slave = &omap44xx_mcspi4_hwmod, 3375 .slave = &omap44xx_mcspi4_hwmod,
3375 .clk = "l4_div_ck", 3376 .clk = "l4_div_ck",
3376 .addr = omap44xx_mcspi4_addrs, 3377 .addr = omap44xx_mcspi4_addrs,
3377 .addr_cnt = ARRAY_SIZE(omap44xx_mcspi4_addrs),
3378 .user = OCP_USER_MPU | OCP_USER_SDMA, 3378 .user = OCP_USER_MPU | OCP_USER_SDMA,
3379}; 3379};
3380 3380
@@ -3451,6 +3451,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc1_addrs[] = {
3451 .pa_end = 0x4809c3ff, 3451 .pa_end = 0x4809c3ff,
3452 .flags = ADDR_TYPE_RT 3452 .flags = ADDR_TYPE_RT
3453 }, 3453 },
3454 { }
3454}; 3455};
3455 3456
3456/* l4_per -> mmc1 */ 3457/* l4_per -> mmc1 */
@@ -3459,7 +3460,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc1 = {
3459 .slave = &omap44xx_mmc1_hwmod, 3460 .slave = &omap44xx_mmc1_hwmod,
3460 .clk = "l4_div_ck", 3461 .clk = "l4_div_ck",
3461 .addr = omap44xx_mmc1_addrs, 3462 .addr = omap44xx_mmc1_addrs,
3462 .addr_cnt = ARRAY_SIZE(omap44xx_mmc1_addrs),
3463 .user = OCP_USER_MPU | OCP_USER_SDMA, 3463 .user = OCP_USER_MPU | OCP_USER_SDMA,
3464}; 3464};
3465 3465
@@ -3515,6 +3515,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc2_addrs[] = {
3515 .pa_end = 0x480b43ff, 3515 .pa_end = 0x480b43ff,
3516 .flags = ADDR_TYPE_RT 3516 .flags = ADDR_TYPE_RT
3517 }, 3517 },
3518 { }
3518}; 3519};
3519 3520
3520/* l4_per -> mmc2 */ 3521/* l4_per -> mmc2 */
@@ -3523,7 +3524,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc2 = {
3523 .slave = &omap44xx_mmc2_hwmod, 3524 .slave = &omap44xx_mmc2_hwmod,
3524 .clk = "l4_div_ck", 3525 .clk = "l4_div_ck",
3525 .addr = omap44xx_mmc2_addrs, 3526 .addr = omap44xx_mmc2_addrs,
3526 .addr_cnt = ARRAY_SIZE(omap44xx_mmc2_addrs),
3527 .user = OCP_USER_MPU | OCP_USER_SDMA, 3527 .user = OCP_USER_MPU | OCP_USER_SDMA,
3528}; 3528};
3529 3529
@@ -3569,6 +3569,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc3_addrs[] = {
3569 .pa_end = 0x480ad3ff, 3569 .pa_end = 0x480ad3ff,
3570 .flags = ADDR_TYPE_RT 3570 .flags = ADDR_TYPE_RT
3571 }, 3571 },
3572 { }
3572}; 3573};
3573 3574
3574/* l4_per -> mmc3 */ 3575/* l4_per -> mmc3 */
@@ -3577,7 +3578,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc3 = {
3577 .slave = &omap44xx_mmc3_hwmod, 3578 .slave = &omap44xx_mmc3_hwmod,
3578 .clk = "l4_div_ck", 3579 .clk = "l4_div_ck",
3579 .addr = omap44xx_mmc3_addrs, 3580 .addr = omap44xx_mmc3_addrs,
3580 .addr_cnt = ARRAY_SIZE(omap44xx_mmc3_addrs),
3581 .user = OCP_USER_MPU | OCP_USER_SDMA, 3581 .user = OCP_USER_MPU | OCP_USER_SDMA,
3582}; 3582};
3583 3583
@@ -3621,6 +3621,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc4_addrs[] = {
3621 .pa_end = 0x480d13ff, 3621 .pa_end = 0x480d13ff,
3622 .flags = ADDR_TYPE_RT 3622 .flags = ADDR_TYPE_RT
3623 }, 3623 },
3624 { }
3624}; 3625};
3625 3626
3626/* l4_per -> mmc4 */ 3627/* l4_per -> mmc4 */
@@ -3629,7 +3630,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc4 = {
3629 .slave = &omap44xx_mmc4_hwmod, 3630 .slave = &omap44xx_mmc4_hwmod,
3630 .clk = "l4_div_ck", 3631 .clk = "l4_div_ck",
3631 .addr = omap44xx_mmc4_addrs, 3632 .addr = omap44xx_mmc4_addrs,
3632 .addr_cnt = ARRAY_SIZE(omap44xx_mmc4_addrs),
3633 .user = OCP_USER_MPU | OCP_USER_SDMA, 3633 .user = OCP_USER_MPU | OCP_USER_SDMA,
3634}; 3634};
3635 3635
@@ -3673,6 +3673,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc5_addrs[] = {
3673 .pa_end = 0x480d53ff, 3673 .pa_end = 0x480d53ff,
3674 .flags = ADDR_TYPE_RT 3674 .flags = ADDR_TYPE_RT
3675 }, 3675 },
3676 { }
3676}; 3677};
3677 3678
3678/* l4_per -> mmc5 */ 3679/* l4_per -> mmc5 */
@@ -3681,7 +3682,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc5 = {
3681 .slave = &omap44xx_mmc5_hwmod, 3682 .slave = &omap44xx_mmc5_hwmod,
3682 .clk = "l4_div_ck", 3683 .clk = "l4_div_ck",
3683 .addr = omap44xx_mmc5_addrs, 3684 .addr = omap44xx_mmc5_addrs,
3684 .addr_cnt = ARRAY_SIZE(omap44xx_mmc5_addrs),
3685 .user = OCP_USER_MPU | OCP_USER_SDMA, 3685 .user = OCP_USER_MPU | OCP_USER_SDMA,
3686}; 3686};
3687 3687
@@ -3786,6 +3786,7 @@ static struct omap_hwmod_addr_space omap44xx_smartreflex_core_addrs[] = {
3786 .pa_end = 0x4a0dd03f, 3786 .pa_end = 0x4a0dd03f,
3787 .flags = ADDR_TYPE_RT 3787 .flags = ADDR_TYPE_RT
3788 }, 3788 },
3789 { }
3789}; 3790};
3790 3791
3791/* l4_cfg -> smartreflex_core */ 3792/* l4_cfg -> smartreflex_core */
@@ -3794,7 +3795,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__smartreflex_core = {
3794 .slave = &omap44xx_smartreflex_core_hwmod, 3795 .slave = &omap44xx_smartreflex_core_hwmod,
3795 .clk = "l4_div_ck", 3796 .clk = "l4_div_ck",
3796 .addr = omap44xx_smartreflex_core_addrs, 3797 .addr = omap44xx_smartreflex_core_addrs,
3797 .addr_cnt = ARRAY_SIZE(omap44xx_smartreflex_core_addrs),
3798 .user = OCP_USER_MPU | OCP_USER_SDMA, 3798 .user = OCP_USER_MPU | OCP_USER_SDMA,
3799}; 3799};
3800 3800
@@ -3832,6 +3832,7 @@ static struct omap_hwmod_addr_space omap44xx_smartreflex_iva_addrs[] = {
3832 .pa_end = 0x4a0db03f, 3832 .pa_end = 0x4a0db03f,
3833 .flags = ADDR_TYPE_RT 3833 .flags = ADDR_TYPE_RT
3834 }, 3834 },
3835 { }
3835}; 3836};
3836 3837
3837/* l4_cfg -> smartreflex_iva */ 3838/* l4_cfg -> smartreflex_iva */
@@ -3840,7 +3841,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__smartreflex_iva = {
3840 .slave = &omap44xx_smartreflex_iva_hwmod, 3841 .slave = &omap44xx_smartreflex_iva_hwmod,
3841 .clk = "l4_div_ck", 3842 .clk = "l4_div_ck",
3842 .addr = omap44xx_smartreflex_iva_addrs, 3843 .addr = omap44xx_smartreflex_iva_addrs,
3843 .addr_cnt = ARRAY_SIZE(omap44xx_smartreflex_iva_addrs),
3844 .user = OCP_USER_MPU | OCP_USER_SDMA, 3844 .user = OCP_USER_MPU | OCP_USER_SDMA,
3845}; 3845};
3846 3846
@@ -3878,6 +3878,7 @@ static struct omap_hwmod_addr_space omap44xx_smartreflex_mpu_addrs[] = {
3878 .pa_end = 0x4a0d903f, 3878 .pa_end = 0x4a0d903f,
3879 .flags = ADDR_TYPE_RT 3879 .flags = ADDR_TYPE_RT
3880 }, 3880 },
3881 { }
3881}; 3882};
3882 3883
3883/* l4_cfg -> smartreflex_mpu */ 3884/* l4_cfg -> smartreflex_mpu */
@@ -3886,7 +3887,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__smartreflex_mpu = {
3886 .slave = &omap44xx_smartreflex_mpu_hwmod, 3887 .slave = &omap44xx_smartreflex_mpu_hwmod,
3887 .clk = "l4_div_ck", 3888 .clk = "l4_div_ck",
3888 .addr = omap44xx_smartreflex_mpu_addrs, 3889 .addr = omap44xx_smartreflex_mpu_addrs,
3889 .addr_cnt = ARRAY_SIZE(omap44xx_smartreflex_mpu_addrs),
3890 .user = OCP_USER_MPU | OCP_USER_SDMA, 3890 .user = OCP_USER_MPU | OCP_USER_SDMA,
3891}; 3891};
3892 3892
@@ -3943,6 +3943,7 @@ static struct omap_hwmod_addr_space omap44xx_spinlock_addrs[] = {
3943 .pa_end = 0x4a0f6fff, 3943 .pa_end = 0x4a0f6fff,
3944 .flags = ADDR_TYPE_RT 3944 .flags = ADDR_TYPE_RT
3945 }, 3945 },
3946 { }
3946}; 3947};
3947 3948
3948/* l4_cfg -> spinlock */ 3949/* l4_cfg -> spinlock */
@@ -3951,7 +3952,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__spinlock = {
3951 .slave = &omap44xx_spinlock_hwmod, 3952 .slave = &omap44xx_spinlock_hwmod,
3952 .clk = "l4_div_ck", 3953 .clk = "l4_div_ck",
3953 .addr = omap44xx_spinlock_addrs, 3954 .addr = omap44xx_spinlock_addrs,
3954 .addr_cnt = ARRAY_SIZE(omap44xx_spinlock_addrs),
3955 .user = OCP_USER_MPU | OCP_USER_SDMA, 3955 .user = OCP_USER_MPU | OCP_USER_SDMA,
3956}; 3956};
3957 3957
@@ -4023,6 +4023,7 @@ static struct omap_hwmod_addr_space omap44xx_timer1_addrs[] = {
4023 .pa_end = 0x4a31807f, 4023 .pa_end = 0x4a31807f,
4024 .flags = ADDR_TYPE_RT 4024 .flags = ADDR_TYPE_RT
4025 }, 4025 },
4026 { }
4026}; 4027};
4027 4028
4028/* l4_wkup -> timer1 */ 4029/* l4_wkup -> timer1 */
@@ -4031,7 +4032,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__timer1 = {
4031 .slave = &omap44xx_timer1_hwmod, 4032 .slave = &omap44xx_timer1_hwmod,
4032 .clk = "l4_wkup_clk_mux_ck", 4033 .clk = "l4_wkup_clk_mux_ck",
4033 .addr = omap44xx_timer1_addrs, 4034 .addr = omap44xx_timer1_addrs,
4034 .addr_cnt = ARRAY_SIZE(omap44xx_timer1_addrs),
4035 .user = OCP_USER_MPU | OCP_USER_SDMA, 4035 .user = OCP_USER_MPU | OCP_USER_SDMA,
4036}; 4036};
4037 4037
@@ -4068,6 +4068,7 @@ static struct omap_hwmod_addr_space omap44xx_timer2_addrs[] = {
4068 .pa_end = 0x4803207f, 4068 .pa_end = 0x4803207f,
4069 .flags = ADDR_TYPE_RT 4069 .flags = ADDR_TYPE_RT
4070 }, 4070 },
4071 { }
4071}; 4072};
4072 4073
4073/* l4_per -> timer2 */ 4074/* l4_per -> timer2 */
@@ -4076,7 +4077,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer2 = {
4076 .slave = &omap44xx_timer2_hwmod, 4077 .slave = &omap44xx_timer2_hwmod,
4077 .clk = "l4_div_ck", 4078 .clk = "l4_div_ck",
4078 .addr = omap44xx_timer2_addrs, 4079 .addr = omap44xx_timer2_addrs,
4079 .addr_cnt = ARRAY_SIZE(omap44xx_timer2_addrs),
4080 .user = OCP_USER_MPU | OCP_USER_SDMA, 4080 .user = OCP_USER_MPU | OCP_USER_SDMA,
4081}; 4081};
4082 4082
@@ -4113,6 +4113,7 @@ static struct omap_hwmod_addr_space omap44xx_timer3_addrs[] = {
4113 .pa_end = 0x4803407f, 4113 .pa_end = 0x4803407f,
4114 .flags = ADDR_TYPE_RT 4114 .flags = ADDR_TYPE_RT
4115 }, 4115 },
4116 { }
4116}; 4117};
4117 4118
4118/* l4_per -> timer3 */ 4119/* l4_per -> timer3 */
@@ -4121,7 +4122,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer3 = {
4121 .slave = &omap44xx_timer3_hwmod, 4122 .slave = &omap44xx_timer3_hwmod,
4122 .clk = "l4_div_ck", 4123 .clk = "l4_div_ck",
4123 .addr = omap44xx_timer3_addrs, 4124 .addr = omap44xx_timer3_addrs,
4124 .addr_cnt = ARRAY_SIZE(omap44xx_timer3_addrs),
4125 .user = OCP_USER_MPU | OCP_USER_SDMA, 4125 .user = OCP_USER_MPU | OCP_USER_SDMA,
4126}; 4126};
4127 4127
@@ -4158,6 +4158,7 @@ static struct omap_hwmod_addr_space omap44xx_timer4_addrs[] = {
4158 .pa_end = 0x4803607f, 4158 .pa_end = 0x4803607f,
4159 .flags = ADDR_TYPE_RT 4159 .flags = ADDR_TYPE_RT
4160 }, 4160 },
4161 { }
4161}; 4162};
4162 4163
4163/* l4_per -> timer4 */ 4164/* l4_per -> timer4 */
@@ -4166,7 +4167,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer4 = {
4166 .slave = &omap44xx_timer4_hwmod, 4167 .slave = &omap44xx_timer4_hwmod,
4167 .clk = "l4_div_ck", 4168 .clk = "l4_div_ck",
4168 .addr = omap44xx_timer4_addrs, 4169 .addr = omap44xx_timer4_addrs,
4169 .addr_cnt = ARRAY_SIZE(omap44xx_timer4_addrs),
4170 .user = OCP_USER_MPU | OCP_USER_SDMA, 4170 .user = OCP_USER_MPU | OCP_USER_SDMA,
4171}; 4171};
4172 4172
@@ -4203,6 +4203,7 @@ static struct omap_hwmod_addr_space omap44xx_timer5_addrs[] = {
4203 .pa_end = 0x4013807f, 4203 .pa_end = 0x4013807f,
4204 .flags = ADDR_TYPE_RT 4204 .flags = ADDR_TYPE_RT
4205 }, 4205 },
4206 { }
4206}; 4207};
4207 4208
4208/* l4_abe -> timer5 */ 4209/* l4_abe -> timer5 */
@@ -4211,7 +4212,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer5 = {
4211 .slave = &omap44xx_timer5_hwmod, 4212 .slave = &omap44xx_timer5_hwmod,
4212 .clk = "ocp_abe_iclk", 4213 .clk = "ocp_abe_iclk",
4213 .addr = omap44xx_timer5_addrs, 4214 .addr = omap44xx_timer5_addrs,
4214 .addr_cnt = ARRAY_SIZE(omap44xx_timer5_addrs),
4215 .user = OCP_USER_MPU, 4215 .user = OCP_USER_MPU,
4216}; 4216};
4217 4217
@@ -4221,6 +4221,7 @@ static struct omap_hwmod_addr_space omap44xx_timer5_dma_addrs[] = {
4221 .pa_end = 0x4903807f, 4221 .pa_end = 0x4903807f,
4222 .flags = ADDR_TYPE_RT 4222 .flags = ADDR_TYPE_RT
4223 }, 4223 },
4224 { }
4224}; 4225};
4225 4226
4226/* l4_abe -> timer5 (dma) */ 4227/* l4_abe -> timer5 (dma) */
@@ -4229,7 +4230,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer5_dma = {
4229 .slave = &omap44xx_timer5_hwmod, 4230 .slave = &omap44xx_timer5_hwmod,
4230 .clk = "ocp_abe_iclk", 4231 .clk = "ocp_abe_iclk",
4231 .addr = omap44xx_timer5_dma_addrs, 4232 .addr = omap44xx_timer5_dma_addrs,
4232 .addr_cnt = ARRAY_SIZE(omap44xx_timer5_dma_addrs),
4233 .user = OCP_USER_SDMA, 4233 .user = OCP_USER_SDMA,
4234}; 4234};
4235 4235
@@ -4267,6 +4267,7 @@ static struct omap_hwmod_addr_space omap44xx_timer6_addrs[] = {
4267 .pa_end = 0x4013a07f, 4267 .pa_end = 0x4013a07f,
4268 .flags = ADDR_TYPE_RT 4268 .flags = ADDR_TYPE_RT
4269 }, 4269 },
4270 { }
4270}; 4271};
4271 4272
4272/* l4_abe -> timer6 */ 4273/* l4_abe -> timer6 */
@@ -4275,7 +4276,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer6 = {
4275 .slave = &omap44xx_timer6_hwmod, 4276 .slave = &omap44xx_timer6_hwmod,
4276 .clk = "ocp_abe_iclk", 4277 .clk = "ocp_abe_iclk",
4277 .addr = omap44xx_timer6_addrs, 4278 .addr = omap44xx_timer6_addrs,
4278 .addr_cnt = ARRAY_SIZE(omap44xx_timer6_addrs),
4279 .user = OCP_USER_MPU, 4279 .user = OCP_USER_MPU,
4280}; 4280};
4281 4281
@@ -4285,6 +4285,7 @@ static struct omap_hwmod_addr_space omap44xx_timer6_dma_addrs[] = {
4285 .pa_end = 0x4903a07f, 4285 .pa_end = 0x4903a07f,
4286 .flags = ADDR_TYPE_RT 4286 .flags = ADDR_TYPE_RT
4287 }, 4287 },
4288 { }
4288}; 4289};
4289 4290
4290/* l4_abe -> timer6 (dma) */ 4291/* l4_abe -> timer6 (dma) */
@@ -4293,7 +4294,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer6_dma = {
4293 .slave = &omap44xx_timer6_hwmod, 4294 .slave = &omap44xx_timer6_hwmod,
4294 .clk = "ocp_abe_iclk", 4295 .clk = "ocp_abe_iclk",
4295 .addr = omap44xx_timer6_dma_addrs, 4296 .addr = omap44xx_timer6_dma_addrs,
4296 .addr_cnt = ARRAY_SIZE(omap44xx_timer6_dma_addrs),
4297 .user = OCP_USER_SDMA, 4297 .user = OCP_USER_SDMA,
4298}; 4298};
4299 4299
@@ -4331,6 +4331,7 @@ static struct omap_hwmod_addr_space omap44xx_timer7_addrs[] = {
4331 .pa_end = 0x4013c07f, 4331 .pa_end = 0x4013c07f,
4332 .flags = ADDR_TYPE_RT 4332 .flags = ADDR_TYPE_RT
4333 }, 4333 },
4334 { }
4334}; 4335};
4335 4336
4336/* l4_abe -> timer7 */ 4337/* l4_abe -> timer7 */
@@ -4339,7 +4340,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer7 = {
4339 .slave = &omap44xx_timer7_hwmod, 4340 .slave = &omap44xx_timer7_hwmod,
4340 .clk = "ocp_abe_iclk", 4341 .clk = "ocp_abe_iclk",
4341 .addr = omap44xx_timer7_addrs, 4342 .addr = omap44xx_timer7_addrs,
4342 .addr_cnt = ARRAY_SIZE(omap44xx_timer7_addrs),
4343 .user = OCP_USER_MPU, 4343 .user = OCP_USER_MPU,
4344}; 4344};
4345 4345
@@ -4349,6 +4349,7 @@ static struct omap_hwmod_addr_space omap44xx_timer7_dma_addrs[] = {
4349 .pa_end = 0x4903c07f, 4349 .pa_end = 0x4903c07f,
4350 .flags = ADDR_TYPE_RT 4350 .flags = ADDR_TYPE_RT
4351 }, 4351 },
4352 { }
4352}; 4353};
4353 4354
4354/* l4_abe -> timer7 (dma) */ 4355/* l4_abe -> timer7 (dma) */
@@ -4357,7 +4358,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer7_dma = {
4357 .slave = &omap44xx_timer7_hwmod, 4358 .slave = &omap44xx_timer7_hwmod,
4358 .clk = "ocp_abe_iclk", 4359 .clk = "ocp_abe_iclk",
4359 .addr = omap44xx_timer7_dma_addrs, 4360 .addr = omap44xx_timer7_dma_addrs,
4360 .addr_cnt = ARRAY_SIZE(omap44xx_timer7_dma_addrs),
4361 .user = OCP_USER_SDMA, 4361 .user = OCP_USER_SDMA,
4362}; 4362};
4363 4363
@@ -4395,6 +4395,7 @@ static struct omap_hwmod_addr_space omap44xx_timer8_addrs[] = {
4395 .pa_end = 0x4013e07f, 4395 .pa_end = 0x4013e07f,
4396 .flags = ADDR_TYPE_RT 4396 .flags = ADDR_TYPE_RT
4397 }, 4397 },
4398 { }
4398}; 4399};
4399 4400
4400/* l4_abe -> timer8 */ 4401/* l4_abe -> timer8 */
@@ -4403,7 +4404,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer8 = {
4403 .slave = &omap44xx_timer8_hwmod, 4404 .slave = &omap44xx_timer8_hwmod,
4404 .clk = "ocp_abe_iclk", 4405 .clk = "ocp_abe_iclk",
4405 .addr = omap44xx_timer8_addrs, 4406 .addr = omap44xx_timer8_addrs,
4406 .addr_cnt = ARRAY_SIZE(omap44xx_timer8_addrs),
4407 .user = OCP_USER_MPU, 4407 .user = OCP_USER_MPU,
4408}; 4408};
4409 4409
@@ -4413,6 +4413,7 @@ static struct omap_hwmod_addr_space omap44xx_timer8_dma_addrs[] = {
4413 .pa_end = 0x4903e07f, 4413 .pa_end = 0x4903e07f,
4414 .flags = ADDR_TYPE_RT 4414 .flags = ADDR_TYPE_RT
4415 }, 4415 },
4416 { }
4416}; 4417};
4417 4418
4418/* l4_abe -> timer8 (dma) */ 4419/* l4_abe -> timer8 (dma) */
@@ -4421,7 +4422,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer8_dma = {
4421 .slave = &omap44xx_timer8_hwmod, 4422 .slave = &omap44xx_timer8_hwmod,
4422 .clk = "ocp_abe_iclk", 4423 .clk = "ocp_abe_iclk",
4423 .addr = omap44xx_timer8_dma_addrs, 4424 .addr = omap44xx_timer8_dma_addrs,
4424 .addr_cnt = ARRAY_SIZE(omap44xx_timer8_dma_addrs),
4425 .user = OCP_USER_SDMA, 4425 .user = OCP_USER_SDMA,
4426}; 4426};
4427 4427
@@ -4459,6 +4459,7 @@ static struct omap_hwmod_addr_space omap44xx_timer9_addrs[] = {
4459 .pa_end = 0x4803e07f, 4459 .pa_end = 0x4803e07f,
4460 .flags = ADDR_TYPE_RT 4460 .flags = ADDR_TYPE_RT
4461 }, 4461 },
4462 { }
4462}; 4463};
4463 4464
4464/* l4_per -> timer9 */ 4465/* l4_per -> timer9 */
@@ -4467,7 +4468,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer9 = {
4467 .slave = &omap44xx_timer9_hwmod, 4468 .slave = &omap44xx_timer9_hwmod,
4468 .clk = "l4_div_ck", 4469 .clk = "l4_div_ck",
4469 .addr = omap44xx_timer9_addrs, 4470 .addr = omap44xx_timer9_addrs,
4470 .addr_cnt = ARRAY_SIZE(omap44xx_timer9_addrs),
4471 .user = OCP_USER_MPU | OCP_USER_SDMA, 4471 .user = OCP_USER_MPU | OCP_USER_SDMA,
4472}; 4472};
4473 4473
@@ -4504,6 +4504,7 @@ static struct omap_hwmod_addr_space omap44xx_timer10_addrs[] = {
4504 .pa_end = 0x4808607f, 4504 .pa_end = 0x4808607f,
4505 .flags = ADDR_TYPE_RT 4505 .flags = ADDR_TYPE_RT
4506 }, 4506 },
4507 { }
4507}; 4508};
4508 4509
4509/* l4_per -> timer10 */ 4510/* l4_per -> timer10 */
@@ -4512,7 +4513,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer10 = {
4512 .slave = &omap44xx_timer10_hwmod, 4513 .slave = &omap44xx_timer10_hwmod,
4513 .clk = "l4_div_ck", 4514 .clk = "l4_div_ck",
4514 .addr = omap44xx_timer10_addrs, 4515 .addr = omap44xx_timer10_addrs,
4515 .addr_cnt = ARRAY_SIZE(omap44xx_timer10_addrs),
4516 .user = OCP_USER_MPU | OCP_USER_SDMA, 4516 .user = OCP_USER_MPU | OCP_USER_SDMA,
4517}; 4517};
4518 4518
@@ -4549,6 +4549,7 @@ static struct omap_hwmod_addr_space omap44xx_timer11_addrs[] = {
4549 .pa_end = 0x4808807f, 4549 .pa_end = 0x4808807f,
4550 .flags = ADDR_TYPE_RT 4550 .flags = ADDR_TYPE_RT
4551 }, 4551 },
4552 { }
4552}; 4553};
4553 4554
4554/* l4_per -> timer11 */ 4555/* l4_per -> timer11 */
@@ -4557,7 +4558,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer11 = {
4557 .slave = &omap44xx_timer11_hwmod, 4558 .slave = &omap44xx_timer11_hwmod,
4558 .clk = "l4_div_ck", 4559 .clk = "l4_div_ck",
4559 .addr = omap44xx_timer11_addrs, 4560 .addr = omap44xx_timer11_addrs,
4560 .addr_cnt = ARRAY_SIZE(omap44xx_timer11_addrs),
4561 .user = OCP_USER_MPU | OCP_USER_SDMA, 4561 .user = OCP_USER_MPU | OCP_USER_SDMA,
4562}; 4562};
4563 4563
@@ -4621,6 +4621,7 @@ static struct omap_hwmod_addr_space omap44xx_uart1_addrs[] = {
4621 .pa_end = 0x4806a0ff, 4621 .pa_end = 0x4806a0ff,
4622 .flags = ADDR_TYPE_RT 4622 .flags = ADDR_TYPE_RT
4623 }, 4623 },
4624 { }
4624}; 4625};
4625 4626
4626/* l4_per -> uart1 */ 4627/* l4_per -> uart1 */
@@ -4629,7 +4630,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart1 = {
4629 .slave = &omap44xx_uart1_hwmod, 4630 .slave = &omap44xx_uart1_hwmod,
4630 .clk = "l4_div_ck", 4631 .clk = "l4_div_ck",
4631 .addr = omap44xx_uart1_addrs, 4632 .addr = omap44xx_uart1_addrs,
4632 .addr_cnt = ARRAY_SIZE(omap44xx_uart1_addrs),
4633 .user = OCP_USER_MPU | OCP_USER_SDMA, 4633 .user = OCP_USER_MPU | OCP_USER_SDMA,
4634}; 4634};
4635 4635
@@ -4673,6 +4673,7 @@ static struct omap_hwmod_addr_space omap44xx_uart2_addrs[] = {
4673 .pa_end = 0x4806c0ff, 4673 .pa_end = 0x4806c0ff,
4674 .flags = ADDR_TYPE_RT 4674 .flags = ADDR_TYPE_RT
4675 }, 4675 },
4676 { }
4676}; 4677};
4677 4678
4678/* l4_per -> uart2 */ 4679/* l4_per -> uart2 */
@@ -4681,7 +4682,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart2 = {
4681 .slave = &omap44xx_uart2_hwmod, 4682 .slave = &omap44xx_uart2_hwmod,
4682 .clk = "l4_div_ck", 4683 .clk = "l4_div_ck",
4683 .addr = omap44xx_uart2_addrs, 4684 .addr = omap44xx_uart2_addrs,
4684 .addr_cnt = ARRAY_SIZE(omap44xx_uart2_addrs),
4685 .user = OCP_USER_MPU | OCP_USER_SDMA, 4685 .user = OCP_USER_MPU | OCP_USER_SDMA,
4686}; 4686};
4687 4687
@@ -4725,6 +4725,7 @@ static struct omap_hwmod_addr_space omap44xx_uart3_addrs[] = {
4725 .pa_end = 0x480200ff, 4725 .pa_end = 0x480200ff,
4726 .flags = ADDR_TYPE_RT 4726 .flags = ADDR_TYPE_RT
4727 }, 4727 },
4728 { }
4728}; 4729};
4729 4730
4730/* l4_per -> uart3 */ 4731/* l4_per -> uart3 */
@@ -4733,7 +4734,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart3 = {
4733 .slave = &omap44xx_uart3_hwmod, 4734 .slave = &omap44xx_uart3_hwmod,
4734 .clk = "l4_div_ck", 4735 .clk = "l4_div_ck",
4735 .addr = omap44xx_uart3_addrs, 4736 .addr = omap44xx_uart3_addrs,
4736 .addr_cnt = ARRAY_SIZE(omap44xx_uart3_addrs),
4737 .user = OCP_USER_MPU | OCP_USER_SDMA, 4737 .user = OCP_USER_MPU | OCP_USER_SDMA,
4738}; 4738};
4739 4739
@@ -4778,6 +4778,7 @@ static struct omap_hwmod_addr_space omap44xx_uart4_addrs[] = {
4778 .pa_end = 0x4806e0ff, 4778 .pa_end = 0x4806e0ff,
4779 .flags = ADDR_TYPE_RT 4779 .flags = ADDR_TYPE_RT
4780 }, 4780 },
4781 { }
4781}; 4782};
4782 4783
4783/* l4_per -> uart4 */ 4784/* l4_per -> uart4 */
@@ -4786,7 +4787,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart4 = {
4786 .slave = &omap44xx_uart4_hwmod, 4787 .slave = &omap44xx_uart4_hwmod,
4787 .clk = "l4_div_ck", 4788 .clk = "l4_div_ck",
4788 .addr = omap44xx_uart4_addrs, 4789 .addr = omap44xx_uart4_addrs,
4789 .addr_cnt = ARRAY_SIZE(omap44xx_uart4_addrs),
4790 .user = OCP_USER_MPU | OCP_USER_SDMA, 4790 .user = OCP_USER_MPU | OCP_USER_SDMA,
4791}; 4791};
4792 4792
@@ -4853,6 +4853,7 @@ static struct omap_hwmod_addr_space omap44xx_usb_otg_hs_addrs[] = {
4853 .pa_end = 0x4a0ab003, 4853 .pa_end = 0x4a0ab003,
4854 .flags = ADDR_TYPE_RT 4854 .flags = ADDR_TYPE_RT
4855 }, 4855 },
4856 { }
4856}; 4857};
4857 4858
4858/* l4_cfg -> usb_otg_hs */ 4859/* l4_cfg -> usb_otg_hs */
@@ -4861,7 +4862,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_otg_hs = {
4861 .slave = &omap44xx_usb_otg_hs_hwmod, 4862 .slave = &omap44xx_usb_otg_hs_hwmod,
4862 .clk = "l4_div_ck", 4863 .clk = "l4_div_ck",
4863 .addr = omap44xx_usb_otg_hs_addrs, 4864 .addr = omap44xx_usb_otg_hs_addrs,
4864 .addr_cnt = ARRAY_SIZE(omap44xx_usb_otg_hs_addrs),
4865 .user = OCP_USER_MPU | OCP_USER_SDMA, 4865 .user = OCP_USER_MPU | OCP_USER_SDMA,
4866}; 4866};
4867 4867
@@ -4930,6 +4930,7 @@ static struct omap_hwmod_addr_space omap44xx_wd_timer2_addrs[] = {
4930 .pa_end = 0x4a31407f, 4930 .pa_end = 0x4a31407f,
4931 .flags = ADDR_TYPE_RT 4931 .flags = ADDR_TYPE_RT
4932 }, 4932 },
4933 { }
4933}; 4934};
4934 4935
4935/* l4_wkup -> wd_timer2 */ 4936/* l4_wkup -> wd_timer2 */
@@ -4938,7 +4939,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__wd_timer2 = {
4938 .slave = &omap44xx_wd_timer2_hwmod, 4939 .slave = &omap44xx_wd_timer2_hwmod,
4939 .clk = "l4_wkup_clk_mux_ck", 4940 .clk = "l4_wkup_clk_mux_ck",
4940 .addr = omap44xx_wd_timer2_addrs, 4941 .addr = omap44xx_wd_timer2_addrs,
4941 .addr_cnt = ARRAY_SIZE(omap44xx_wd_timer2_addrs),
4942 .user = OCP_USER_MPU | OCP_USER_SDMA, 4942 .user = OCP_USER_MPU | OCP_USER_SDMA,
4943}; 4943};
4944 4944
@@ -4975,6 +4975,7 @@ static struct omap_hwmod_addr_space omap44xx_wd_timer3_addrs[] = {
4975 .pa_end = 0x4013007f, 4975 .pa_end = 0x4013007f,
4976 .flags = ADDR_TYPE_RT 4976 .flags = ADDR_TYPE_RT
4977 }, 4977 },
4978 { }
4978}; 4979};
4979 4980
4980/* l4_abe -> wd_timer3 */ 4981/* l4_abe -> wd_timer3 */
@@ -4983,7 +4984,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__wd_timer3 = {
4983 .slave = &omap44xx_wd_timer3_hwmod, 4984 .slave = &omap44xx_wd_timer3_hwmod,
4984 .clk = "ocp_abe_iclk", 4985 .clk = "ocp_abe_iclk",
4985 .addr = omap44xx_wd_timer3_addrs, 4986 .addr = omap44xx_wd_timer3_addrs,
4986 .addr_cnt = ARRAY_SIZE(omap44xx_wd_timer3_addrs),
4987 .user = OCP_USER_MPU, 4987 .user = OCP_USER_MPU,
4988}; 4988};
4989 4989
@@ -4993,6 +4993,7 @@ static struct omap_hwmod_addr_space omap44xx_wd_timer3_dma_addrs[] = {
4993 .pa_end = 0x4903007f, 4993 .pa_end = 0x4903007f,
4994 .flags = ADDR_TYPE_RT 4994 .flags = ADDR_TYPE_RT
4995 }, 4995 },
4996 { }
4996}; 4997};
4997 4998
4998/* l4_abe -> wd_timer3 (dma) */ 4999/* l4_abe -> wd_timer3 (dma) */
@@ -5001,7 +5002,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__wd_timer3_dma = {
5001 .slave = &omap44xx_wd_timer3_hwmod, 5002 .slave = &omap44xx_wd_timer3_hwmod,
5002 .clk = "ocp_abe_iclk", 5003 .clk = "ocp_abe_iclk",
5003 .addr = omap44xx_wd_timer3_dma_addrs, 5004 .addr = omap44xx_wd_timer3_dma_addrs,
5004 .addr_cnt = ARRAY_SIZE(omap44xx_wd_timer3_dma_addrs),
5005 .user = OCP_USER_SDMA, 5005 .user = OCP_USER_SDMA,
5006}; 5006};
5007 5007
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 1adea9c62984..523e0b585b6c 100644
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -220,7 +220,6 @@ struct omap_hwmod_addr_space {
220 * @clk: interface clock: OMAP clock name 220 * @clk: interface clock: OMAP clock name
221 * @_clk: pointer to the interface struct clk (filled in at runtime) 221 * @_clk: pointer to the interface struct clk (filled in at runtime)
222 * @fw: interface firewall data 222 * @fw: interface firewall data
223 * @addr_cnt: ARRAY_SIZE(@addr)
224 * @width: OCP data width 223 * @width: OCP data width
225 * @user: initiators using this interface (see OCP_USER_* macros above) 224 * @user: initiators using this interface (see OCP_USER_* macros above)
226 * @flags: OCP interface flags (see OCPIF_* macros above) 225 * @flags: OCP interface flags (see OCPIF_* macros above)
@@ -239,7 +238,6 @@ struct omap_hwmod_ocp_if {
239 union { 238 union {
240 struct omap_hwmod_omap2_firewall omap2; 239 struct omap_hwmod_omap2_firewall omap2;
241 } fw; 240 } fw;
242 u8 addr_cnt;
243 u8 width; 241 u8 width;
244 u8 user; 242 u8 user;
245 u8 flags; 243 u8 flags;
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-10 07:24:10 -0400