[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-3.0 / pm-wip / voltdm / 0037-omap_hwmod-use-a-null-structure-record-to-terminate-.patch
1 From 2c900775f726b160e5ce702e75554282c2869d60 Mon Sep 17 00:00:00 2001
2 From: Paul Walmsley <paul@pwsan.com>
3 Date: Sat, 9 Jul 2011 19:14:05 -0600
4 Subject: [PATCH 037/149] omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space arrays
6 Previously, struct omap_hwmod_addr_space arrays were unterminated; and
7 users of these arrays used the ARRAY_SIZE() macro to determine the
8 length of the array. However, ARRAY_SIZE() only works when the array
9 is in the same scope as the macro user.
11 So far this hasn't been a problem. However, to reduce duplicated
12 data, a subsequent patch will move common data to a separate, shared
13 file. When this is done, ARRAY_SIZE() will no longer be usable.
15 This patch removes ARRAY_SIZE() usage for struct omap_hwmod_addr_space
16 arrays and uses a null structure member as the array terminator
17 instead.
19 Signed-off-by: Paul Walmsley <paul@pwsan.com>
20 ---
21 arch/arm/mach-omap2/omap_hwmod.c | 45 ++++++--
22 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 66 +++++-----
23 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 83 ++++++-------
24 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 108 ++++++++--------
25 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 170 +++++++++++++-------------
26 arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 -
27 6 files changed, 249 insertions(+), 225 deletions(-)
29 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
30 index e530bcb..73599f0 100644
31 --- a/arch/arm/mach-omap2/omap_hwmod.c
32 +++ b/arch/arm/mach-omap2/omap_hwmod.c
33 @@ -2,6 +2,7 @@
34 * omap_hwmod implementation for OMAP2/3/4
35 *
36 * Copyright (C) 2009-2011 Nokia Corporation
37 + * Copyright (C) 2011 Texas Instruments, Inc.
38 *
39 * Paul Walmsley, Benoît Cousson, Kevin Hilman
40 *
41 @@ -678,6 +679,29 @@ static void _disable_optional_clocks(struct omap_hwmod *oh)
42 }
44 /**
45 + * _count_ocp_if_addr_spaces - count the number of address space entries for @oh
46 + * @oh: struct omap_hwmod *oh
47 + *
48 + * Count and return the number of address space ranges associated with
49 + * the hwmod @oh. Used to allocate struct resource data. Returns 0
50 + * if @oh is NULL.
51 + */
52 +static int _count_ocp_if_addr_spaces(struct omap_hwmod_ocp_if *os)
53 +{
54 + struct omap_hwmod_addr_space *mem;
55 + int i = 0;
56 +
57 + if (!os || !os->addr)
58 + return 0;
59 +
60 + do {
61 + mem = &os->addr[i++];
62 + } while (mem->pa_start != mem->pa_end);
63 +
64 + return i;
65 +}
66 +
67 +/**
68 * _find_mpu_port_index - find hwmod OCP slave port ID intended for MPU use
69 * @oh: struct omap_hwmod *
70 *
71 @@ -722,8 +746,7 @@ static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index)
72 {
73 struct omap_hwmod_ocp_if *os;
74 struct omap_hwmod_addr_space *mem;
75 - int i;
76 - int found = 0;
77 + int i = 0, found = 0;
78 void __iomem *va_start;
80 if (!oh || oh->slaves_cnt == 0)
81 @@ -731,12 +754,14 @@ static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index)
83 os = oh->slaves[index];
85 - for (i = 0, mem = os->addr; i < os->addr_cnt; i++, mem++) {
86 - if (mem->flags & ADDR_TYPE_RT) {
87 + if (!os->addr)
88 + return NULL;
89 +
90 + do {
91 + mem = &os->addr[i++];
92 + if (mem->flags & ADDR_TYPE_RT)
93 found = 1;
94 - break;
95 - }
96 - }
97 + } while (!found && mem->pa_start != mem->pa_end);
99 if (found) {
100 va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
101 @@ -1962,7 +1987,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh)
102 ret = oh->mpu_irqs_cnt + oh->sdma_reqs_cnt;
104 for (i = 0; i < oh->slaves_cnt; i++)
105 - ret += oh->slaves[i]->addr_cnt;
106 + ret += _count_ocp_if_addr_spaces(oh->slaves[i]);
108 return ret;
109 }
110 @@ -2002,10 +2027,12 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)
112 for (i = 0; i < oh->slaves_cnt; i++) {
113 struct omap_hwmod_ocp_if *os;
114 + int addr_cnt;
116 os = oh->slaves[i];
117 + addr_cnt = _count_ocp_if_addr_spaces(os);
119 - for (j = 0; j < os->addr_cnt; j++) {
120 + for (j = 0; j < addr_cnt; j++) {
121 (res + r)->name = (os->addr + j)->name;
122 (res + r)->start = (os->addr + j)->pa_start;
123 (res + r)->end = (os->addr + j)->pa_end;
124 diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
125 index c4d0ae8..1a7ce3e 100644
126 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
127 +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
128 @@ -1,7 +1,7 @@
129 /*
130 * omap_hwmod_2420_data.c - hardware modules present on the OMAP2420 chips
131 *
132 - * Copyright (C) 2009-2010 Nokia Corporation
133 + * Copyright (C) 2009-2011 Nokia Corporation
134 * Paul Walmsley
135 *
136 * This program is free software; you can redistribute it and/or modify
137 @@ -120,6 +120,7 @@ static struct omap_hwmod_addr_space omap2420_mcspi1_addr_space[] = {
138 .pa_end = 0x480980ff,
139 .flags = ADDR_TYPE_RT,
140 },
141 + { }
142 };
144 static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = {
145 @@ -127,7 +128,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = {
146 .slave = &omap2420_mcspi1_hwmod,
147 .clk = "mcspi1_ick",
148 .addr = omap2420_mcspi1_addr_space,
149 - .addr_cnt = ARRAY_SIZE(omap2420_mcspi1_addr_space),
150 .user = OCP_USER_MPU | OCP_USER_SDMA,
151 };
153 @@ -138,6 +138,7 @@ static struct omap_hwmod_addr_space omap2420_mcspi2_addr_space[] = {
154 .pa_end = 0x4809a0ff,
155 .flags = ADDR_TYPE_RT,
156 },
157 + { }
158 };
160 static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = {
161 @@ -145,7 +146,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = {
162 .slave = &omap2420_mcspi2_hwmod,
163 .clk = "mcspi2_ick",
164 .addr = omap2420_mcspi2_addr_space,
165 - .addr_cnt = ARRAY_SIZE(omap2420_mcspi2_addr_space),
166 .user = OCP_USER_MPU | OCP_USER_SDMA,
167 };
169 @@ -163,6 +163,7 @@ static struct omap_hwmod_addr_space omap2420_uart1_addr_space[] = {
170 .pa_end = OMAP2_UART1_BASE + SZ_8K - 1,
171 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
172 },
173 + { }
174 };
176 static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
177 @@ -170,7 +171,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
178 .slave = &omap2420_uart1_hwmod,
179 .clk = "uart1_ick",
180 .addr = omap2420_uart1_addr_space,
181 - .addr_cnt = ARRAY_SIZE(omap2420_uart1_addr_space),
182 .user = OCP_USER_MPU | OCP_USER_SDMA,
183 };
185 @@ -181,6 +181,7 @@ static struct omap_hwmod_addr_space omap2420_uart2_addr_space[] = {
186 .pa_end = OMAP2_UART2_BASE + SZ_1K - 1,
187 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
188 },
189 + { }
190 };
192 static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
193 @@ -188,7 +189,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
194 .slave = &omap2420_uart2_hwmod,
195 .clk = "uart2_ick",
196 .addr = omap2420_uart2_addr_space,
197 - .addr_cnt = ARRAY_SIZE(omap2420_uart2_addr_space),
198 .user = OCP_USER_MPU | OCP_USER_SDMA,
199 };
201 @@ -199,6 +199,7 @@ static struct omap_hwmod_addr_space omap2420_uart3_addr_space[] = {
202 .pa_end = OMAP2_UART3_BASE + SZ_1K - 1,
203 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
204 },
205 + { }
206 };
208 static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
209 @@ -206,7 +207,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
210 .slave = &omap2420_uart3_hwmod,
211 .clk = "uart3_ick",
212 .addr = omap2420_uart3_addr_space,
213 - .addr_cnt = ARRAY_SIZE(omap2420_uart3_addr_space),
214 .user = OCP_USER_MPU | OCP_USER_SDMA,
215 };
217 @@ -220,6 +220,7 @@ static struct omap_hwmod_addr_space omap2420_i2c1_addr_space[] = {
218 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1,
219 .flags = ADDR_TYPE_RT,
220 },
221 + { }
222 };
224 static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = {
225 @@ -227,7 +228,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = {
226 .slave = &omap2420_i2c1_hwmod,
227 .clk = "i2c1_ick",
228 .addr = omap2420_i2c1_addr_space,
229 - .addr_cnt = ARRAY_SIZE(omap2420_i2c1_addr_space),
230 .user = OCP_USER_MPU | OCP_USER_SDMA,
231 };
233 @@ -238,6 +238,7 @@ static struct omap_hwmod_addr_space omap2420_i2c2_addr_space[] = {
234 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1,
235 .flags = ADDR_TYPE_RT,
236 },
237 + { }
238 };
240 static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = {
241 @@ -245,7 +246,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = {
242 .slave = &omap2420_i2c2_hwmod,
243 .clk = "i2c2_ick",
244 .addr = omap2420_i2c2_addr_space,
245 - .addr_cnt = ARRAY_SIZE(omap2420_i2c2_addr_space),
246 .user = OCP_USER_MPU | OCP_USER_SDMA,
247 };
249 @@ -370,6 +370,7 @@ static struct omap_hwmod_addr_space omap2420_timer1_addrs[] = {
250 .pa_end = 0x48028000 + SZ_1K - 1,
251 .flags = ADDR_TYPE_RT
252 },
253 + { }
254 };
256 /* l4_wkup -> timer1 */
257 @@ -378,7 +379,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__timer1 = {
258 .slave = &omap2420_timer1_hwmod,
259 .clk = "gpt1_ick",
260 .addr = omap2420_timer1_addrs,
261 - .addr_cnt = ARRAY_SIZE(omap2420_timer1_addrs),
262 .user = OCP_USER_MPU | OCP_USER_SDMA,
263 };
265 @@ -420,6 +420,7 @@ static struct omap_hwmod_addr_space omap2420_timer2_addrs[] = {
266 .pa_end = 0x4802a000 + SZ_1K - 1,
267 .flags = ADDR_TYPE_RT
268 },
269 + { }
270 };
272 /* l4_core -> timer2 */
273 @@ -428,7 +429,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer2 = {
274 .slave = &omap2420_timer2_hwmod,
275 .clk = "gpt2_ick",
276 .addr = omap2420_timer2_addrs,
277 - .addr_cnt = ARRAY_SIZE(omap2420_timer2_addrs),
278 .user = OCP_USER_MPU | OCP_USER_SDMA,
279 };
281 @@ -470,6 +470,7 @@ static struct omap_hwmod_addr_space omap2420_timer3_addrs[] = {
282 .pa_end = 0x48078000 + SZ_1K - 1,
283 .flags = ADDR_TYPE_RT
284 },
285 + { }
286 };
288 /* l4_core -> timer3 */
289 @@ -478,7 +479,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer3 = {
290 .slave = &omap2420_timer3_hwmod,
291 .clk = "gpt3_ick",
292 .addr = omap2420_timer3_addrs,
293 - .addr_cnt = ARRAY_SIZE(omap2420_timer3_addrs),
294 .user = OCP_USER_MPU | OCP_USER_SDMA,
295 };
297 @@ -520,6 +520,7 @@ static struct omap_hwmod_addr_space omap2420_timer4_addrs[] = {
298 .pa_end = 0x4807a000 + SZ_1K - 1,
299 .flags = ADDR_TYPE_RT
300 },
301 + { }
302 };
304 /* l4_core -> timer4 */
305 @@ -528,7 +529,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer4 = {
306 .slave = &omap2420_timer4_hwmod,
307 .clk = "gpt4_ick",
308 .addr = omap2420_timer4_addrs,
309 - .addr_cnt = ARRAY_SIZE(omap2420_timer4_addrs),
310 .user = OCP_USER_MPU | OCP_USER_SDMA,
311 };
313 @@ -570,6 +570,7 @@ static struct omap_hwmod_addr_space omap2420_timer5_addrs[] = {
314 .pa_end = 0x4807c000 + SZ_1K - 1,
315 .flags = ADDR_TYPE_RT
316 },
317 + { }
318 };
320 /* l4_core -> timer5 */
321 @@ -578,7 +579,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer5 = {
322 .slave = &omap2420_timer5_hwmod,
323 .clk = "gpt5_ick",
324 .addr = omap2420_timer5_addrs,
325 - .addr_cnt = ARRAY_SIZE(omap2420_timer5_addrs),
326 .user = OCP_USER_MPU | OCP_USER_SDMA,
327 };
329 @@ -621,6 +621,7 @@ static struct omap_hwmod_addr_space omap2420_timer6_addrs[] = {
330 .pa_end = 0x4807e000 + SZ_1K - 1,
331 .flags = ADDR_TYPE_RT
332 },
333 + { }
334 };
336 /* l4_core -> timer6 */
337 @@ -629,7 +630,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer6 = {
338 .slave = &omap2420_timer6_hwmod,
339 .clk = "gpt6_ick",
340 .addr = omap2420_timer6_addrs,
341 - .addr_cnt = ARRAY_SIZE(omap2420_timer6_addrs),
342 .user = OCP_USER_MPU | OCP_USER_SDMA,
343 };
345 @@ -671,6 +671,7 @@ static struct omap_hwmod_addr_space omap2420_timer7_addrs[] = {
346 .pa_end = 0x48080000 + SZ_1K - 1,
347 .flags = ADDR_TYPE_RT
348 },
349 + { }
350 };
352 /* l4_core -> timer7 */
353 @@ -679,7 +680,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer7 = {
354 .slave = &omap2420_timer7_hwmod,
355 .clk = "gpt7_ick",
356 .addr = omap2420_timer7_addrs,
357 - .addr_cnt = ARRAY_SIZE(omap2420_timer7_addrs),
358 .user = OCP_USER_MPU | OCP_USER_SDMA,
359 };
361 @@ -721,6 +721,7 @@ static struct omap_hwmod_addr_space omap2420_timer8_addrs[] = {
362 .pa_end = 0x48082000 + SZ_1K - 1,
363 .flags = ADDR_TYPE_RT
364 },
365 + { }
366 };
368 /* l4_core -> timer8 */
369 @@ -729,7 +730,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer8 = {
370 .slave = &omap2420_timer8_hwmod,
371 .clk = "gpt8_ick",
372 .addr = omap2420_timer8_addrs,
373 - .addr_cnt = ARRAY_SIZE(omap2420_timer8_addrs),
374 .user = OCP_USER_MPU | OCP_USER_SDMA,
375 };
377 @@ -771,6 +771,7 @@ static struct omap_hwmod_addr_space omap2420_timer9_addrs[] = {
378 .pa_end = 0x48084000 + SZ_1K - 1,
379 .flags = ADDR_TYPE_RT
380 },
381 + { }
382 };
384 /* l4_core -> timer9 */
385 @@ -779,7 +780,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer9 = {
386 .slave = &omap2420_timer9_hwmod,
387 .clk = "gpt9_ick",
388 .addr = omap2420_timer9_addrs,
389 - .addr_cnt = ARRAY_SIZE(omap2420_timer9_addrs),
390 .user = OCP_USER_MPU | OCP_USER_SDMA,
391 };
393 @@ -821,6 +821,7 @@ static struct omap_hwmod_addr_space omap2420_timer10_addrs[] = {
394 .pa_end = 0x48086000 + SZ_1K - 1,
395 .flags = ADDR_TYPE_RT
396 },
397 + { }
398 };
400 /* l4_core -> timer10 */
401 @@ -829,7 +830,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer10 = {
402 .slave = &omap2420_timer10_hwmod,
403 .clk = "gpt10_ick",
404 .addr = omap2420_timer10_addrs,
405 - .addr_cnt = ARRAY_SIZE(omap2420_timer10_addrs),
406 .user = OCP_USER_MPU | OCP_USER_SDMA,
407 };
409 @@ -871,6 +871,7 @@ static struct omap_hwmod_addr_space omap2420_timer11_addrs[] = {
410 .pa_end = 0x48088000 + SZ_1K - 1,
411 .flags = ADDR_TYPE_RT
412 },
413 + { }
414 };
416 /* l4_core -> timer11 */
417 @@ -879,7 +880,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer11 = {
418 .slave = &omap2420_timer11_hwmod,
419 .clk = "gpt11_ick",
420 .addr = omap2420_timer11_addrs,
421 - .addr_cnt = ARRAY_SIZE(omap2420_timer11_addrs),
422 .user = OCP_USER_MPU | OCP_USER_SDMA,
423 };
425 @@ -921,6 +921,7 @@ static struct omap_hwmod_addr_space omap2420_timer12_addrs[] = {
426 .pa_end = 0x4808a000 + SZ_1K - 1,
427 .flags = ADDR_TYPE_RT
428 },
429 + { }
430 };
432 /* l4_core -> timer12 */
433 @@ -929,7 +930,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer12 = {
434 .slave = &omap2420_timer12_hwmod,
435 .clk = "gpt12_ick",
436 .addr = omap2420_timer12_addrs,
437 - .addr_cnt = ARRAY_SIZE(omap2420_timer12_addrs),
438 .user = OCP_USER_MPU | OCP_USER_SDMA,
439 };
441 @@ -966,6 +966,7 @@ static struct omap_hwmod_addr_space omap2420_wd_timer2_addrs[] = {
442 .pa_end = 0x4802207f,
443 .flags = ADDR_TYPE_RT
444 },
445 + { }
446 };
448 static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = {
449 @@ -973,7 +974,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = {
450 .slave = &omap2420_wd_timer2_hwmod,
451 .clk = "mpu_wdt_ick",
452 .addr = omap2420_wd_timer2_addrs,
453 - .addr_cnt = ARRAY_SIZE(omap2420_wd_timer2_addrs),
454 .user = OCP_USER_MPU | OCP_USER_SDMA,
455 };
457 @@ -1184,6 +1184,7 @@ static struct omap_hwmod_addr_space omap2420_dss_addrs[] = {
458 .pa_end = 0x480503FF,
459 .flags = ADDR_TYPE_RT
460 },
461 + { }
462 };
464 /* l4_core -> dss */
465 @@ -1192,7 +1193,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss = {
466 .slave = &omap2420_dss_core_hwmod,
467 .clk = "dss_ick",
468 .addr = omap2420_dss_addrs,
469 - .addr_cnt = ARRAY_SIZE(omap2420_dss_addrs),
470 .fw = {
471 .omap2 = {
472 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
473 @@ -1268,6 +1268,7 @@ static struct omap_hwmod_addr_space omap2420_dss_dispc_addrs[] = {
474 .pa_end = 0x480507FF,
475 .flags = ADDR_TYPE_RT
476 },
477 + { }
478 };
480 /* l4_core -> dss_dispc */
481 @@ -1276,7 +1277,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_dispc = {
482 .slave = &omap2420_dss_dispc_hwmod,
483 .clk = "dss_ick",
484 .addr = omap2420_dss_dispc_addrs,
485 - .addr_cnt = ARRAY_SIZE(omap2420_dss_dispc_addrs),
486 .fw = {
487 .omap2 = {
488 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION,
489 @@ -1338,6 +1338,7 @@ static struct omap_hwmod_addr_space omap2420_dss_rfbi_addrs[] = {
490 .pa_end = 0x48050BFF,
491 .flags = ADDR_TYPE_RT
492 },
493 + { }
494 };
496 /* l4_core -> dss_rfbi */
497 @@ -1346,7 +1347,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_rfbi = {
498 .slave = &omap2420_dss_rfbi_hwmod,
499 .clk = "dss_ick",
500 .addr = omap2420_dss_rfbi_addrs,
501 - .addr_cnt = ARRAY_SIZE(omap2420_dss_rfbi_addrs),
502 .fw = {
503 .omap2 = {
504 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
505 @@ -1394,6 +1394,7 @@ static struct omap_hwmod_addr_space omap2420_dss_venc_addrs[] = {
506 .pa_end = 0x48050FFF,
507 .flags = ADDR_TYPE_RT
508 },
509 + { }
510 };
512 /* l4_core -> dss_venc */
513 @@ -1402,7 +1403,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = {
514 .slave = &omap2420_dss_venc_hwmod,
515 .clk = "dss_54m_fck",
516 .addr = omap2420_dss_venc_addrs,
517 - .addr_cnt = ARRAY_SIZE(omap2420_dss_venc_addrs),
518 .fw = {
519 .omap2 = {
520 .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_VENC_REGION,
521 @@ -1536,6 +1536,7 @@ static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = {
522 .pa_end = 0x480181ff,
523 .flags = ADDR_TYPE_RT
524 },
525 + { }
526 };
528 static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = {
529 @@ -1543,7 +1544,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = {
530 .slave = &omap2420_gpio1_hwmod,
531 .clk = "gpios_ick",
532 .addr = omap2420_gpio1_addr_space,
533 - .addr_cnt = ARRAY_SIZE(omap2420_gpio1_addr_space),
534 .user = OCP_USER_MPU | OCP_USER_SDMA,
535 };
537 @@ -1554,6 +1554,7 @@ static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = {
538 .pa_end = 0x4801a1ff,
539 .flags = ADDR_TYPE_RT
540 },
541 + { }
542 };
544 static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = {
545 @@ -1561,7 +1562,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = {
546 .slave = &omap2420_gpio2_hwmod,
547 .clk = "gpios_ick",
548 .addr = omap2420_gpio2_addr_space,
549 - .addr_cnt = ARRAY_SIZE(omap2420_gpio2_addr_space),
550 .user = OCP_USER_MPU | OCP_USER_SDMA,
551 };
553 @@ -1572,6 +1572,7 @@ static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = {
554 .pa_end = 0x4801c1ff,
555 .flags = ADDR_TYPE_RT
556 },
557 + { }
558 };
560 static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = {
561 @@ -1579,7 +1580,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = {
562 .slave = &omap2420_gpio3_hwmod,
563 .clk = "gpios_ick",
564 .addr = omap2420_gpio3_addr_space,
565 - .addr_cnt = ARRAY_SIZE(omap2420_gpio3_addr_space),
566 .user = OCP_USER_MPU | OCP_USER_SDMA,
567 };
569 @@ -1590,6 +1590,7 @@ static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = {
570 .pa_end = 0x4801e1ff,
571 .flags = ADDR_TYPE_RT
572 },
573 + { }
574 };
576 static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = {
577 @@ -1597,7 +1598,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = {
578 .slave = &omap2420_gpio4_hwmod,
579 .clk = "gpios_ick",
580 .addr = omap2420_gpio4_addr_space,
581 - .addr_cnt = ARRAY_SIZE(omap2420_gpio4_addr_space),
582 .user = OCP_USER_MPU | OCP_USER_SDMA,
583 };
585 @@ -1789,6 +1789,7 @@ static struct omap_hwmod_addr_space omap2420_dma_system_addrs[] = {
586 .pa_end = 0x48056fff,
587 .flags = ADDR_TYPE_RT
588 },
589 + { }
590 };
592 /* dma_system -> L3 */
593 @@ -1810,7 +1811,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dma_system = {
594 .slave = &omap2420_dma_system_hwmod,
595 .clk = "sdma_ick",
596 .addr = omap2420_dma_system_addrs,
597 - .addr_cnt = ARRAY_SIZE(omap2420_dma_system_addrs),
598 .user = OCP_USER_MPU | OCP_USER_SDMA,
599 };
601 @@ -1868,6 +1868,7 @@ static struct omap_hwmod_addr_space omap2420_mailbox_addrs[] = {
602 .pa_end = 0x480941ff,
603 .flags = ADDR_TYPE_RT,
604 },
605 + { }
606 };
608 /* l4_core -> mailbox */
609 @@ -1875,7 +1876,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mailbox = {
610 .master = &omap2420_l4_core_hwmod,
611 .slave = &omap2420_mailbox_hwmod,
612 .addr = omap2420_mailbox_addrs,
613 - .addr_cnt = ARRAY_SIZE(omap2420_mailbox_addrs),
614 .user = OCP_USER_MPU | OCP_USER_SDMA,
615 };
617 @@ -2044,6 +2044,7 @@ static struct omap_hwmod_addr_space omap2420_mcbsp1_addrs[] = {
618 .pa_end = 0x480740ff,
619 .flags = ADDR_TYPE_RT
620 },
621 + { }
622 };
624 /* l4_core -> mcbsp1 */
625 @@ -2052,7 +2053,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp1 = {
626 .slave = &omap2420_mcbsp1_hwmod,
627 .clk = "mcbsp1_ick",
628 .addr = omap2420_mcbsp1_addrs,
629 - .addr_cnt = ARRAY_SIZE(omap2420_mcbsp1_addrs),
630 .user = OCP_USER_MPU | OCP_USER_SDMA,
631 };
633 @@ -2101,6 +2101,7 @@ static struct omap_hwmod_addr_space omap2420_mcbsp2_addrs[] = {
634 .pa_end = 0x480760ff,
635 .flags = ADDR_TYPE_RT
636 },
637 + { }
638 };
640 /* l4_core -> mcbsp2 */
641 @@ -2109,7 +2110,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp2 = {
642 .slave = &omap2420_mcbsp2_hwmod,
643 .clk = "mcbsp2_ick",
644 .addr = omap2420_mcbsp2_addrs,
645 - .addr_cnt = ARRAY_SIZE(omap2420_mcbsp2_addrs),
646 .user = OCP_USER_MPU | OCP_USER_SDMA,
647 };
649 diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
650 index 9682dd5..da28794 100644
651 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
652 +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
653 @@ -1,7 +1,7 @@
654 /*
655 * omap_hwmod_2430_data.c - hardware modules present on the OMAP2430 chips
656 *
657 - * Copyright (C) 2009-2010 Nokia Corporation
658 + * Copyright (C) 2009-2011 Nokia Corporation
659 * Paul Walmsley
660 *
661 * This program is free software; you can redistribute it and/or modify
662 @@ -141,6 +141,7 @@ static struct omap_hwmod_addr_space omap2430_i2c1_addr_space[] = {
663 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1,
664 .flags = ADDR_TYPE_RT,
665 },
666 + { }
667 };
669 static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = {
670 @@ -148,7 +149,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = {
671 .slave = &omap2430_i2c1_hwmod,
672 .clk = "i2c1_ick",
673 .addr = omap2430_i2c1_addr_space,
674 - .addr_cnt = ARRAY_SIZE(omap2430_i2c1_addr_space),
675 .user = OCP_USER_MPU | OCP_USER_SDMA,
676 };
678 @@ -159,6 +159,7 @@ static struct omap_hwmod_addr_space omap2430_i2c2_addr_space[] = {
679 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1,
680 .flags = ADDR_TYPE_RT,
681 },
682 + { }
683 };
685 static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = {
686 @@ -166,7 +167,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = {
687 .slave = &omap2430_i2c2_hwmod,
688 .clk = "i2c2_ick",
689 .addr = omap2430_i2c2_addr_space,
690 - .addr_cnt = ARRAY_SIZE(omap2430_i2c2_addr_space),
691 .user = OCP_USER_MPU | OCP_USER_SDMA,
692 };
694 @@ -184,6 +184,7 @@ static struct omap_hwmod_addr_space omap2430_uart1_addr_space[] = {
695 .pa_end = OMAP2_UART1_BASE + SZ_8K - 1,
696 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
697 },
698 + { }
699 };
701 static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
702 @@ -191,7 +192,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
703 .slave = &omap2430_uart1_hwmod,
704 .clk = "uart1_ick",
705 .addr = omap2430_uart1_addr_space,
706 - .addr_cnt = ARRAY_SIZE(omap2430_uart1_addr_space),
707 .user = OCP_USER_MPU | OCP_USER_SDMA,
708 };
710 @@ -202,6 +202,7 @@ static struct omap_hwmod_addr_space omap2430_uart2_addr_space[] = {
711 .pa_end = OMAP2_UART2_BASE + SZ_1K - 1,
712 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
713 },
714 + { }
715 };
717 static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
718 @@ -209,7 +210,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
719 .slave = &omap2430_uart2_hwmod,
720 .clk = "uart2_ick",
721 .addr = omap2430_uart2_addr_space,
722 - .addr_cnt = ARRAY_SIZE(omap2430_uart2_addr_space),
723 .user = OCP_USER_MPU | OCP_USER_SDMA,
724 };
726 @@ -220,6 +220,7 @@ static struct omap_hwmod_addr_space omap2430_uart3_addr_space[] = {
727 .pa_end = OMAP2_UART3_BASE + SZ_1K - 1,
728 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
729 },
730 + { }
731 };
733 static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
734 @@ -227,7 +228,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
735 .slave = &omap2430_uart3_hwmod,
736 .clk = "uart3_ick",
737 .addr = omap2430_uart3_addr_space,
738 - .addr_cnt = ARRAY_SIZE(omap2430_uart3_addr_space),
739 .user = OCP_USER_MPU | OCP_USER_SDMA,
740 };
742 @@ -248,7 +248,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__usbhsotg = {
743 .slave = &omap2430_usbhsotg_hwmod,
744 .clk = "usb_l4_ick",
745 .addr = omap2430_usbhsotg_addrs,
746 - .addr_cnt = ARRAY_SIZE(omap2430_usbhsotg_addrs),
747 .user = OCP_USER_MPU,
748 };
750 @@ -267,6 +266,7 @@ static struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = {
751 .pa_end = 0x4809c1ff,
752 .flags = ADDR_TYPE_RT,
753 },
754 + { }
755 };
757 static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = {
758 @@ -274,7 +274,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = {
759 .slave = &omap2430_mmc1_hwmod,
760 .clk = "mmchs1_ick",
761 .addr = omap2430_mmc1_addr_space,
762 - .addr_cnt = ARRAY_SIZE(omap2430_mmc1_addr_space),
763 .user = OCP_USER_MPU | OCP_USER_SDMA,
764 };
766 @@ -285,14 +284,14 @@ static struct omap_hwmod_addr_space omap2430_mmc2_addr_space[] = {
767 .pa_end = 0x480b41ff,
768 .flags = ADDR_TYPE_RT,
769 },
770 + { }
771 };
773 static struct omap_hwmod_ocp_if omap2430_l4_core__mmc2 = {
774 .master = &omap2430_l4_core_hwmod,
775 .slave = &omap2430_mmc2_hwmod,
776 - .addr = omap2430_mmc2_addr_space,
777 .clk = "mmchs2_ick",
778 - .addr_cnt = ARRAY_SIZE(omap2430_mmc2_addr_space),
779 + .addr = omap2430_mmc2_addr_space,
780 .user = OCP_USER_MPU | OCP_USER_SDMA,
781 };
783 @@ -339,6 +338,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi1_addr_space[] = {
784 .pa_end = 0x480980ff,
785 .flags = ADDR_TYPE_RT,
786 },
787 + { }
788 };
790 static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = {
791 @@ -346,7 +346,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = {
792 .slave = &omap2430_mcspi1_hwmod,
793 .clk = "mcspi1_ick",
794 .addr = omap2430_mcspi1_addr_space,
795 - .addr_cnt = ARRAY_SIZE(omap2430_mcspi1_addr_space),
796 .user = OCP_USER_MPU | OCP_USER_SDMA,
797 };
799 @@ -357,6 +356,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi2_addr_space[] = {
800 .pa_end = 0x4809a0ff,
801 .flags = ADDR_TYPE_RT,
802 },
803 + { }
804 };
806 static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = {
807 @@ -364,7 +364,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = {
808 .slave = &omap2430_mcspi2_hwmod,
809 .clk = "mcspi2_ick",
810 .addr = omap2430_mcspi2_addr_space,
811 - .addr_cnt = ARRAY_SIZE(omap2430_mcspi2_addr_space),
812 .user = OCP_USER_MPU | OCP_USER_SDMA,
813 };
815 @@ -375,6 +374,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[] = {
816 .pa_end = 0x480b80ff,
817 .flags = ADDR_TYPE_RT,
818 },
819 + { }
820 };
822 static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = {
823 @@ -382,7 +382,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = {
824 .slave = &omap2430_mcspi3_hwmod,
825 .clk = "mcspi3_ick",
826 .addr = omap2430_mcspi3_addr_space,
827 - .addr_cnt = ARRAY_SIZE(omap2430_mcspi3_addr_space),
828 .user = OCP_USER_MPU | OCP_USER_SDMA,
829 };
831 @@ -471,6 +470,7 @@ static struct omap_hwmod_addr_space omap2430_timer1_addrs[] = {
832 .pa_end = 0x49018000 + SZ_1K - 1,
833 .flags = ADDR_TYPE_RT
834 },
835 + { }
836 };
838 /* l4_wkup -> timer1 */
839 @@ -479,7 +479,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__timer1 = {
840 .slave = &omap2430_timer1_hwmod,
841 .clk = "gpt1_ick",
842 .addr = omap2430_timer1_addrs,
843 - .addr_cnt = ARRAY_SIZE(omap2430_timer1_addrs),
844 .user = OCP_USER_MPU | OCP_USER_SDMA,
845 };
847 @@ -521,6 +520,7 @@ static struct omap_hwmod_addr_space omap2430_timer2_addrs[] = {
848 .pa_end = 0x4802a000 + SZ_1K - 1,
849 .flags = ADDR_TYPE_RT
850 },
851 + { }
852 };
854 /* l4_core -> timer2 */
855 @@ -529,7 +529,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer2 = {
856 .slave = &omap2430_timer2_hwmod,
857 .clk = "gpt2_ick",
858 .addr = omap2430_timer2_addrs,
859 - .addr_cnt = ARRAY_SIZE(omap2430_timer2_addrs),
860 .user = OCP_USER_MPU | OCP_USER_SDMA,
861 };
863 @@ -571,6 +570,7 @@ static struct omap_hwmod_addr_space omap2430_timer3_addrs[] = {
864 .pa_end = 0x48078000 + SZ_1K - 1,
865 .flags = ADDR_TYPE_RT
866 },
867 + { }
868 };
870 /* l4_core -> timer3 */
871 @@ -579,7 +579,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer3 = {
872 .slave = &omap2430_timer3_hwmod,
873 .clk = "gpt3_ick",
874 .addr = omap2430_timer3_addrs,
875 - .addr_cnt = ARRAY_SIZE(omap2430_timer3_addrs),
876 .user = OCP_USER_MPU | OCP_USER_SDMA,
877 };
879 @@ -621,6 +620,7 @@ static struct omap_hwmod_addr_space omap2430_timer4_addrs[] = {
880 .pa_end = 0x4807a000 + SZ_1K - 1,
881 .flags = ADDR_TYPE_RT
882 },
883 + { }
884 };
886 /* l4_core -> timer4 */
887 @@ -629,7 +629,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer4 = {
888 .slave = &omap2430_timer4_hwmod,
889 .clk = "gpt4_ick",
890 .addr = omap2430_timer4_addrs,
891 - .addr_cnt = ARRAY_SIZE(omap2430_timer4_addrs),
892 .user = OCP_USER_MPU | OCP_USER_SDMA,
893 };
895 @@ -671,6 +670,7 @@ static struct omap_hwmod_addr_space omap2430_timer5_addrs[] = {
896 .pa_end = 0x4807c000 + SZ_1K - 1,
897 .flags = ADDR_TYPE_RT
898 },
899 + { }
900 };
902 /* l4_core -> timer5 */
903 @@ -679,7 +679,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer5 = {
904 .slave = &omap2430_timer5_hwmod,
905 .clk = "gpt5_ick",
906 .addr = omap2430_timer5_addrs,
907 - .addr_cnt = ARRAY_SIZE(omap2430_timer5_addrs),
908 .user = OCP_USER_MPU | OCP_USER_SDMA,
909 };
911 @@ -721,6 +720,7 @@ static struct omap_hwmod_addr_space omap2430_timer6_addrs[] = {
912 .pa_end = 0x4807e000 + SZ_1K - 1,
913 .flags = ADDR_TYPE_RT
914 },
915 + { }
916 };
918 /* l4_core -> timer6 */
919 @@ -729,7 +729,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer6 = {
920 .slave = &omap2430_timer6_hwmod,
921 .clk = "gpt6_ick",
922 .addr = omap2430_timer6_addrs,
923 - .addr_cnt = ARRAY_SIZE(omap2430_timer6_addrs),
924 .user = OCP_USER_MPU | OCP_USER_SDMA,
925 };
927 @@ -771,6 +770,7 @@ static struct omap_hwmod_addr_space omap2430_timer7_addrs[] = {
928 .pa_end = 0x48080000 + SZ_1K - 1,
929 .flags = ADDR_TYPE_RT
930 },
931 + { }
932 };
934 /* l4_core -> timer7 */
935 @@ -779,7 +779,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer7 = {
936 .slave = &omap2430_timer7_hwmod,
937 .clk = "gpt7_ick",
938 .addr = omap2430_timer7_addrs,
939 - .addr_cnt = ARRAY_SIZE(omap2430_timer7_addrs),
940 .user = OCP_USER_MPU | OCP_USER_SDMA,
941 };
943 @@ -821,6 +820,7 @@ static struct omap_hwmod_addr_space omap2430_timer8_addrs[] = {
944 .pa_end = 0x48082000 + SZ_1K - 1,
945 .flags = ADDR_TYPE_RT
946 },
947 + { }
948 };
950 /* l4_core -> timer8 */
951 @@ -829,7 +829,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer8 = {
952 .slave = &omap2430_timer8_hwmod,
953 .clk = "gpt8_ick",
954 .addr = omap2430_timer8_addrs,
955 - .addr_cnt = ARRAY_SIZE(omap2430_timer8_addrs),
956 .user = OCP_USER_MPU | OCP_USER_SDMA,
957 };
959 @@ -871,6 +870,7 @@ static struct omap_hwmod_addr_space omap2430_timer9_addrs[] = {
960 .pa_end = 0x48084000 + SZ_1K - 1,
961 .flags = ADDR_TYPE_RT
962 },
963 + { }
964 };
966 /* l4_core -> timer9 */
967 @@ -879,7 +879,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer9 = {
968 .slave = &omap2430_timer9_hwmod,
969 .clk = "gpt9_ick",
970 .addr = omap2430_timer9_addrs,
971 - .addr_cnt = ARRAY_SIZE(omap2430_timer9_addrs),
972 .user = OCP_USER_MPU | OCP_USER_SDMA,
973 };
975 @@ -921,6 +920,7 @@ static struct omap_hwmod_addr_space omap2430_timer10_addrs[] = {
976 .pa_end = 0x48086000 + SZ_1K - 1,
977 .flags = ADDR_TYPE_RT
978 },
979 + { }
980 };
982 /* l4_core -> timer10 */
983 @@ -929,7 +929,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer10 = {
984 .slave = &omap2430_timer10_hwmod,
985 .clk = "gpt10_ick",
986 .addr = omap2430_timer10_addrs,
987 - .addr_cnt = ARRAY_SIZE(omap2430_timer10_addrs),
988 .user = OCP_USER_MPU | OCP_USER_SDMA,
989 };
991 @@ -971,6 +970,7 @@ static struct omap_hwmod_addr_space omap2430_timer11_addrs[] = {
992 .pa_end = 0x48088000 + SZ_1K - 1,
993 .flags = ADDR_TYPE_RT
994 },
995 + { }
996 };
998 /* l4_core -> timer11 */
999 @@ -979,7 +979,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer11 = {
1000 .slave = &omap2430_timer11_hwmod,
1001 .clk = "gpt11_ick",
1002 .addr = omap2430_timer11_addrs,
1003 - .addr_cnt = ARRAY_SIZE(omap2430_timer11_addrs),
1004 .user = OCP_USER_MPU | OCP_USER_SDMA,
1005 };
1007 @@ -1021,6 +1020,7 @@ static struct omap_hwmod_addr_space omap2430_timer12_addrs[] = {
1008 .pa_end = 0x4808a000 + SZ_1K - 1,
1009 .flags = ADDR_TYPE_RT
1010 },
1011 + { }
1012 };
1014 /* l4_core -> timer12 */
1015 @@ -1029,7 +1029,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer12 = {
1016 .slave = &omap2430_timer12_hwmod,
1017 .clk = "gpt12_ick",
1018 .addr = omap2430_timer12_addrs,
1019 - .addr_cnt = ARRAY_SIZE(omap2430_timer12_addrs),
1020 .user = OCP_USER_MPU | OCP_USER_SDMA,
1021 };
1023 @@ -1066,6 +1065,7 @@ static struct omap_hwmod_addr_space omap2430_wd_timer2_addrs[] = {
1024 .pa_end = 0x4901607f,
1025 .flags = ADDR_TYPE_RT
1026 },
1027 + { }
1028 };
1030 static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = {
1031 @@ -1073,7 +1073,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = {
1032 .slave = &omap2430_wd_timer2_hwmod,
1033 .clk = "mpu_wdt_ick",
1034 .addr = omap2430_wd_timer2_addrs,
1035 - .addr_cnt = ARRAY_SIZE(omap2430_wd_timer2_addrs),
1036 .user = OCP_USER_MPU | OCP_USER_SDMA,
1037 };
1039 @@ -1284,6 +1283,7 @@ static struct omap_hwmod_addr_space omap2430_dss_addrs[] = {
1040 .pa_end = 0x480503FF,
1041 .flags = ADDR_TYPE_RT
1042 },
1043 + { }
1044 };
1046 /* l4_core -> dss */
1047 @@ -1292,7 +1292,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss = {
1048 .slave = &omap2430_dss_core_hwmod,
1049 .clk = "dss_ick",
1050 .addr = omap2430_dss_addrs,
1051 - .addr_cnt = ARRAY_SIZE(omap2430_dss_addrs),
1052 .user = OCP_USER_MPU | OCP_USER_SDMA,
1053 };
1055 @@ -1362,6 +1361,7 @@ static struct omap_hwmod_addr_space omap2430_dss_dispc_addrs[] = {
1056 .pa_end = 0x480507FF,
1057 .flags = ADDR_TYPE_RT
1058 },
1059 + { }
1060 };
1062 /* l4_core -> dss_dispc */
1063 @@ -1370,7 +1370,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_dispc = {
1064 .slave = &omap2430_dss_dispc_hwmod,
1065 .clk = "dss_ick",
1066 .addr = omap2430_dss_dispc_addrs,
1067 - .addr_cnt = ARRAY_SIZE(omap2430_dss_dispc_addrs),
1068 .user = OCP_USER_MPU | OCP_USER_SDMA,
1069 };
1071 @@ -1426,6 +1425,7 @@ static struct omap_hwmod_addr_space omap2430_dss_rfbi_addrs[] = {
1072 .pa_end = 0x48050BFF,
1073 .flags = ADDR_TYPE_RT
1074 },
1075 + { }
1076 };
1078 /* l4_core -> dss_rfbi */
1079 @@ -1434,7 +1434,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_rfbi = {
1080 .slave = &omap2430_dss_rfbi_hwmod,
1081 .clk = "dss_ick",
1082 .addr = omap2430_dss_rfbi_addrs,
1083 - .addr_cnt = ARRAY_SIZE(omap2430_dss_rfbi_addrs),
1084 .user = OCP_USER_MPU | OCP_USER_SDMA,
1085 };
1087 @@ -1476,6 +1475,7 @@ static struct omap_hwmod_addr_space omap2430_dss_venc_addrs[] = {
1088 .pa_end = 0x48050FFF,
1089 .flags = ADDR_TYPE_RT
1090 },
1091 + { }
1092 };
1094 /* l4_core -> dss_venc */
1095 @@ -1484,7 +1484,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_venc = {
1096 .slave = &omap2430_dss_venc_hwmod,
1097 .clk = "dss_54m_fck",
1098 .addr = omap2430_dss_venc_addrs,
1099 - .addr_cnt = ARRAY_SIZE(omap2430_dss_venc_addrs),
1100 .flags = OCPIF_SWSUP_IDLE,
1101 .user = OCP_USER_MPU | OCP_USER_SDMA,
1102 };
1103 @@ -1621,6 +1620,7 @@ static struct omap_hwmod_addr_space omap2430_gpio1_addr_space[] = {
1104 .pa_end = 0x4900C1ff,
1105 .flags = ADDR_TYPE_RT
1106 },
1107 + { }
1108 };
1110 static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = {
1111 @@ -1628,7 +1628,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = {
1112 .slave = &omap2430_gpio1_hwmod,
1113 .clk = "gpios_ick",
1114 .addr = omap2430_gpio1_addr_space,
1115 - .addr_cnt = ARRAY_SIZE(omap2430_gpio1_addr_space),
1116 .user = OCP_USER_MPU | OCP_USER_SDMA,
1117 };
1119 @@ -1639,6 +1638,7 @@ static struct omap_hwmod_addr_space omap2430_gpio2_addr_space[] = {
1120 .pa_end = 0x4900E1ff,
1121 .flags = ADDR_TYPE_RT
1122 },
1123 + { }
1124 };
1126 static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = {
1127 @@ -1646,7 +1646,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = {
1128 .slave = &omap2430_gpio2_hwmod,
1129 .clk = "gpios_ick",
1130 .addr = omap2430_gpio2_addr_space,
1131 - .addr_cnt = ARRAY_SIZE(omap2430_gpio2_addr_space),
1132 .user = OCP_USER_MPU | OCP_USER_SDMA,
1133 };
1135 @@ -1657,6 +1656,7 @@ static struct omap_hwmod_addr_space omap2430_gpio3_addr_space[] = {
1136 .pa_end = 0x490101ff,
1137 .flags = ADDR_TYPE_RT
1138 },
1139 + { }
1140 };
1142 static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = {
1143 @@ -1664,7 +1664,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = {
1144 .slave = &omap2430_gpio3_hwmod,
1145 .clk = "gpios_ick",
1146 .addr = omap2430_gpio3_addr_space,
1147 - .addr_cnt = ARRAY_SIZE(omap2430_gpio3_addr_space),
1148 .user = OCP_USER_MPU | OCP_USER_SDMA,
1149 };
1151 @@ -1675,6 +1674,7 @@ static struct omap_hwmod_addr_space omap2430_gpio4_addr_space[] = {
1152 .pa_end = 0x490121ff,
1153 .flags = ADDR_TYPE_RT
1154 },
1155 + { }
1156 };
1158 static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = {
1159 @@ -1682,7 +1682,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = {
1160 .slave = &omap2430_gpio4_hwmod,
1161 .clk = "gpios_ick",
1162 .addr = omap2430_gpio4_addr_space,
1163 - .addr_cnt = ARRAY_SIZE(omap2430_gpio4_addr_space),
1164 .user = OCP_USER_MPU | OCP_USER_SDMA,
1165 };
1167 @@ -1693,6 +1692,7 @@ static struct omap_hwmod_addr_space omap2430_gpio5_addr_space[] = {
1168 .pa_end = 0x480B61ff,
1169 .flags = ADDR_TYPE_RT
1170 },
1171 + { }
1172 };
1174 static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = {
1175 @@ -1700,7 +1700,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = {
1176 .slave = &omap2430_gpio5_hwmod,
1177 .clk = "gpio5_ick",
1178 .addr = omap2430_gpio5_addr_space,
1179 - .addr_cnt = ARRAY_SIZE(omap2430_gpio5_addr_space),
1180 .user = OCP_USER_MPU | OCP_USER_SDMA,
1181 };
1183 @@ -1923,6 +1922,7 @@ static struct omap_hwmod_addr_space omap2430_dma_system_addrs[] = {
1184 .pa_end = 0x48056fff,
1185 .flags = ADDR_TYPE_RT
1186 },
1187 + { }
1188 };
1190 /* dma_system -> L3 */
1191 @@ -1944,7 +1944,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = {
1192 .slave = &omap2430_dma_system_hwmod,
1193 .clk = "sdma_ick",
1194 .addr = omap2430_dma_system_addrs,
1195 - .addr_cnt = ARRAY_SIZE(omap2430_dma_system_addrs),
1196 .user = OCP_USER_MPU | OCP_USER_SDMA,
1197 };
1199 @@ -2001,6 +2000,7 @@ static struct omap_hwmod_addr_space omap2430_mailbox_addrs[] = {
1200 .pa_end = 0x480941ff,
1201 .flags = ADDR_TYPE_RT,
1202 },
1203 + { }
1204 };
1206 /* l4_core -> mailbox */
1207 @@ -2008,7 +2008,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mailbox = {
1208 .master = &omap2430_l4_core_hwmod,
1209 .slave = &omap2430_mailbox_hwmod,
1210 .addr = omap2430_mailbox_addrs,
1211 - .addr_cnt = ARRAY_SIZE(omap2430_mailbox_addrs),
1212 .user = OCP_USER_MPU | OCP_USER_SDMA,
1213 };
1215 @@ -2287,6 +2286,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp1_addrs[] = {
1216 .pa_end = 0x480740ff,
1217 .flags = ADDR_TYPE_RT
1218 },
1219 + { }
1220 };
1222 /* l4_core -> mcbsp1 */
1223 @@ -2295,7 +2295,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp1 = {
1224 .slave = &omap2430_mcbsp1_hwmod,
1225 .clk = "mcbsp1_ick",
1226 .addr = omap2430_mcbsp1_addrs,
1227 - .addr_cnt = ARRAY_SIZE(omap2430_mcbsp1_addrs),
1228 .user = OCP_USER_MPU | OCP_USER_SDMA,
1229 };
1231 @@ -2345,6 +2344,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp2_addrs[] = {
1232 .pa_end = 0x480760ff,
1233 .flags = ADDR_TYPE_RT
1234 },
1235 + { }
1236 };
1238 /* l4_core -> mcbsp2 */
1239 @@ -2353,7 +2353,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp2 = {
1240 .slave = &omap2430_mcbsp2_hwmod,
1241 .clk = "mcbsp2_ick",
1242 .addr = omap2430_mcbsp2_addrs,
1243 - .addr_cnt = ARRAY_SIZE(omap2430_mcbsp2_addrs),
1244 .user = OCP_USER_MPU | OCP_USER_SDMA,
1245 };
1247 @@ -2403,6 +2402,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp3_addrs[] = {
1248 .pa_end = 0x4808C0ff,
1249 .flags = ADDR_TYPE_RT
1250 },
1251 + { }
1252 };
1254 /* l4_core -> mcbsp3 */
1255 @@ -2411,7 +2411,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp3 = {
1256 .slave = &omap2430_mcbsp3_hwmod,
1257 .clk = "mcbsp3_ick",
1258 .addr = omap2430_mcbsp3_addrs,
1259 - .addr_cnt = ARRAY_SIZE(omap2430_mcbsp3_addrs),
1260 .user = OCP_USER_MPU | OCP_USER_SDMA,
1261 };
1263 @@ -2461,6 +2460,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp4_addrs[] = {
1264 .pa_end = 0x4808E0ff,
1265 .flags = ADDR_TYPE_RT
1266 },
1267 + { }
1268 };
1270 /* l4_core -> mcbsp4 */
1271 @@ -2469,7 +2469,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp4 = {
1272 .slave = &omap2430_mcbsp4_hwmod,
1273 .clk = "mcbsp4_ick",
1274 .addr = omap2430_mcbsp4_addrs,
1275 - .addr_cnt = ARRAY_SIZE(omap2430_mcbsp4_addrs),
1276 .user = OCP_USER_MPU | OCP_USER_SDMA,
1277 };
1279 @@ -2519,6 +2518,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp5_addrs[] = {
1280 .pa_end = 0x480960ff,
1281 .flags = ADDR_TYPE_RT
1282 },
1283 + { }
1284 };
1286 /* l4_core -> mcbsp5 */
1287 @@ -2527,7 +2527,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp5 = {
1288 .slave = &omap2430_mcbsp5_hwmod,
1289 .clk = "mcbsp5_ick",
1290 .addr = omap2430_mcbsp5_addrs,
1291 - .addr_cnt = ARRAY_SIZE(omap2430_mcbsp5_addrs),
1292 .user = OCP_USER_MPU | OCP_USER_SDMA,
1293 };
1295 diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
1296 index 909a84d..6410779 100644
1297 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
1298 +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
1299 @@ -1,7 +1,7 @@
1300 /*
1301 * omap_hwmod_3xxx_data.c - hardware modules present on the OMAP3xxx chips
1302 *
1303 - * Copyright (C) 2009-2010 Nokia Corporation
1304 + * Copyright (C) 2009-2011 Nokia Corporation
1305 * Paul Walmsley
1306 *
1307 * This program is free software; you can redistribute it and/or modify
1308 @@ -111,6 +111,7 @@ static struct omap_hwmod_addr_space omap3xxx_l3_main_addrs[] = {
1309 .pa_end = 0x6800ffff,
1310 .flags = ADDR_TYPE_RT,
1311 },
1312 + { }
1313 };
1315 /* MPU -> L3 interface */
1316 @@ -118,7 +119,6 @@ static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = {
1317 .master = &omap3xxx_mpu_hwmod,
1318 .slave = &omap3xxx_l3_main_hwmod,
1319 .addr = omap3xxx_l3_main_addrs,
1320 - .addr_cnt = ARRAY_SIZE(omap3xxx_l3_main_addrs),
1321 .user = OCP_USER_MPU,
1322 };
1324 @@ -196,6 +196,7 @@ static struct omap_hwmod_addr_space omap3xxx_mmc1_addr_space[] = {
1325 .pa_end = 0x4809c1ff,
1326 .flags = ADDR_TYPE_RT,
1327 },
1328 + { }
1329 };
1331 static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc1 = {
1332 @@ -203,7 +204,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc1 = {
1333 .slave = &omap3xxx_mmc1_hwmod,
1334 .clk = "mmchs1_ick",
1335 .addr = omap3xxx_mmc1_addr_space,
1336 - .addr_cnt = ARRAY_SIZE(omap3xxx_mmc1_addr_space),
1337 .user = OCP_USER_MPU | OCP_USER_SDMA,
1338 .flags = OMAP_FIREWALL_L4
1339 };
1340 @@ -215,6 +215,7 @@ static struct omap_hwmod_addr_space omap3xxx_mmc2_addr_space[] = {
1341 .pa_end = 0x480b41ff,
1342 .flags = ADDR_TYPE_RT,
1343 },
1344 + { }
1345 };
1347 static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc2 = {
1348 @@ -222,7 +223,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc2 = {
1349 .slave = &omap3xxx_mmc2_hwmod,
1350 .clk = "mmchs2_ick",
1351 .addr = omap3xxx_mmc2_addr_space,
1352 - .addr_cnt = ARRAY_SIZE(omap3xxx_mmc2_addr_space),
1353 .user = OCP_USER_MPU | OCP_USER_SDMA,
1354 .flags = OMAP_FIREWALL_L4
1355 };
1356 @@ -234,6 +234,7 @@ static struct omap_hwmod_addr_space omap3xxx_mmc3_addr_space[] = {
1357 .pa_end = 0x480ad1ff,
1358 .flags = ADDR_TYPE_RT,
1359 },
1360 + { }
1361 };
1363 static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc3 = {
1364 @@ -241,7 +242,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc3 = {
1365 .slave = &omap3xxx_mmc3_hwmod,
1366 .clk = "mmchs3_ick",
1367 .addr = omap3xxx_mmc3_addr_space,
1368 - .addr_cnt = ARRAY_SIZE(omap3xxx_mmc3_addr_space),
1369 .user = OCP_USER_MPU | OCP_USER_SDMA,
1370 .flags = OMAP_FIREWALL_L4
1371 };
1372 @@ -253,6 +253,7 @@ static struct omap_hwmod_addr_space omap3xxx_uart1_addr_space[] = {
1373 .pa_end = OMAP3_UART1_BASE + SZ_8K - 1,
1374 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
1375 },
1376 + { }
1377 };
1379 static struct omap_hwmod_ocp_if omap3_l4_core__uart1 = {
1380 @@ -260,7 +261,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__uart1 = {
1381 .slave = &omap3xxx_uart1_hwmod,
1382 .clk = "uart1_ick",
1383 .addr = omap3xxx_uart1_addr_space,
1384 - .addr_cnt = ARRAY_SIZE(omap3xxx_uart1_addr_space),
1385 .user = OCP_USER_MPU | OCP_USER_SDMA,
1386 };
1388 @@ -271,6 +271,7 @@ static struct omap_hwmod_addr_space omap3xxx_uart2_addr_space[] = {
1389 .pa_end = OMAP3_UART2_BASE + SZ_1K - 1,
1390 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
1391 },
1392 + { }
1393 };
1395 static struct omap_hwmod_ocp_if omap3_l4_core__uart2 = {
1396 @@ -278,7 +279,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__uart2 = {
1397 .slave = &omap3xxx_uart2_hwmod,
1398 .clk = "uart2_ick",
1399 .addr = omap3xxx_uart2_addr_space,
1400 - .addr_cnt = ARRAY_SIZE(omap3xxx_uart2_addr_space),
1401 .user = OCP_USER_MPU | OCP_USER_SDMA,
1402 };
1404 @@ -289,6 +289,7 @@ static struct omap_hwmod_addr_space omap3xxx_uart3_addr_space[] = {
1405 .pa_end = OMAP3_UART3_BASE + SZ_1K - 1,
1406 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
1407 },
1408 + { }
1409 };
1411 static struct omap_hwmod_ocp_if omap3_l4_per__uart3 = {
1412 @@ -296,7 +297,6 @@ static struct omap_hwmod_ocp_if omap3_l4_per__uart3 = {
1413 .slave = &omap3xxx_uart3_hwmod,
1414 .clk = "uart3_ick",
1415 .addr = omap3xxx_uart3_addr_space,
1416 - .addr_cnt = ARRAY_SIZE(omap3xxx_uart3_addr_space),
1417 .user = OCP_USER_MPU | OCP_USER_SDMA,
1418 };
1420 @@ -307,6 +307,7 @@ static struct omap_hwmod_addr_space omap3xxx_uart4_addr_space[] = {
1421 .pa_end = OMAP3_UART4_BASE + SZ_1K - 1,
1422 .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
1423 },
1424 + { }
1425 };
1427 static struct omap_hwmod_ocp_if omap3_l4_per__uart4 = {
1428 @@ -314,7 +315,6 @@ static struct omap_hwmod_ocp_if omap3_l4_per__uart4 = {
1429 .slave = &omap3xxx_uart4_hwmod,
1430 .clk = "uart4_ick",
1431 .addr = omap3xxx_uart4_addr_space,
1432 - .addr_cnt = ARRAY_SIZE(omap3xxx_uart4_addr_space),
1433 .user = OCP_USER_MPU | OCP_USER_SDMA,
1434 };
1436 @@ -328,6 +328,7 @@ static struct omap_hwmod_addr_space omap3xxx_i2c1_addr_space[] = {
1437 .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1,
1438 .flags = ADDR_TYPE_RT,
1439 },
1440 + { }
1441 };
1443 static struct omap_hwmod_ocp_if omap3_l4_core__i2c1 = {
1444 @@ -335,7 +336,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c1 = {
1445 .slave = &omap3xxx_i2c1_hwmod,
1446 .clk = "i2c1_ick",
1447 .addr = omap3xxx_i2c1_addr_space,
1448 - .addr_cnt = ARRAY_SIZE(omap3xxx_i2c1_addr_space),
1449 .fw = {
1450 .omap2 = {
1451 .l4_fw_region = OMAP3_L4_CORE_FW_I2C1_REGION,
1452 @@ -353,6 +353,7 @@ static struct omap_hwmod_addr_space omap3xxx_i2c2_addr_space[] = {
1453 .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1,
1454 .flags = ADDR_TYPE_RT,
1455 },
1456 + { }
1457 };
1459 static struct omap_hwmod_ocp_if omap3_l4_core__i2c2 = {
1460 @@ -360,7 +361,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c2 = {
1461 .slave = &omap3xxx_i2c2_hwmod,
1462 .clk = "i2c2_ick",
1463 .addr = omap3xxx_i2c2_addr_space,
1464 - .addr_cnt = ARRAY_SIZE(omap3xxx_i2c2_addr_space),
1465 .fw = {
1466 .omap2 = {
1467 .l4_fw_region = OMAP3_L4_CORE_FW_I2C2_REGION,
1468 @@ -378,6 +378,7 @@ static struct omap_hwmod_addr_space omap3xxx_i2c3_addr_space[] = {
1469 .pa_end = 0x48060000 + OMAP2_I2C_AS_LEN - 1,
1470 .flags = ADDR_TYPE_RT,
1471 },
1472 + { }
1473 };
1475 static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = {
1476 @@ -385,7 +386,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = {
1477 .slave = &omap3xxx_i2c3_hwmod,
1478 .clk = "i2c3_ick",
1479 .addr = omap3xxx_i2c3_addr_space,
1480 - .addr_cnt = ARRAY_SIZE(omap3xxx_i2c3_addr_space),
1481 .fw = {
1482 .omap2 = {
1483 .l4_fw_region = OMAP3_L4_CORE_FW_I2C3_REGION,
1484 @@ -403,6 +403,7 @@ static struct omap_hwmod_addr_space omap3_sr1_addr_space[] = {
1485 .pa_end = OMAP34XX_SR1_BASE + SZ_1K - 1,
1486 .flags = ADDR_TYPE_RT,
1487 },
1488 + { }
1489 };
1491 static struct omap_hwmod_ocp_if omap3_l4_core__sr1 = {
1492 @@ -410,7 +411,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__sr1 = {
1493 .slave = &omap34xx_sr1_hwmod,
1494 .clk = "sr_l4_ick",
1495 .addr = omap3_sr1_addr_space,
1496 - .addr_cnt = ARRAY_SIZE(omap3_sr1_addr_space),
1497 .user = OCP_USER_MPU,
1498 };
1500 @@ -421,6 +421,7 @@ static struct omap_hwmod_addr_space omap3_sr2_addr_space[] = {
1501 .pa_end = OMAP34XX_SR2_BASE + SZ_1K - 1,
1502 .flags = ADDR_TYPE_RT,
1503 },
1504 + { }
1505 };
1507 static struct omap_hwmod_ocp_if omap3_l4_core__sr2 = {
1508 @@ -428,7 +429,6 @@ static struct omap_hwmod_ocp_if omap3_l4_core__sr2 = {
1509 .slave = &omap34xx_sr2_hwmod,
1510 .clk = "sr_l4_ick",
1511 .addr = omap3_sr2_addr_space,
1512 - .addr_cnt = ARRAY_SIZE(omap3_sr2_addr_space),
1513 .user = OCP_USER_MPU,
1514 };
1516 @@ -442,6 +442,7 @@ static struct omap_hwmod_addr_space omap3xxx_usbhsotg_addrs[] = {
1517 .pa_end = OMAP34XX_HSUSB_OTG_BASE + SZ_4K - 1,
1518 .flags = ADDR_TYPE_RT
1519 },
1520 + { }
1521 };
1523 /* l4_core -> usbhsotg */
1524 @@ -450,7 +451,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__usbhsotg = {
1525 .slave = &omap3xxx_usbhsotg_hwmod,
1526 .clk = "l4_ick",
1527 .addr = omap3xxx_usbhsotg_addrs,
1528 - .addr_cnt = ARRAY_SIZE(omap3xxx_usbhsotg_addrs),
1529 .user = OCP_USER_MPU,
1530 };
1532 @@ -468,6 +468,7 @@ static struct omap_hwmod_addr_space am35xx_usbhsotg_addrs[] = {
1533 .pa_end = AM35XX_IPSS_USBOTGSS_BASE + SZ_4K - 1,
1534 .flags = ADDR_TYPE_RT
1535 },
1536 + { }
1537 };
1539 /* l4_core -> usbhsotg */
1540 @@ -476,7 +477,6 @@ static struct omap_hwmod_ocp_if am35xx_l4_core__usbhsotg = {
1541 .slave = &am35xx_usbhsotg_hwmod,
1542 .clk = "l4_ick",
1543 .addr = am35xx_usbhsotg_addrs,
1544 - .addr_cnt = ARRAY_SIZE(am35xx_usbhsotg_addrs),
1545 .user = OCP_USER_MPU,
1546 };
1548 @@ -621,6 +621,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer1_addrs[] = {
1549 .pa_end = 0x48318000 + SZ_1K - 1,
1550 .flags = ADDR_TYPE_RT
1551 },
1552 + { }
1553 };
1555 /* l4_wkup -> timer1 */
1556 @@ -629,7 +630,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__timer1 = {
1557 .slave = &omap3xxx_timer1_hwmod,
1558 .clk = "gpt1_ick",
1559 .addr = omap3xxx_timer1_addrs,
1560 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer1_addrs),
1561 .user = OCP_USER_MPU | OCP_USER_SDMA,
1562 };
1564 @@ -671,6 +671,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer2_addrs[] = {
1565 .pa_end = 0x49032000 + SZ_1K - 1,
1566 .flags = ADDR_TYPE_RT
1567 },
1568 + { }
1569 };
1571 /* l4_per -> timer2 */
1572 @@ -679,7 +680,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer2 = {
1573 .slave = &omap3xxx_timer2_hwmod,
1574 .clk = "gpt2_ick",
1575 .addr = omap3xxx_timer2_addrs,
1576 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer2_addrs),
1577 .user = OCP_USER_MPU | OCP_USER_SDMA,
1578 };
1580 @@ -721,6 +721,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer3_addrs[] = {
1581 .pa_end = 0x49034000 + SZ_1K - 1,
1582 .flags = ADDR_TYPE_RT
1583 },
1584 + { }
1585 };
1587 /* l4_per -> timer3 */
1588 @@ -729,7 +730,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer3 = {
1589 .slave = &omap3xxx_timer3_hwmod,
1590 .clk = "gpt3_ick",
1591 .addr = omap3xxx_timer3_addrs,
1592 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer3_addrs),
1593 .user = OCP_USER_MPU | OCP_USER_SDMA,
1594 };
1596 @@ -771,6 +771,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer4_addrs[] = {
1597 .pa_end = 0x49036000 + SZ_1K - 1,
1598 .flags = ADDR_TYPE_RT
1599 },
1600 + { }
1601 };
1603 /* l4_per -> timer4 */
1604 @@ -779,7 +780,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer4 = {
1605 .slave = &omap3xxx_timer4_hwmod,
1606 .clk = "gpt4_ick",
1607 .addr = omap3xxx_timer4_addrs,
1608 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer4_addrs),
1609 .user = OCP_USER_MPU | OCP_USER_SDMA,
1610 };
1612 @@ -821,6 +821,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer5_addrs[] = {
1613 .pa_end = 0x49038000 + SZ_1K - 1,
1614 .flags = ADDR_TYPE_RT
1615 },
1616 + { }
1617 };
1619 /* l4_per -> timer5 */
1620 @@ -829,7 +830,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer5 = {
1621 .slave = &omap3xxx_timer5_hwmod,
1622 .clk = "gpt5_ick",
1623 .addr = omap3xxx_timer5_addrs,
1624 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer5_addrs),
1625 .user = OCP_USER_MPU | OCP_USER_SDMA,
1626 };
1628 @@ -871,6 +871,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer6_addrs[] = {
1629 .pa_end = 0x4903A000 + SZ_1K - 1,
1630 .flags = ADDR_TYPE_RT
1631 },
1632 + { }
1633 };
1635 /* l4_per -> timer6 */
1636 @@ -879,7 +880,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer6 = {
1637 .slave = &omap3xxx_timer6_hwmod,
1638 .clk = "gpt6_ick",
1639 .addr = omap3xxx_timer6_addrs,
1640 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer6_addrs),
1641 .user = OCP_USER_MPU | OCP_USER_SDMA,
1642 };
1644 @@ -921,6 +921,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer7_addrs[] = {
1645 .pa_end = 0x4903C000 + SZ_1K - 1,
1646 .flags = ADDR_TYPE_RT
1647 },
1648 + { }
1649 };
1651 /* l4_per -> timer7 */
1652 @@ -929,7 +930,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer7 = {
1653 .slave = &omap3xxx_timer7_hwmod,
1654 .clk = "gpt7_ick",
1655 .addr = omap3xxx_timer7_addrs,
1656 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer7_addrs),
1657 .user = OCP_USER_MPU | OCP_USER_SDMA,
1658 };
1660 @@ -971,6 +971,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer8_addrs[] = {
1661 .pa_end = 0x4903E000 + SZ_1K - 1,
1662 .flags = ADDR_TYPE_RT
1663 },
1664 + { }
1665 };
1667 /* l4_per -> timer8 */
1668 @@ -979,7 +980,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer8 = {
1669 .slave = &omap3xxx_timer8_hwmod,
1670 .clk = "gpt8_ick",
1671 .addr = omap3xxx_timer8_addrs,
1672 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer8_addrs),
1673 .user = OCP_USER_MPU | OCP_USER_SDMA,
1674 };
1676 @@ -1021,6 +1021,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer9_addrs[] = {
1677 .pa_end = 0x49040000 + SZ_1K - 1,
1678 .flags = ADDR_TYPE_RT
1679 },
1680 + { }
1681 };
1683 /* l4_per -> timer9 */
1684 @@ -1029,7 +1030,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer9 = {
1685 .slave = &omap3xxx_timer9_hwmod,
1686 .clk = "gpt9_ick",
1687 .addr = omap3xxx_timer9_addrs,
1688 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer9_addrs),
1689 .user = OCP_USER_MPU | OCP_USER_SDMA,
1690 };
1692 @@ -1071,6 +1071,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer10_addrs[] = {
1693 .pa_end = 0x48086000 + SZ_1K - 1,
1694 .flags = ADDR_TYPE_RT
1695 },
1696 + { }
1697 };
1699 /* l4_core -> timer10 */
1700 @@ -1079,7 +1080,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer10 = {
1701 .slave = &omap3xxx_timer10_hwmod,
1702 .clk = "gpt10_ick",
1703 .addr = omap3xxx_timer10_addrs,
1704 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer10_addrs),
1705 .user = OCP_USER_MPU | OCP_USER_SDMA,
1706 };
1708 @@ -1121,6 +1121,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer11_addrs[] = {
1709 .pa_end = 0x48088000 + SZ_1K - 1,
1710 .flags = ADDR_TYPE_RT
1711 },
1712 + { }
1713 };
1715 /* l4_core -> timer11 */
1716 @@ -1129,7 +1130,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer11 = {
1717 .slave = &omap3xxx_timer11_hwmod,
1718 .clk = "gpt11_ick",
1719 .addr = omap3xxx_timer11_addrs,
1720 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer11_addrs),
1721 .user = OCP_USER_MPU | OCP_USER_SDMA,
1722 };
1724 @@ -1171,6 +1171,7 @@ static struct omap_hwmod_addr_space omap3xxx_timer12_addrs[] = {
1725 .pa_end = 0x48304000 + SZ_1K - 1,
1726 .flags = ADDR_TYPE_RT
1727 },
1728 + { }
1729 };
1731 /* l4_core -> timer12 */
1732 @@ -1179,7 +1180,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer12 = {
1733 .slave = &omap3xxx_timer12_hwmod,
1734 .clk = "gpt12_ick",
1735 .addr = omap3xxx_timer12_addrs,
1736 - .addr_cnt = ARRAY_SIZE(omap3xxx_timer12_addrs),
1737 .user = OCP_USER_MPU | OCP_USER_SDMA,
1738 };
1740 @@ -1216,6 +1216,7 @@ static struct omap_hwmod_addr_space omap3xxx_wd_timer2_addrs[] = {
1741 .pa_end = 0x4831407f,
1742 .flags = ADDR_TYPE_RT
1743 },
1744 + { }
1745 };
1747 static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2 = {
1748 @@ -1223,7 +1224,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2 = {
1749 .slave = &omap3xxx_wd_timer2_hwmod,
1750 .clk = "wdt2_ick",
1751 .addr = omap3xxx_wd_timer2_addrs,
1752 - .addr_cnt = ARRAY_SIZE(omap3xxx_wd_timer2_addrs),
1753 .user = OCP_USER_MPU | OCP_USER_SDMA,
1754 };
1756 @@ -1497,6 +1497,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_addrs[] = {
1757 .pa_end = 0x480503FF,
1758 .flags = ADDR_TYPE_RT
1759 },
1760 + { }
1761 };
1763 /* l4_core -> dss */
1764 @@ -1505,7 +1506,6 @@ static struct omap_hwmod_ocp_if omap3430es1_l4_core__dss = {
1765 .slave = &omap3430es1_dss_core_hwmod,
1766 .clk = "dss_ick",
1767 .addr = omap3xxx_dss_addrs,
1768 - .addr_cnt = ARRAY_SIZE(omap3xxx_dss_addrs),
1769 .fw = {
1770 .omap2 = {
1771 .l4_fw_region = OMAP3ES1_L4_CORE_FW_DSS_CORE_REGION,
1772 @@ -1521,7 +1521,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss = {
1773 .slave = &omap3xxx_dss_core_hwmod,
1774 .clk = "dss_ick",
1775 .addr = omap3xxx_dss_addrs,
1776 - .addr_cnt = ARRAY_SIZE(omap3xxx_dss_addrs),
1777 .fw = {
1778 .omap2 = {
1779 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_CORE_REGION,
1780 @@ -1632,6 +1631,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_dispc_addrs[] = {
1781 .pa_end = 0x480507FF,
1782 .flags = ADDR_TYPE_RT
1783 },
1784 + { }
1785 };
1787 /* l4_core -> dss_dispc */
1788 @@ -1640,7 +1640,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dispc = {
1789 .slave = &omap3xxx_dss_dispc_hwmod,
1790 .clk = "dss_ick",
1791 .addr = omap3xxx_dss_dispc_addrs,
1792 - .addr_cnt = ARRAY_SIZE(omap3xxx_dss_dispc_addrs),
1793 .fw = {
1794 .omap2 = {
1795 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_DISPC_REGION,
1796 @@ -1697,6 +1696,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_dsi1_addrs[] = {
1797 .pa_end = 0x4804FFFF,
1798 .flags = ADDR_TYPE_RT
1799 },
1800 + { }
1801 };
1803 /* l4_core -> dss_dsi1 */
1804 @@ -1704,7 +1704,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dsi1 = {
1805 .master = &omap3xxx_l4_core_hwmod,
1806 .slave = &omap3xxx_dss_dsi1_hwmod,
1807 .addr = omap3xxx_dss_dsi1_addrs,
1808 - .addr_cnt = ARRAY_SIZE(omap3xxx_dss_dsi1_addrs),
1809 .fw = {
1810 .omap2 = {
1811 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_DSI_REGION,
1812 @@ -1767,6 +1766,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_rfbi_addrs[] = {
1813 .pa_end = 0x48050BFF,
1814 .flags = ADDR_TYPE_RT
1815 },
1816 + { }
1817 };
1819 /* l4_core -> dss_rfbi */
1820 @@ -1775,7 +1775,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_rfbi = {
1821 .slave = &omap3xxx_dss_rfbi_hwmod,
1822 .clk = "dss_ick",
1823 .addr = omap3xxx_dss_rfbi_addrs,
1824 - .addr_cnt = ARRAY_SIZE(omap3xxx_dss_rfbi_addrs),
1825 .fw = {
1826 .omap2 = {
1827 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_RFBI_REGION,
1828 @@ -1826,6 +1825,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_venc_addrs[] = {
1829 .pa_end = 0x48050FFF,
1830 .flags = ADDR_TYPE_RT
1831 },
1832 + { }
1833 };
1835 /* l4_core -> dss_venc */
1836 @@ -1834,7 +1834,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_venc = {
1837 .slave = &omap3xxx_dss_venc_hwmod,
1838 .clk = "dss_tv_fck",
1839 .addr = omap3xxx_dss_venc_addrs,
1840 - .addr_cnt = ARRAY_SIZE(omap3xxx_dss_venc_addrs),
1841 .fw = {
1842 .omap2 = {
1843 .l4_fw_region = OMAP3_L4_CORE_FW_DSS_VENC_REGION,
1844 @@ -2003,13 +2002,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio1_addrs[] = {
1845 .pa_end = 0x483101ff,
1846 .flags = ADDR_TYPE_RT
1847 },
1848 + { }
1849 };
1851 static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__gpio1 = {
1852 .master = &omap3xxx_l4_wkup_hwmod,
1853 .slave = &omap3xxx_gpio1_hwmod,
1854 .addr = omap3xxx_gpio1_addrs,
1855 - .addr_cnt = ARRAY_SIZE(omap3xxx_gpio1_addrs),
1856 .user = OCP_USER_MPU | OCP_USER_SDMA,
1857 };
1859 @@ -2020,13 +2019,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio2_addrs[] = {
1860 .pa_end = 0x490501ff,
1861 .flags = ADDR_TYPE_RT
1862 },
1863 + { }
1864 };
1866 static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio2 = {
1867 .master = &omap3xxx_l4_per_hwmod,
1868 .slave = &omap3xxx_gpio2_hwmod,
1869 .addr = omap3xxx_gpio2_addrs,
1870 - .addr_cnt = ARRAY_SIZE(omap3xxx_gpio2_addrs),
1871 .user = OCP_USER_MPU | OCP_USER_SDMA,
1872 };
1874 @@ -2037,13 +2036,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio3_addrs[] = {
1875 .pa_end = 0x490521ff,
1876 .flags = ADDR_TYPE_RT
1877 },
1878 + { }
1879 };
1881 static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio3 = {
1882 .master = &omap3xxx_l4_per_hwmod,
1883 .slave = &omap3xxx_gpio3_hwmod,
1884 .addr = omap3xxx_gpio3_addrs,
1885 - .addr_cnt = ARRAY_SIZE(omap3xxx_gpio3_addrs),
1886 .user = OCP_USER_MPU | OCP_USER_SDMA,
1887 };
1889 @@ -2054,13 +2053,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio4_addrs[] = {
1890 .pa_end = 0x490541ff,
1891 .flags = ADDR_TYPE_RT
1892 },
1893 + { }
1894 };
1896 static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio4 = {
1897 .master = &omap3xxx_l4_per_hwmod,
1898 .slave = &omap3xxx_gpio4_hwmod,
1899 .addr = omap3xxx_gpio4_addrs,
1900 - .addr_cnt = ARRAY_SIZE(omap3xxx_gpio4_addrs),
1901 .user = OCP_USER_MPU | OCP_USER_SDMA,
1902 };
1904 @@ -2071,13 +2070,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio5_addrs[] = {
1905 .pa_end = 0x490561ff,
1906 .flags = ADDR_TYPE_RT
1907 },
1908 + { }
1909 };
1911 static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio5 = {
1912 .master = &omap3xxx_l4_per_hwmod,
1913 .slave = &omap3xxx_gpio5_hwmod,
1914 .addr = omap3xxx_gpio5_addrs,
1915 - .addr_cnt = ARRAY_SIZE(omap3xxx_gpio5_addrs),
1916 .user = OCP_USER_MPU | OCP_USER_SDMA,
1917 };
1919 @@ -2088,13 +2087,13 @@ static struct omap_hwmod_addr_space omap3xxx_gpio6_addrs[] = {
1920 .pa_end = 0x490581ff,
1921 .flags = ADDR_TYPE_RT
1922 },
1923 + { }
1924 };
1926 static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio6 = {
1927 .master = &omap3xxx_l4_per_hwmod,
1928 .slave = &omap3xxx_gpio6_hwmod,
1929 .addr = omap3xxx_gpio6_addrs,
1930 - .addr_cnt = ARRAY_SIZE(omap3xxx_gpio6_addrs),
1931 .user = OCP_USER_MPU | OCP_USER_SDMA,
1932 };
1934 @@ -2395,6 +2394,7 @@ static struct omap_hwmod_addr_space omap3xxx_dma_system_addrs[] = {
1935 .pa_end = 0x48056fff,
1936 .flags = ADDR_TYPE_RT
1937 },
1938 + { }
1939 };
1941 /* dma_system master ports */
1942 @@ -2408,7 +2408,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dma_system = {
1943 .slave = &omap3xxx_dma_system_hwmod,
1944 .clk = "core_l4_ick",
1945 .addr = omap3xxx_dma_system_addrs,
1946 - .addr_cnt = ARRAY_SIZE(omap3xxx_dma_system_addrs),
1947 .user = OCP_USER_MPU | OCP_USER_SDMA,
1948 };
1950 @@ -2480,6 +2479,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp1_addrs[] = {
1951 .pa_end = 0x480740ff,
1952 .flags = ADDR_TYPE_RT
1953 },
1954 + { }
1955 };
1957 /* l4_core -> mcbsp1 */
1958 @@ -2488,7 +2488,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mcbsp1 = {
1959 .slave = &omap3xxx_mcbsp1_hwmod,
1960 .clk = "mcbsp1_ick",
1961 .addr = omap3xxx_mcbsp1_addrs,
1962 - .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp1_addrs),
1963 .user = OCP_USER_MPU | OCP_USER_SDMA,
1964 };
1966 @@ -2538,6 +2537,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp2_addrs[] = {
1967 .pa_end = 0x490220ff,
1968 .flags = ADDR_TYPE_RT
1969 },
1970 + { }
1971 };
1973 /* l4_per -> mcbsp2 */
1974 @@ -2546,7 +2546,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp2 = {
1975 .slave = &omap3xxx_mcbsp2_hwmod,
1976 .clk = "mcbsp2_ick",
1977 .addr = omap3xxx_mcbsp2_addrs,
1978 - .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp2_addrs),
1979 +
1980 .user = OCP_USER_MPU | OCP_USER_SDMA,
1981 };
1983 @@ -2601,6 +2601,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp3_addrs[] = {
1984 .pa_end = 0x490240ff,
1985 .flags = ADDR_TYPE_RT
1986 },
1987 + { }
1988 };
1990 /* l4_per -> mcbsp3 */
1991 @@ -2609,7 +2610,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp3 = {
1992 .slave = &omap3xxx_mcbsp3_hwmod,
1993 .clk = "mcbsp3_ick",
1994 .addr = omap3xxx_mcbsp3_addrs,
1995 - .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp3_addrs),
1996 .user = OCP_USER_MPU | OCP_USER_SDMA,
1997 };
1999 @@ -2664,6 +2664,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp4_addrs[] = {
2000 .pa_end = 0x490260ff,
2001 .flags = ADDR_TYPE_RT
2002 },
2003 + { }
2004 };
2006 /* l4_per -> mcbsp4 */
2007 @@ -2672,7 +2673,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp4 = {
2008 .slave = &omap3xxx_mcbsp4_hwmod,
2009 .clk = "mcbsp4_ick",
2010 .addr = omap3xxx_mcbsp4_addrs,
2011 - .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp4_addrs),
2012 .user = OCP_USER_MPU | OCP_USER_SDMA,
2013 };
2015 @@ -2722,6 +2722,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp5_addrs[] = {
2016 .pa_end = 0x480960ff,
2017 .flags = ADDR_TYPE_RT
2018 },
2019 + { }
2020 };
2022 /* l4_core -> mcbsp5 */
2023 @@ -2730,7 +2731,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mcbsp5 = {
2024 .slave = &omap3xxx_mcbsp5_hwmod,
2025 .clk = "mcbsp5_ick",
2026 .addr = omap3xxx_mcbsp5_addrs,
2027 - .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp5_addrs),
2028 .user = OCP_USER_MPU | OCP_USER_SDMA,
2029 };
2031 @@ -2785,6 +2785,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp2_sidetone_addrs[] = {
2032 .pa_end = 0x490280ff,
2033 .flags = ADDR_TYPE_RT
2034 },
2035 + { }
2036 };
2038 /* l4_per -> mcbsp2_sidetone */
2039 @@ -2793,7 +2794,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp2_sidetone = {
2040 .slave = &omap3xxx_mcbsp2_sidetone_hwmod,
2041 .clk = "mcbsp2_ick",
2042 .addr = omap3xxx_mcbsp2_sidetone_addrs,
2043 - .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp2_sidetone_addrs),
2044 .user = OCP_USER_MPU,
2045 };
2047 @@ -2834,6 +2834,7 @@ static struct omap_hwmod_addr_space omap3xxx_mcbsp3_sidetone_addrs[] = {
2048 .pa_end = 0x4902A0ff,
2049 .flags = ADDR_TYPE_RT
2050 },
2051 + { }
2052 };
2054 /* l4_per -> mcbsp3_sidetone */
2055 @@ -2842,7 +2843,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp3_sidetone = {
2056 .slave = &omap3xxx_mcbsp3_sidetone_hwmod,
2057 .clk = "mcbsp3_ick",
2058 .addr = omap3xxx_mcbsp3_sidetone_addrs,
2059 - .addr_cnt = ARRAY_SIZE(omap3xxx_mcbsp3_sidetone_addrs),
2060 .user = OCP_USER_MPU,
2061 };
2063 @@ -3033,6 +3033,7 @@ static struct omap_hwmod_addr_space omap3xxx_mailbox_addrs[] = {
2064 .pa_end = 0x480941ff,
2065 .flags = ADDR_TYPE_RT,
2066 },
2067 + { }
2068 };
2070 /* l4_core -> mailbox */
2071 @@ -3040,7 +3041,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__mailbox = {
2072 .master = &omap3xxx_l4_core_hwmod,
2073 .slave = &omap3xxx_mailbox_hwmod,
2074 .addr = omap3xxx_mailbox_addrs,
2075 - .addr_cnt = ARRAY_SIZE(omap3xxx_mailbox_addrs),
2076 .user = OCP_USER_MPU | OCP_USER_SDMA,
2077 };
2079 @@ -3076,6 +3076,7 @@ static struct omap_hwmod_addr_space omap34xx_mcspi1_addr_space[] = {
2080 .pa_end = 0x480980ff,
2081 .flags = ADDR_TYPE_RT,
2082 },
2083 + { }
2084 };
2086 static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi1 = {
2087 @@ -3083,7 +3084,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi1 = {
2088 .slave = &omap34xx_mcspi1,
2089 .clk = "mcspi1_ick",
2090 .addr = omap34xx_mcspi1_addr_space,
2091 - .addr_cnt = ARRAY_SIZE(omap34xx_mcspi1_addr_space),
2092 .user = OCP_USER_MPU | OCP_USER_SDMA,
2093 };
2095 @@ -3094,6 +3094,7 @@ static struct omap_hwmod_addr_space omap34xx_mcspi2_addr_space[] = {
2096 .pa_end = 0x4809a0ff,
2097 .flags = ADDR_TYPE_RT,
2098 },
2099 + { }
2100 };
2102 static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi2 = {
2103 @@ -3101,7 +3102,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi2 = {
2104 .slave = &omap34xx_mcspi2,
2105 .clk = "mcspi2_ick",
2106 .addr = omap34xx_mcspi2_addr_space,
2107 - .addr_cnt = ARRAY_SIZE(omap34xx_mcspi2_addr_space),
2108 .user = OCP_USER_MPU | OCP_USER_SDMA,
2109 };
2111 @@ -3112,6 +3112,7 @@ static struct omap_hwmod_addr_space omap34xx_mcspi3_addr_space[] = {
2112 .pa_end = 0x480b80ff,
2113 .flags = ADDR_TYPE_RT,
2114 },
2115 + { }
2116 };
2118 static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi3 = {
2119 @@ -3119,7 +3120,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi3 = {
2120 .slave = &omap34xx_mcspi3,
2121 .clk = "mcspi3_ick",
2122 .addr = omap34xx_mcspi3_addr_space,
2123 - .addr_cnt = ARRAY_SIZE(omap34xx_mcspi3_addr_space),
2124 .user = OCP_USER_MPU | OCP_USER_SDMA,
2125 };
2127 @@ -3130,6 +3130,7 @@ static struct omap_hwmod_addr_space omap34xx_mcspi4_addr_space[] = {
2128 .pa_end = 0x480ba0ff,
2129 .flags = ADDR_TYPE_RT,
2130 },
2131 + { }
2132 };
2134 static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi4 = {
2135 @@ -3137,7 +3138,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi4 = {
2136 .slave = &omap34xx_mcspi4,
2137 .clk = "mcspi4_ick",
2138 .addr = omap34xx_mcspi4_addr_space,
2139 - .addr_cnt = ARRAY_SIZE(omap34xx_mcspi4_addr_space),
2140 .user = OCP_USER_MPU | OCP_USER_SDMA,
2141 };
2143 diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
2144 index 8cbbfbf..f8ccc4a 100644
2145 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
2146 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
2147 @@ -95,6 +95,7 @@ static struct omap_hwmod_addr_space omap44xx_dmm_addrs[] = {
2148 .pa_end = 0x4e0007ff,
2149 .flags = ADDR_TYPE_RT
2150 },
2151 + { }
2152 };
2154 /* mpu -> dmm */
2155 @@ -103,7 +104,6 @@ static struct omap_hwmod_ocp_if omap44xx_mpu__dmm = {
2156 .slave = &omap44xx_dmm_hwmod,
2157 .clk = "l3_div_ck",
2158 .addr = omap44xx_dmm_addrs,
2159 - .addr_cnt = ARRAY_SIZE(omap44xx_dmm_addrs),
2160 .user = OCP_USER_MPU,
2161 };
2163 @@ -150,6 +150,7 @@ static struct omap_hwmod_addr_space omap44xx_emif_fw_addrs[] = {
2164 .pa_end = 0x4a20c0ff,
2165 .flags = ADDR_TYPE_RT
2166 },
2167 + { }
2168 };
2170 /* l4_cfg -> emif_fw */
2171 @@ -158,7 +159,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__emif_fw = {
2172 .slave = &omap44xx_emif_fw_hwmod,
2173 .clk = "l4_div_ck",
2174 .addr = omap44xx_emif_fw_addrs,
2175 - .addr_cnt = ARRAY_SIZE(omap44xx_emif_fw_addrs),
2176 .user = OCP_USER_MPU,
2177 };
2179 @@ -276,6 +276,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_1_addrs[] = {
2180 .pa_end = 0x44000fff,
2181 .flags = ADDR_TYPE_RT,
2182 },
2183 + { }
2184 };
2186 /* mpu -> l3_main_1 */
2187 @@ -284,7 +285,6 @@ static struct omap_hwmod_ocp_if omap44xx_mpu__l3_main_1 = {
2188 .slave = &omap44xx_l3_main_1_hwmod,
2189 .clk = "l3_div_ck",
2190 .addr = omap44xx_l3_main_1_addrs,
2191 - .addr_cnt = ARRAY_SIZE(omap44xx_l3_main_1_addrs),
2192 .user = OCP_USER_MPU | OCP_USER_SDMA,
2193 };
2195 @@ -356,6 +356,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_2_addrs[] = {
2196 .pa_end = 0x44801fff,
2197 .flags = ADDR_TYPE_RT,
2198 },
2199 + { }
2200 };
2202 /* l3_main_1 -> l3_main_2 */
2203 @@ -364,7 +365,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_2 = {
2204 .slave = &omap44xx_l3_main_2_hwmod,
2205 .clk = "l3_div_ck",
2206 .addr = omap44xx_l3_main_2_addrs,
2207 - .addr_cnt = ARRAY_SIZE(omap44xx_l3_main_2_addrs),
2208 .user = OCP_USER_MPU | OCP_USER_SDMA,
2209 };
2211 @@ -411,6 +411,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = {
2212 .pa_end = 0x45000fff,
2213 .flags = ADDR_TYPE_RT,
2214 },
2215 + { }
2216 };
2218 /* l3_main_1 -> l3_main_3 */
2219 @@ -419,7 +420,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_3 = {
2220 .slave = &omap44xx_l3_main_3_hwmod,
2221 .clk = "l3_div_ck",
2222 .addr = omap44xx_l3_main_3_addrs,
2223 - .addr_cnt = ARRAY_SIZE(omap44xx_l3_main_3_addrs),
2224 .user = OCP_USER_MPU | OCP_USER_SDMA,
2225 };
2227 @@ -697,6 +697,7 @@ static struct omap_hwmod_addr_space omap44xx_aess_addrs[] = {
2228 .pa_end = 0x401f13ff,
2229 .flags = ADDR_TYPE_RT
2230 },
2231 + { }
2232 };
2234 /* l4_abe -> aess */
2235 @@ -705,7 +706,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess = {
2236 .slave = &omap44xx_aess_hwmod,
2237 .clk = "ocp_abe_iclk",
2238 .addr = omap44xx_aess_addrs,
2239 - .addr_cnt = ARRAY_SIZE(omap44xx_aess_addrs),
2240 .user = OCP_USER_MPU,
2241 };
2243 @@ -715,6 +715,7 @@ static struct omap_hwmod_addr_space omap44xx_aess_dma_addrs[] = {
2244 .pa_end = 0x490f13ff,
2245 .flags = ADDR_TYPE_RT
2246 },
2247 + { }
2248 };
2250 /* l4_abe -> aess (dma) */
2251 @@ -723,7 +724,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess_dma = {
2252 .slave = &omap44xx_aess_hwmod,
2253 .clk = "ocp_abe_iclk",
2254 .addr = omap44xx_aess_dma_addrs,
2255 - .addr_cnt = ARRAY_SIZE(omap44xx_aess_dma_addrs),
2256 .user = OCP_USER_SDMA,
2257 };
2259 @@ -807,6 +807,7 @@ static struct omap_hwmod_addr_space omap44xx_counter_32k_addrs[] = {
2260 .pa_end = 0x4a30401f,
2261 .flags = ADDR_TYPE_RT
2262 },
2263 + { }
2264 };
2266 /* l4_wkup -> counter_32k */
2267 @@ -815,7 +816,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__counter_32k = {
2268 .slave = &omap44xx_counter_32k_hwmod,
2269 .clk = "l4_wkup_clk_mux_ck",
2270 .addr = omap44xx_counter_32k_addrs,
2271 - .addr_cnt = ARRAY_SIZE(omap44xx_counter_32k_addrs),
2272 .user = OCP_USER_MPU | OCP_USER_SDMA,
2273 };
2275 @@ -889,6 +889,7 @@ static struct omap_hwmod_addr_space omap44xx_dma_system_addrs[] = {
2276 .pa_end = 0x4a056fff,
2277 .flags = ADDR_TYPE_RT
2278 },
2279 + { }
2280 };
2282 /* l4_cfg -> dma_system */
2283 @@ -897,7 +898,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__dma_system = {
2284 .slave = &omap44xx_dma_system_hwmod,
2285 .clk = "l4_div_ck",
2286 .addr = omap44xx_dma_system_addrs,
2287 - .addr_cnt = ARRAY_SIZE(omap44xx_dma_system_addrs),
2288 .user = OCP_USER_MPU | OCP_USER_SDMA,
2289 };
2291 @@ -961,6 +961,7 @@ static struct omap_hwmod_addr_space omap44xx_dmic_addrs[] = {
2292 .pa_end = 0x4012e07f,
2293 .flags = ADDR_TYPE_RT
2294 },
2295 + { }
2296 };
2298 /* l4_abe -> dmic */
2299 @@ -969,7 +970,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic = {
2300 .slave = &omap44xx_dmic_hwmod,
2301 .clk = "ocp_abe_iclk",
2302 .addr = omap44xx_dmic_addrs,
2303 - .addr_cnt = ARRAY_SIZE(omap44xx_dmic_addrs),
2304 .user = OCP_USER_MPU,
2305 };
2307 @@ -979,6 +979,7 @@ static struct omap_hwmod_addr_space omap44xx_dmic_dma_addrs[] = {
2308 .pa_end = 0x4902e07f,
2309 .flags = ADDR_TYPE_RT
2310 },
2311 + { }
2312 };
2314 /* l4_abe -> dmic (dma) */
2315 @@ -987,7 +988,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic_dma = {
2316 .slave = &omap44xx_dmic_hwmod,
2317 .clk = "ocp_abe_iclk",
2318 .addr = omap44xx_dmic_dma_addrs,
2319 - .addr_cnt = ARRAY_SIZE(omap44xx_dmic_dma_addrs),
2320 .user = OCP_USER_SDMA,
2321 };
2323 @@ -1128,6 +1128,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dma_addrs[] = {
2324 .pa_end = 0x5800007f,
2325 .flags = ADDR_TYPE_RT
2326 },
2327 + { }
2328 };
2330 /* l3_main_2 -> dss */
2331 @@ -1136,7 +1137,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss = {
2332 .slave = &omap44xx_dss_hwmod,
2333 .clk = "l3_div_ck",
2334 .addr = omap44xx_dss_dma_addrs,
2335 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_dma_addrs),
2336 .user = OCP_USER_SDMA,
2337 };
2339 @@ -1146,6 +1146,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_addrs[] = {
2340 .pa_end = 0x4804007f,
2341 .flags = ADDR_TYPE_RT
2342 },
2343 + { }
2344 };
2346 /* l4_per -> dss */
2347 @@ -1154,7 +1155,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss = {
2348 .slave = &omap44xx_dss_hwmod,
2349 .clk = "l4_div_ck",
2350 .addr = omap44xx_dss_addrs,
2351 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_addrs),
2352 .user = OCP_USER_MPU,
2353 };
2355 @@ -1228,6 +1228,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dispc_dma_addrs[] = {
2356 .pa_end = 0x58001fff,
2357 .flags = ADDR_TYPE_RT
2358 },
2359 + { }
2360 };
2362 /* l3_main_2 -> dss_dispc */
2363 @@ -1236,7 +1237,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dispc = {
2364 .slave = &omap44xx_dss_dispc_hwmod,
2365 .clk = "l3_div_ck",
2366 .addr = omap44xx_dss_dispc_dma_addrs,
2367 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_dispc_dma_addrs),
2368 .user = OCP_USER_SDMA,
2369 };
2371 @@ -1246,6 +1246,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dispc_addrs[] = {
2372 .pa_end = 0x48041fff,
2373 .flags = ADDR_TYPE_RT
2374 },
2375 + { }
2376 };
2378 /* l4_per -> dss_dispc */
2379 @@ -1254,7 +1255,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dispc = {
2380 .slave = &omap44xx_dss_dispc_hwmod,
2381 .clk = "l4_div_ck",
2382 .addr = omap44xx_dss_dispc_addrs,
2383 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_dispc_addrs),
2384 .user = OCP_USER_MPU,
2385 };
2387 @@ -1319,6 +1319,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dsi1_dma_addrs[] = {
2388 .pa_end = 0x580041ff,
2389 .flags = ADDR_TYPE_RT
2390 },
2391 + { }
2392 };
2394 /* l3_main_2 -> dss_dsi1 */
2395 @@ -1327,7 +1328,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dsi1 = {
2396 .slave = &omap44xx_dss_dsi1_hwmod,
2397 .clk = "l3_div_ck",
2398 .addr = omap44xx_dss_dsi1_dma_addrs,
2399 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_dsi1_dma_addrs),
2400 .user = OCP_USER_SDMA,
2401 };
2403 @@ -1337,6 +1337,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dsi1_addrs[] = {
2404 .pa_end = 0x480441ff,
2405 .flags = ADDR_TYPE_RT
2406 },
2407 + { }
2408 };
2410 /* l4_per -> dss_dsi1 */
2411 @@ -1345,7 +1346,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dsi1 = {
2412 .slave = &omap44xx_dss_dsi1_hwmod,
2413 .clk = "l4_div_ck",
2414 .addr = omap44xx_dss_dsi1_addrs,
2415 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_dsi1_addrs),
2416 .user = OCP_USER_MPU,
2417 };
2419 @@ -1389,6 +1389,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dsi2_dma_addrs[] = {
2420 .pa_end = 0x580051ff,
2421 .flags = ADDR_TYPE_RT
2422 },
2423 + { }
2424 };
2426 /* l3_main_2 -> dss_dsi2 */
2427 @@ -1397,7 +1398,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dsi2 = {
2428 .slave = &omap44xx_dss_dsi2_hwmod,
2429 .clk = "l3_div_ck",
2430 .addr = omap44xx_dss_dsi2_dma_addrs,
2431 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_dsi2_dma_addrs),
2432 .user = OCP_USER_SDMA,
2433 };
2435 @@ -1407,6 +1407,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_dsi2_addrs[] = {
2436 .pa_end = 0x480451ff,
2437 .flags = ADDR_TYPE_RT
2438 },
2439 + { }
2440 };
2442 /* l4_per -> dss_dsi2 */
2443 @@ -1415,7 +1416,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dsi2 = {
2444 .slave = &omap44xx_dss_dsi2_hwmod,
2445 .clk = "l4_div_ck",
2446 .addr = omap44xx_dss_dsi2_addrs,
2447 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_dsi2_addrs),
2448 .user = OCP_USER_MPU,
2449 };
2451 @@ -1479,6 +1479,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_hdmi_dma_addrs[] = {
2452 .pa_end = 0x58006fff,
2453 .flags = ADDR_TYPE_RT
2454 },
2455 + { }
2456 };
2458 /* l3_main_2 -> dss_hdmi */
2459 @@ -1487,7 +1488,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_hdmi = {
2460 .slave = &omap44xx_dss_hdmi_hwmod,
2461 .clk = "l3_div_ck",
2462 .addr = omap44xx_dss_hdmi_dma_addrs,
2463 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_hdmi_dma_addrs),
2464 .user = OCP_USER_SDMA,
2465 };
2467 @@ -1497,6 +1497,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_hdmi_addrs[] = {
2468 .pa_end = 0x48046fff,
2469 .flags = ADDR_TYPE_RT
2470 },
2471 + { }
2472 };
2474 /* l4_per -> dss_hdmi */
2475 @@ -1505,7 +1506,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_hdmi = {
2476 .slave = &omap44xx_dss_hdmi_hwmod,
2477 .clk = "l4_div_ck",
2478 .addr = omap44xx_dss_hdmi_addrs,
2479 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_hdmi_addrs),
2480 .user = OCP_USER_MPU,
2481 };
2483 @@ -1565,6 +1565,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_rfbi_dma_addrs[] = {
2484 .pa_end = 0x580020ff,
2485 .flags = ADDR_TYPE_RT
2486 },
2487 + { }
2488 };
2490 /* l3_main_2 -> dss_rfbi */
2491 @@ -1573,7 +1574,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_rfbi = {
2492 .slave = &omap44xx_dss_rfbi_hwmod,
2493 .clk = "l3_div_ck",
2494 .addr = omap44xx_dss_rfbi_dma_addrs,
2495 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_rfbi_dma_addrs),
2496 .user = OCP_USER_SDMA,
2497 };
2499 @@ -1583,6 +1583,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_rfbi_addrs[] = {
2500 .pa_end = 0x480420ff,
2501 .flags = ADDR_TYPE_RT
2502 },
2503 + { }
2504 };
2506 /* l4_per -> dss_rfbi */
2507 @@ -1591,7 +1592,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_rfbi = {
2508 .slave = &omap44xx_dss_rfbi_hwmod,
2509 .clk = "l4_div_ck",
2510 .addr = omap44xx_dss_rfbi_addrs,
2511 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_rfbi_addrs),
2512 .user = OCP_USER_MPU,
2513 };
2515 @@ -1634,6 +1634,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_venc_dma_addrs[] = {
2516 .pa_end = 0x580030ff,
2517 .flags = ADDR_TYPE_RT
2518 },
2519 + { }
2520 };
2522 /* l3_main_2 -> dss_venc */
2523 @@ -1642,7 +1643,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_venc = {
2524 .slave = &omap44xx_dss_venc_hwmod,
2525 .clk = "l3_div_ck",
2526 .addr = omap44xx_dss_venc_dma_addrs,
2527 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_venc_dma_addrs),
2528 .user = OCP_USER_SDMA,
2529 };
2531 @@ -1652,6 +1652,7 @@ static struct omap_hwmod_addr_space omap44xx_dss_venc_addrs[] = {
2532 .pa_end = 0x480430ff,
2533 .flags = ADDR_TYPE_RT
2534 },
2535 + { }
2536 };
2538 /* l4_per -> dss_venc */
2539 @@ -1660,7 +1661,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_venc = {
2540 .slave = &omap44xx_dss_venc_hwmod,
2541 .clk = "l4_div_ck",
2542 .addr = omap44xx_dss_venc_addrs,
2543 - .addr_cnt = ARRAY_SIZE(omap44xx_dss_venc_addrs),
2544 .user = OCP_USER_MPU,
2545 };
2547 @@ -1725,6 +1725,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio1_addrs[] = {
2548 .pa_end = 0x4a3101ff,
2549 .flags = ADDR_TYPE_RT
2550 },
2551 + { }
2552 };
2554 /* l4_wkup -> gpio1 */
2555 @@ -1733,7 +1734,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__gpio1 = {
2556 .slave = &omap44xx_gpio1_hwmod,
2557 .clk = "l4_wkup_clk_mux_ck",
2558 .addr = omap44xx_gpio1_addrs,
2559 - .addr_cnt = ARRAY_SIZE(omap44xx_gpio1_addrs),
2560 .user = OCP_USER_MPU | OCP_USER_SDMA,
2561 };
2563 @@ -1777,6 +1777,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio2_addrs[] = {
2564 .pa_end = 0x480551ff,
2565 .flags = ADDR_TYPE_RT
2566 },
2567 + { }
2568 };
2570 /* l4_per -> gpio2 */
2571 @@ -1785,7 +1786,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio2 = {
2572 .slave = &omap44xx_gpio2_hwmod,
2573 .clk = "l4_div_ck",
2574 .addr = omap44xx_gpio2_addrs,
2575 - .addr_cnt = ARRAY_SIZE(omap44xx_gpio2_addrs),
2576 .user = OCP_USER_MPU | OCP_USER_SDMA,
2577 };
2579 @@ -1830,6 +1830,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio3_addrs[] = {
2580 .pa_end = 0x480571ff,
2581 .flags = ADDR_TYPE_RT
2582 },
2583 + { }
2584 };
2586 /* l4_per -> gpio3 */
2587 @@ -1838,7 +1839,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio3 = {
2588 .slave = &omap44xx_gpio3_hwmod,
2589 .clk = "l4_div_ck",
2590 .addr = omap44xx_gpio3_addrs,
2591 - .addr_cnt = ARRAY_SIZE(omap44xx_gpio3_addrs),
2592 .user = OCP_USER_MPU | OCP_USER_SDMA,
2593 };
2595 @@ -1883,6 +1883,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio4_addrs[] = {
2596 .pa_end = 0x480591ff,
2597 .flags = ADDR_TYPE_RT
2598 },
2599 + { }
2600 };
2602 /* l4_per -> gpio4 */
2603 @@ -1891,7 +1892,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio4 = {
2604 .slave = &omap44xx_gpio4_hwmod,
2605 .clk = "l4_div_ck",
2606 .addr = omap44xx_gpio4_addrs,
2607 - .addr_cnt = ARRAY_SIZE(omap44xx_gpio4_addrs),
2608 .user = OCP_USER_MPU | OCP_USER_SDMA,
2609 };
2611 @@ -1936,6 +1936,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio5_addrs[] = {
2612 .pa_end = 0x4805b1ff,
2613 .flags = ADDR_TYPE_RT
2614 },
2615 + { }
2616 };
2618 /* l4_per -> gpio5 */
2619 @@ -1944,7 +1945,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio5 = {
2620 .slave = &omap44xx_gpio5_hwmod,
2621 .clk = "l4_div_ck",
2622 .addr = omap44xx_gpio5_addrs,
2623 - .addr_cnt = ARRAY_SIZE(omap44xx_gpio5_addrs),
2624 .user = OCP_USER_MPU | OCP_USER_SDMA,
2625 };
2627 @@ -1989,6 +1989,7 @@ static struct omap_hwmod_addr_space omap44xx_gpio6_addrs[] = {
2628 .pa_end = 0x4805d1ff,
2629 .flags = ADDR_TYPE_RT
2630 },
2631 + { }
2632 };
2634 /* l4_per -> gpio6 */
2635 @@ -1997,7 +1998,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio6 = {
2636 .slave = &omap44xx_gpio6_hwmod,
2637 .clk = "l4_div_ck",
2638 .addr = omap44xx_gpio6_addrs,
2639 - .addr_cnt = ARRAY_SIZE(omap44xx_gpio6_addrs),
2640 .user = OCP_USER_MPU | OCP_USER_SDMA,
2641 };
2643 @@ -2072,6 +2072,7 @@ static struct omap_hwmod_addr_space omap44xx_hsi_addrs[] = {
2644 .pa_end = 0x4a05bfff,
2645 .flags = ADDR_TYPE_RT
2646 },
2647 + { }
2648 };
2650 /* l4_cfg -> hsi */
2651 @@ -2080,7 +2081,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__hsi = {
2652 .slave = &omap44xx_hsi_hwmod,
2653 .clk = "l4_div_ck",
2654 .addr = omap44xx_hsi_addrs,
2655 - .addr_cnt = ARRAY_SIZE(omap44xx_hsi_addrs),
2656 .user = OCP_USER_MPU | OCP_USER_SDMA,
2657 };
2659 @@ -2145,6 +2145,7 @@ static struct omap_hwmod_addr_space omap44xx_i2c1_addrs[] = {
2660 .pa_end = 0x480700ff,
2661 .flags = ADDR_TYPE_RT
2662 },
2663 + { }
2664 };
2666 /* l4_per -> i2c1 */
2667 @@ -2153,7 +2154,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c1 = {
2668 .slave = &omap44xx_i2c1_hwmod,
2669 .clk = "l4_div_ck",
2670 .addr = omap44xx_i2c1_addrs,
2671 - .addr_cnt = ARRAY_SIZE(omap44xx_i2c1_addrs),
2672 .user = OCP_USER_MPU | OCP_USER_SDMA,
2673 };
2675 @@ -2198,6 +2198,7 @@ static struct omap_hwmod_addr_space omap44xx_i2c2_addrs[] = {
2676 .pa_end = 0x480720ff,
2677 .flags = ADDR_TYPE_RT
2678 },
2679 + { }
2680 };
2682 /* l4_per -> i2c2 */
2683 @@ -2206,7 +2207,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c2 = {
2684 .slave = &omap44xx_i2c2_hwmod,
2685 .clk = "l4_div_ck",
2686 .addr = omap44xx_i2c2_addrs,
2687 - .addr_cnt = ARRAY_SIZE(omap44xx_i2c2_addrs),
2688 .user = OCP_USER_MPU | OCP_USER_SDMA,
2689 };
2691 @@ -2251,6 +2251,7 @@ static struct omap_hwmod_addr_space omap44xx_i2c3_addrs[] = {
2692 .pa_end = 0x480600ff,
2693 .flags = ADDR_TYPE_RT
2694 },
2695 + { }
2696 };
2698 /* l4_per -> i2c3 */
2699 @@ -2259,7 +2260,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c3 = {
2700 .slave = &omap44xx_i2c3_hwmod,
2701 .clk = "l4_div_ck",
2702 .addr = omap44xx_i2c3_addrs,
2703 - .addr_cnt = ARRAY_SIZE(omap44xx_i2c3_addrs),
2704 .user = OCP_USER_MPU | OCP_USER_SDMA,
2705 };
2707 @@ -2304,6 +2304,7 @@ static struct omap_hwmod_addr_space omap44xx_i2c4_addrs[] = {
2708 .pa_end = 0x483500ff,
2709 .flags = ADDR_TYPE_RT
2710 },
2711 + { }
2712 };
2714 /* l4_per -> i2c4 */
2715 @@ -2312,7 +2313,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c4 = {
2716 .slave = &omap44xx_i2c4_hwmod,
2717 .clk = "l4_div_ck",
2718 .addr = omap44xx_i2c4_addrs,
2719 - .addr_cnt = ARRAY_SIZE(omap44xx_i2c4_addrs),
2720 .user = OCP_USER_MPU | OCP_USER_SDMA,
2721 };
2723 @@ -2479,6 +2479,7 @@ static struct omap_hwmod_addr_space omap44xx_iss_addrs[] = {
2724 .pa_end = 0x520000ff,
2725 .flags = ADDR_TYPE_RT
2726 },
2727 + { }
2728 };
2730 /* l3_main_2 -> iss */
2731 @@ -2487,7 +2488,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__iss = {
2732 .slave = &omap44xx_iss_hwmod,
2733 .clk = "l3_div_ck",
2734 .addr = omap44xx_iss_addrs,
2735 - .addr_cnt = ARRAY_SIZE(omap44xx_iss_addrs),
2736 .user = OCP_USER_MPU | OCP_USER_SDMA,
2737 };
2739 @@ -2562,6 +2562,7 @@ static struct omap_hwmod_addr_space omap44xx_iva_addrs[] = {
2740 .pa_end = 0x5a07ffff,
2741 .flags = ADDR_TYPE_RT
2742 },
2743 + { }
2744 };
2746 /* l3_main_2 -> iva */
2747 @@ -2570,7 +2571,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__iva = {
2748 .slave = &omap44xx_iva_hwmod,
2749 .clk = "l3_div_ck",
2750 .addr = omap44xx_iva_addrs,
2751 - .addr_cnt = ARRAY_SIZE(omap44xx_iva_addrs),
2752 .user = OCP_USER_MPU,
2753 };
2755 @@ -2665,6 +2665,7 @@ static struct omap_hwmod_addr_space omap44xx_kbd_addrs[] = {
2756 .pa_end = 0x4a31c07f,
2757 .flags = ADDR_TYPE_RT
2758 },
2759 + { }
2760 };
2762 /* l4_wkup -> kbd */
2763 @@ -2673,7 +2674,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__kbd = {
2764 .slave = &omap44xx_kbd_hwmod,
2765 .clk = "l4_wkup_clk_mux_ck",
2766 .addr = omap44xx_kbd_addrs,
2767 - .addr_cnt = ARRAY_SIZE(omap44xx_kbd_addrs),
2768 .user = OCP_USER_MPU | OCP_USER_SDMA,
2769 };
2771 @@ -2730,6 +2730,7 @@ static struct omap_hwmod_addr_space omap44xx_mailbox_addrs[] = {
2772 .pa_end = 0x4a0f41ff,
2773 .flags = ADDR_TYPE_RT
2774 },
2775 + { }
2776 };
2778 /* l4_cfg -> mailbox */
2779 @@ -2738,7 +2739,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__mailbox = {
2780 .slave = &omap44xx_mailbox_hwmod,
2781 .clk = "l4_div_ck",
2782 .addr = omap44xx_mailbox_addrs,
2783 - .addr_cnt = ARRAY_SIZE(omap44xx_mailbox_addrs),
2784 .user = OCP_USER_MPU | OCP_USER_SDMA,
2785 };
2787 @@ -2799,6 +2799,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp1_addrs[] = {
2788 .pa_end = 0x401220ff,
2789 .flags = ADDR_TYPE_RT
2790 },
2791 + { }
2792 };
2794 /* l4_abe -> mcbsp1 */
2795 @@ -2807,7 +2808,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp1 = {
2796 .slave = &omap44xx_mcbsp1_hwmod,
2797 .clk = "ocp_abe_iclk",
2798 .addr = omap44xx_mcbsp1_addrs,
2799 - .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp1_addrs),
2800 .user = OCP_USER_MPU,
2801 };
2803 @@ -2818,6 +2818,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp1_dma_addrs[] = {
2804 .pa_end = 0x490220ff,
2805 .flags = ADDR_TYPE_RT
2806 },
2807 + { }
2808 };
2810 /* l4_abe -> mcbsp1 (dma) */
2811 @@ -2826,7 +2827,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp1_dma = {
2812 .slave = &omap44xx_mcbsp1_hwmod,
2813 .clk = "ocp_abe_iclk",
2814 .addr = omap44xx_mcbsp1_dma_addrs,
2815 - .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp1_dma_addrs),
2816 .user = OCP_USER_SDMA,
2817 };
2819 @@ -2872,6 +2872,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp2_addrs[] = {
2820 .pa_end = 0x401240ff,
2821 .flags = ADDR_TYPE_RT
2822 },
2823 + { }
2824 };
2826 /* l4_abe -> mcbsp2 */
2827 @@ -2880,7 +2881,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp2 = {
2828 .slave = &omap44xx_mcbsp2_hwmod,
2829 .clk = "ocp_abe_iclk",
2830 .addr = omap44xx_mcbsp2_addrs,
2831 - .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp2_addrs),
2832 .user = OCP_USER_MPU,
2833 };
2835 @@ -2891,6 +2891,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp2_dma_addrs[] = {
2836 .pa_end = 0x490240ff,
2837 .flags = ADDR_TYPE_RT
2838 },
2839 + { }
2840 };
2842 /* l4_abe -> mcbsp2 (dma) */
2843 @@ -2899,7 +2900,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp2_dma = {
2844 .slave = &omap44xx_mcbsp2_hwmod,
2845 .clk = "ocp_abe_iclk",
2846 .addr = omap44xx_mcbsp2_dma_addrs,
2847 - .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp2_dma_addrs),
2848 .user = OCP_USER_SDMA,
2849 };
2851 @@ -2945,6 +2945,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp3_addrs[] = {
2852 .pa_end = 0x401260ff,
2853 .flags = ADDR_TYPE_RT
2854 },
2855 + { }
2856 };
2858 /* l4_abe -> mcbsp3 */
2859 @@ -2953,7 +2954,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp3 = {
2860 .slave = &omap44xx_mcbsp3_hwmod,
2861 .clk = "ocp_abe_iclk",
2862 .addr = omap44xx_mcbsp3_addrs,
2863 - .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp3_addrs),
2864 .user = OCP_USER_MPU,
2865 };
2867 @@ -2964,6 +2964,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp3_dma_addrs[] = {
2868 .pa_end = 0x490260ff,
2869 .flags = ADDR_TYPE_RT
2870 },
2871 + { }
2872 };
2874 /* l4_abe -> mcbsp3 (dma) */
2875 @@ -2972,7 +2973,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp3_dma = {
2876 .slave = &omap44xx_mcbsp3_hwmod,
2877 .clk = "ocp_abe_iclk",
2878 .addr = omap44xx_mcbsp3_dma_addrs,
2879 - .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp3_dma_addrs),
2880 .user = OCP_USER_SDMA,
2881 };
2883 @@ -3017,6 +3017,7 @@ static struct omap_hwmod_addr_space omap44xx_mcbsp4_addrs[] = {
2884 .pa_end = 0x480960ff,
2885 .flags = ADDR_TYPE_RT
2886 },
2887 + { }
2888 };
2890 /* l4_per -> mcbsp4 */
2891 @@ -3025,7 +3026,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcbsp4 = {
2892 .slave = &omap44xx_mcbsp4_hwmod,
2893 .clk = "l4_div_ck",
2894 .addr = omap44xx_mcbsp4_addrs,
2895 - .addr_cnt = ARRAY_SIZE(omap44xx_mcbsp4_addrs),
2896 .user = OCP_USER_MPU | OCP_USER_SDMA,
2897 };
2899 @@ -3090,6 +3090,7 @@ static struct omap_hwmod_addr_space omap44xx_mcpdm_addrs[] = {
2900 .pa_end = 0x4013207f,
2901 .flags = ADDR_TYPE_RT
2902 },
2903 + { }
2904 };
2906 /* l4_abe -> mcpdm */
2907 @@ -3098,7 +3099,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcpdm = {
2908 .slave = &omap44xx_mcpdm_hwmod,
2909 .clk = "ocp_abe_iclk",
2910 .addr = omap44xx_mcpdm_addrs,
2911 - .addr_cnt = ARRAY_SIZE(omap44xx_mcpdm_addrs),
2912 .user = OCP_USER_MPU,
2913 };
2915 @@ -3108,6 +3108,7 @@ static struct omap_hwmod_addr_space omap44xx_mcpdm_dma_addrs[] = {
2916 .pa_end = 0x4903207f,
2917 .flags = ADDR_TYPE_RT
2918 },
2919 + { }
2920 };
2922 /* l4_abe -> mcpdm (dma) */
2923 @@ -3116,7 +3117,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcpdm_dma = {
2924 .slave = &omap44xx_mcpdm_hwmod,
2925 .clk = "ocp_abe_iclk",
2926 .addr = omap44xx_mcpdm_dma_addrs,
2927 - .addr_cnt = ARRAY_SIZE(omap44xx_mcpdm_dma_addrs),
2928 .user = OCP_USER_SDMA,
2929 };
2931 @@ -3189,6 +3189,7 @@ static struct omap_hwmod_addr_space omap44xx_mcspi1_addrs[] = {
2932 .pa_end = 0x480981ff,
2933 .flags = ADDR_TYPE_RT
2934 },
2935 + { }
2936 };
2938 /* l4_per -> mcspi1 */
2939 @@ -3197,7 +3198,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi1 = {
2940 .slave = &omap44xx_mcspi1_hwmod,
2941 .clk = "l4_div_ck",
2942 .addr = omap44xx_mcspi1_addrs,
2943 - .addr_cnt = ARRAY_SIZE(omap44xx_mcspi1_addrs),
2944 .user = OCP_USER_MPU | OCP_USER_SDMA,
2945 };
2947 @@ -3249,6 +3249,7 @@ static struct omap_hwmod_addr_space omap44xx_mcspi2_addrs[] = {
2948 .pa_end = 0x4809a1ff,
2949 .flags = ADDR_TYPE_RT
2950 },
2951 + { }
2952 };
2954 /* l4_per -> mcspi2 */
2955 @@ -3257,7 +3258,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi2 = {
2956 .slave = &omap44xx_mcspi2_hwmod,
2957 .clk = "l4_div_ck",
2958 .addr = omap44xx_mcspi2_addrs,
2959 - .addr_cnt = ARRAY_SIZE(omap44xx_mcspi2_addrs),
2960 .user = OCP_USER_MPU | OCP_USER_SDMA,
2961 };
2963 @@ -3309,6 +3309,7 @@ static struct omap_hwmod_addr_space omap44xx_mcspi3_addrs[] = {
2964 .pa_end = 0x480b81ff,
2965 .flags = ADDR_TYPE_RT
2966 },
2967 + { }
2968 };
2970 /* l4_per -> mcspi3 */
2971 @@ -3317,7 +3318,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi3 = {
2972 .slave = &omap44xx_mcspi3_hwmod,
2973 .clk = "l4_div_ck",
2974 .addr = omap44xx_mcspi3_addrs,
2975 - .addr_cnt = ARRAY_SIZE(omap44xx_mcspi3_addrs),
2976 .user = OCP_USER_MPU | OCP_USER_SDMA,
2977 };
2979 @@ -3367,6 +3367,7 @@ static struct omap_hwmod_addr_space omap44xx_mcspi4_addrs[] = {
2980 .pa_end = 0x480ba1ff,
2981 .flags = ADDR_TYPE_RT
2982 },
2983 + { }
2984 };
2986 /* l4_per -> mcspi4 */
2987 @@ -3375,7 +3376,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi4 = {
2988 .slave = &omap44xx_mcspi4_hwmod,
2989 .clk = "l4_div_ck",
2990 .addr = omap44xx_mcspi4_addrs,
2991 - .addr_cnt = ARRAY_SIZE(omap44xx_mcspi4_addrs),
2992 .user = OCP_USER_MPU | OCP_USER_SDMA,
2993 };
2995 @@ -3452,6 +3452,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc1_addrs[] = {
2996 .pa_end = 0x4809c3ff,
2997 .flags = ADDR_TYPE_RT
2998 },
2999 + { }
3000 };
3002 /* l4_per -> mmc1 */
3003 @@ -3460,7 +3461,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc1 = {
3004 .slave = &omap44xx_mmc1_hwmod,
3005 .clk = "l4_div_ck",
3006 .addr = omap44xx_mmc1_addrs,
3007 - .addr_cnt = ARRAY_SIZE(omap44xx_mmc1_addrs),
3008 .user = OCP_USER_MPU | OCP_USER_SDMA,
3009 };
3011 @@ -3516,6 +3516,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc2_addrs[] = {
3012 .pa_end = 0x480b43ff,
3013 .flags = ADDR_TYPE_RT
3014 },
3015 + { }
3016 };
3018 /* l4_per -> mmc2 */
3019 @@ -3524,7 +3525,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc2 = {
3020 .slave = &omap44xx_mmc2_hwmod,
3021 .clk = "l4_div_ck",
3022 .addr = omap44xx_mmc2_addrs,
3023 - .addr_cnt = ARRAY_SIZE(omap44xx_mmc2_addrs),
3024 .user = OCP_USER_MPU | OCP_USER_SDMA,
3025 };
3027 @@ -3570,6 +3570,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc3_addrs[] = {
3028 .pa_end = 0x480ad3ff,
3029 .flags = ADDR_TYPE_RT
3030 },
3031 + { }
3032 };
3034 /* l4_per -> mmc3 */
3035 @@ -3578,7 +3579,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc3 = {
3036 .slave = &omap44xx_mmc3_hwmod,
3037 .clk = "l4_div_ck",
3038 .addr = omap44xx_mmc3_addrs,
3039 - .addr_cnt = ARRAY_SIZE(omap44xx_mmc3_addrs),
3040 .user = OCP_USER_MPU | OCP_USER_SDMA,
3041 };
3043 @@ -3622,6 +3622,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc4_addrs[] = {
3044 .pa_end = 0x480d13ff,
3045 .flags = ADDR_TYPE_RT
3046 },
3047 + { }
3048 };
3050 /* l4_per -> mmc4 */
3051 @@ -3630,7 +3631,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc4 = {
3052 .slave = &omap44xx_mmc4_hwmod,
3053 .clk = "l4_div_ck",
3054 .addr = omap44xx_mmc4_addrs,
3055 - .addr_cnt = ARRAY_SIZE(omap44xx_mmc4_addrs),
3056 .user = OCP_USER_MPU | OCP_USER_SDMA,
3057 };
3059 @@ -3674,6 +3674,7 @@ static struct omap_hwmod_addr_space omap44xx_mmc5_addrs[] = {
3060 .pa_end = 0x480d53ff,
3061 .flags = ADDR_TYPE_RT
3062 },
3063 + { }
3064 };
3066 /* l4_per -> mmc5 */
3067 @@ -3682,7 +3683,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc5 = {
3068 .slave = &omap44xx_mmc5_hwmod,
3069 .clk = "l4_div_ck",
3070 .addr = omap44xx_mmc5_addrs,
3071 - .addr_cnt = ARRAY_SIZE(omap44xx_mmc5_addrs),
3072 .user = OCP_USER_MPU | OCP_USER_SDMA,
3073 };
3075 @@ -3787,6 +3787,7 @@ static struct omap_hwmod_addr_space omap44xx_smartreflex_core_addrs[] = {
3076 .pa_end = 0x4a0dd03f,
3077 .flags = ADDR_TYPE_RT
3078 },
3079 + { }
3080 };
3082 /* l4_cfg -> smartreflex_core */
3083 @@ -3795,7 +3796,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__smartreflex_core = {
3084 .slave = &omap44xx_smartreflex_core_hwmod,
3085 .clk = "l4_div_ck",
3086 .addr = omap44xx_smartreflex_core_addrs,
3087 - .addr_cnt = ARRAY_SIZE(omap44xx_smartreflex_core_addrs),
3088 .user = OCP_USER_MPU | OCP_USER_SDMA,
3089 };
3091 @@ -3833,6 +3833,7 @@ static struct omap_hwmod_addr_space omap44xx_smartreflex_iva_addrs[] = {
3092 .pa_end = 0x4a0db03f,
3093 .flags = ADDR_TYPE_RT
3094 },
3095 + { }
3096 };
3098 /* l4_cfg -> smartreflex_iva */
3099 @@ -3841,7 +3842,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__smartreflex_iva = {
3100 .slave = &omap44xx_smartreflex_iva_hwmod,
3101 .clk = "l4_div_ck",
3102 .addr = omap44xx_smartreflex_iva_addrs,
3103 - .addr_cnt = ARRAY_SIZE(omap44xx_smartreflex_iva_addrs),
3104 .user = OCP_USER_MPU | OCP_USER_SDMA,
3105 };
3107 @@ -3879,6 +3879,7 @@ static struct omap_hwmod_addr_space omap44xx_smartreflex_mpu_addrs[] = {
3108 .pa_end = 0x4a0d903f,
3109 .flags = ADDR_TYPE_RT
3110 },
3111 + { }
3112 };
3114 /* l4_cfg -> smartreflex_mpu */
3115 @@ -3887,7 +3888,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__smartreflex_mpu = {
3116 .slave = &omap44xx_smartreflex_mpu_hwmod,
3117 .clk = "l4_div_ck",
3118 .addr = omap44xx_smartreflex_mpu_addrs,
3119 - .addr_cnt = ARRAY_SIZE(omap44xx_smartreflex_mpu_addrs),
3120 .user = OCP_USER_MPU | OCP_USER_SDMA,
3121 };
3123 @@ -3944,6 +3944,7 @@ static struct omap_hwmod_addr_space omap44xx_spinlock_addrs[] = {
3124 .pa_end = 0x4a0f6fff,
3125 .flags = ADDR_TYPE_RT
3126 },
3127 + { }
3128 };
3130 /* l4_cfg -> spinlock */
3131 @@ -3952,7 +3953,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__spinlock = {
3132 .slave = &omap44xx_spinlock_hwmod,
3133 .clk = "l4_div_ck",
3134 .addr = omap44xx_spinlock_addrs,
3135 - .addr_cnt = ARRAY_SIZE(omap44xx_spinlock_addrs),
3136 .user = OCP_USER_MPU | OCP_USER_SDMA,
3137 };
3139 @@ -4024,6 +4024,7 @@ static struct omap_hwmod_addr_space omap44xx_timer1_addrs[] = {
3140 .pa_end = 0x4a31807f,
3141 .flags = ADDR_TYPE_RT
3142 },
3143 + { }
3144 };
3146 /* l4_wkup -> timer1 */
3147 @@ -4032,7 +4033,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__timer1 = {
3148 .slave = &omap44xx_timer1_hwmod,
3149 .clk = "l4_wkup_clk_mux_ck",
3150 .addr = omap44xx_timer1_addrs,
3151 - .addr_cnt = ARRAY_SIZE(omap44xx_timer1_addrs),
3152 .user = OCP_USER_MPU | OCP_USER_SDMA,
3153 };
3155 @@ -4069,6 +4069,7 @@ static struct omap_hwmod_addr_space omap44xx_timer2_addrs[] = {
3156 .pa_end = 0x4803207f,
3157 .flags = ADDR_TYPE_RT
3158 },
3159 + { }
3160 };
3162 /* l4_per -> timer2 */
3163 @@ -4077,7 +4078,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer2 = {
3164 .slave = &omap44xx_timer2_hwmod,
3165 .clk = "l4_div_ck",
3166 .addr = omap44xx_timer2_addrs,
3167 - .addr_cnt = ARRAY_SIZE(omap44xx_timer2_addrs),
3168 .user = OCP_USER_MPU | OCP_USER_SDMA,
3169 };
3171 @@ -4114,6 +4114,7 @@ static struct omap_hwmod_addr_space omap44xx_timer3_addrs[] = {
3172 .pa_end = 0x4803407f,
3173 .flags = ADDR_TYPE_RT
3174 },
3175 + { }
3176 };
3178 /* l4_per -> timer3 */
3179 @@ -4122,7 +4123,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer3 = {
3180 .slave = &omap44xx_timer3_hwmod,
3181 .clk = "l4_div_ck",
3182 .addr = omap44xx_timer3_addrs,
3183 - .addr_cnt = ARRAY_SIZE(omap44xx_timer3_addrs),
3184 .user = OCP_USER_MPU | OCP_USER_SDMA,
3185 };
3187 @@ -4159,6 +4159,7 @@ static struct omap_hwmod_addr_space omap44xx_timer4_addrs[] = {
3188 .pa_end = 0x4803607f,
3189 .flags = ADDR_TYPE_RT
3190 },
3191 + { }
3192 };
3194 /* l4_per -> timer4 */
3195 @@ -4167,7 +4168,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer4 = {
3196 .slave = &omap44xx_timer4_hwmod,
3197 .clk = "l4_div_ck",
3198 .addr = omap44xx_timer4_addrs,
3199 - .addr_cnt = ARRAY_SIZE(omap44xx_timer4_addrs),
3200 .user = OCP_USER_MPU | OCP_USER_SDMA,
3201 };
3203 @@ -4204,6 +4204,7 @@ static struct omap_hwmod_addr_space omap44xx_timer5_addrs[] = {
3204 .pa_end = 0x4013807f,
3205 .flags = ADDR_TYPE_RT
3206 },
3207 + { }
3208 };
3210 /* l4_abe -> timer5 */
3211 @@ -4212,7 +4213,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer5 = {
3212 .slave = &omap44xx_timer5_hwmod,
3213 .clk = "ocp_abe_iclk",
3214 .addr = omap44xx_timer5_addrs,
3215 - .addr_cnt = ARRAY_SIZE(omap44xx_timer5_addrs),
3216 .user = OCP_USER_MPU,
3217 };
3219 @@ -4222,6 +4222,7 @@ static struct omap_hwmod_addr_space omap44xx_timer5_dma_addrs[] = {
3220 .pa_end = 0x4903807f,
3221 .flags = ADDR_TYPE_RT
3222 },
3223 + { }
3224 };
3226 /* l4_abe -> timer5 (dma) */
3227 @@ -4230,7 +4231,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer5_dma = {
3228 .slave = &omap44xx_timer5_hwmod,
3229 .clk = "ocp_abe_iclk",
3230 .addr = omap44xx_timer5_dma_addrs,
3231 - .addr_cnt = ARRAY_SIZE(omap44xx_timer5_dma_addrs),
3232 .user = OCP_USER_SDMA,
3233 };
3235 @@ -4268,6 +4268,7 @@ static struct omap_hwmod_addr_space omap44xx_timer6_addrs[] = {
3236 .pa_end = 0x4013a07f,
3237 .flags = ADDR_TYPE_RT
3238 },
3239 + { }
3240 };
3242 /* l4_abe -> timer6 */
3243 @@ -4276,7 +4277,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer6 = {
3244 .slave = &omap44xx_timer6_hwmod,
3245 .clk = "ocp_abe_iclk",
3246 .addr = omap44xx_timer6_addrs,
3247 - .addr_cnt = ARRAY_SIZE(omap44xx_timer6_addrs),
3248 .user = OCP_USER_MPU,
3249 };
3251 @@ -4286,6 +4286,7 @@ static struct omap_hwmod_addr_space omap44xx_timer6_dma_addrs[] = {
3252 .pa_end = 0x4903a07f,
3253 .flags = ADDR_TYPE_RT
3254 },
3255 + { }
3256 };
3258 /* l4_abe -> timer6 (dma) */
3259 @@ -4294,7 +4295,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer6_dma = {
3260 .slave = &omap44xx_timer6_hwmod,
3261 .clk = "ocp_abe_iclk",
3262 .addr = omap44xx_timer6_dma_addrs,
3263 - .addr_cnt = ARRAY_SIZE(omap44xx_timer6_dma_addrs),
3264 .user = OCP_USER_SDMA,
3265 };
3267 @@ -4332,6 +4332,7 @@ static struct omap_hwmod_addr_space omap44xx_timer7_addrs[] = {
3268 .pa_end = 0x4013c07f,
3269 .flags = ADDR_TYPE_RT
3270 },
3271 + { }
3272 };
3274 /* l4_abe -> timer7 */
3275 @@ -4340,7 +4341,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer7 = {
3276 .slave = &omap44xx_timer7_hwmod,
3277 .clk = "ocp_abe_iclk",
3278 .addr = omap44xx_timer7_addrs,
3279 - .addr_cnt = ARRAY_SIZE(omap44xx_timer7_addrs),
3280 .user = OCP_USER_MPU,
3281 };
3283 @@ -4350,6 +4350,7 @@ static struct omap_hwmod_addr_space omap44xx_timer7_dma_addrs[] = {
3284 .pa_end = 0x4903c07f,
3285 .flags = ADDR_TYPE_RT
3286 },
3287 + { }
3288 };
3290 /* l4_abe -> timer7 (dma) */
3291 @@ -4358,7 +4359,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer7_dma = {
3292 .slave = &omap44xx_timer7_hwmod,
3293 .clk = "ocp_abe_iclk",
3294 .addr = omap44xx_timer7_dma_addrs,
3295 - .addr_cnt = ARRAY_SIZE(omap44xx_timer7_dma_addrs),
3296 .user = OCP_USER_SDMA,
3297 };
3299 @@ -4396,6 +4396,7 @@ static struct omap_hwmod_addr_space omap44xx_timer8_addrs[] = {
3300 .pa_end = 0x4013e07f,
3301 .flags = ADDR_TYPE_RT
3302 },
3303 + { }
3304 };
3306 /* l4_abe -> timer8 */
3307 @@ -4404,7 +4405,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer8 = {
3308 .slave = &omap44xx_timer8_hwmod,
3309 .clk = "ocp_abe_iclk",
3310 .addr = omap44xx_timer8_addrs,
3311 - .addr_cnt = ARRAY_SIZE(omap44xx_timer8_addrs),
3312 .user = OCP_USER_MPU,
3313 };
3315 @@ -4414,6 +4414,7 @@ static struct omap_hwmod_addr_space omap44xx_timer8_dma_addrs[] = {
3316 .pa_end = 0x4903e07f,
3317 .flags = ADDR_TYPE_RT
3318 },
3319 + { }
3320 };
3322 /* l4_abe -> timer8 (dma) */
3323 @@ -4422,7 +4423,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer8_dma = {
3324 .slave = &omap44xx_timer8_hwmod,
3325 .clk = "ocp_abe_iclk",
3326 .addr = omap44xx_timer8_dma_addrs,
3327 - .addr_cnt = ARRAY_SIZE(omap44xx_timer8_dma_addrs),
3328 .user = OCP_USER_SDMA,
3329 };
3331 @@ -4460,6 +4460,7 @@ static struct omap_hwmod_addr_space omap44xx_timer9_addrs[] = {
3332 .pa_end = 0x4803e07f,
3333 .flags = ADDR_TYPE_RT
3334 },
3335 + { }
3336 };
3338 /* l4_per -> timer9 */
3339 @@ -4468,7 +4469,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer9 = {
3340 .slave = &omap44xx_timer9_hwmod,
3341 .clk = "l4_div_ck",
3342 .addr = omap44xx_timer9_addrs,
3343 - .addr_cnt = ARRAY_SIZE(omap44xx_timer9_addrs),
3344 .user = OCP_USER_MPU | OCP_USER_SDMA,
3345 };
3347 @@ -4505,6 +4505,7 @@ static struct omap_hwmod_addr_space omap44xx_timer10_addrs[] = {
3348 .pa_end = 0x4808607f,
3349 .flags = ADDR_TYPE_RT
3350 },
3351 + { }
3352 };
3354 /* l4_per -> timer10 */
3355 @@ -4513,7 +4514,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer10 = {
3356 .slave = &omap44xx_timer10_hwmod,
3357 .clk = "l4_div_ck",
3358 .addr = omap44xx_timer10_addrs,
3359 - .addr_cnt = ARRAY_SIZE(omap44xx_timer10_addrs),
3360 .user = OCP_USER_MPU | OCP_USER_SDMA,
3361 };
3363 @@ -4550,6 +4550,7 @@ static struct omap_hwmod_addr_space omap44xx_timer11_addrs[] = {
3364 .pa_end = 0x4808807f,
3365 .flags = ADDR_TYPE_RT
3366 },
3367 + { }
3368 };
3370 /* l4_per -> timer11 */
3371 @@ -4558,7 +4559,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer11 = {
3372 .slave = &omap44xx_timer11_hwmod,
3373 .clk = "l4_div_ck",
3374 .addr = omap44xx_timer11_addrs,
3375 - .addr_cnt = ARRAY_SIZE(omap44xx_timer11_addrs),
3376 .user = OCP_USER_MPU | OCP_USER_SDMA,
3377 };
3379 @@ -4622,6 +4622,7 @@ static struct omap_hwmod_addr_space omap44xx_uart1_addrs[] = {
3380 .pa_end = 0x4806a0ff,
3381 .flags = ADDR_TYPE_RT
3382 },
3383 + { }
3384 };
3386 /* l4_per -> uart1 */
3387 @@ -4630,7 +4631,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart1 = {
3388 .slave = &omap44xx_uart1_hwmod,
3389 .clk = "l4_div_ck",
3390 .addr = omap44xx_uart1_addrs,
3391 - .addr_cnt = ARRAY_SIZE(omap44xx_uart1_addrs),
3392 .user = OCP_USER_MPU | OCP_USER_SDMA,
3393 };
3395 @@ -4674,6 +4674,7 @@ static struct omap_hwmod_addr_space omap44xx_uart2_addrs[] = {
3396 .pa_end = 0x4806c0ff,
3397 .flags = ADDR_TYPE_RT
3398 },
3399 + { }
3400 };
3402 /* l4_per -> uart2 */
3403 @@ -4682,7 +4683,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart2 = {
3404 .slave = &omap44xx_uart2_hwmod,
3405 .clk = "l4_div_ck",
3406 .addr = omap44xx_uart2_addrs,
3407 - .addr_cnt = ARRAY_SIZE(omap44xx_uart2_addrs),
3408 .user = OCP_USER_MPU | OCP_USER_SDMA,
3409 };
3411 @@ -4726,6 +4726,7 @@ static struct omap_hwmod_addr_space omap44xx_uart3_addrs[] = {
3412 .pa_end = 0x480200ff,
3413 .flags = ADDR_TYPE_RT
3414 },
3415 + { }
3416 };
3418 /* l4_per -> uart3 */
3419 @@ -4734,7 +4735,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart3 = {
3420 .slave = &omap44xx_uart3_hwmod,
3421 .clk = "l4_div_ck",
3422 .addr = omap44xx_uart3_addrs,
3423 - .addr_cnt = ARRAY_SIZE(omap44xx_uart3_addrs),
3424 .user = OCP_USER_MPU | OCP_USER_SDMA,
3425 };
3427 @@ -4779,6 +4779,7 @@ static struct omap_hwmod_addr_space omap44xx_uart4_addrs[] = {
3428 .pa_end = 0x4806e0ff,
3429 .flags = ADDR_TYPE_RT
3430 },
3431 + { }
3432 };
3434 /* l4_per -> uart4 */
3435 @@ -4787,7 +4788,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart4 = {
3436 .slave = &omap44xx_uart4_hwmod,
3437 .clk = "l4_div_ck",
3438 .addr = omap44xx_uart4_addrs,
3439 - .addr_cnt = ARRAY_SIZE(omap44xx_uart4_addrs),
3440 .user = OCP_USER_MPU | OCP_USER_SDMA,
3441 };
3443 @@ -4854,6 +4854,7 @@ static struct omap_hwmod_addr_space omap44xx_usb_otg_hs_addrs[] = {
3444 .pa_end = 0x4a0ab003,
3445 .flags = ADDR_TYPE_RT
3446 },
3447 + { }
3448 };
3450 /* l4_cfg -> usb_otg_hs */
3451 @@ -4862,7 +4863,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_otg_hs = {
3452 .slave = &omap44xx_usb_otg_hs_hwmod,
3453 .clk = "l4_div_ck",
3454 .addr = omap44xx_usb_otg_hs_addrs,
3455 - .addr_cnt = ARRAY_SIZE(omap44xx_usb_otg_hs_addrs),
3456 .user = OCP_USER_MPU | OCP_USER_SDMA,
3457 };
3459 @@ -4931,6 +4931,7 @@ static struct omap_hwmod_addr_space omap44xx_wd_timer2_addrs[] = {
3460 .pa_end = 0x4a31407f,
3461 .flags = ADDR_TYPE_RT
3462 },
3463 + { }
3464 };
3466 /* l4_wkup -> wd_timer2 */
3467 @@ -4939,7 +4940,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__wd_timer2 = {
3468 .slave = &omap44xx_wd_timer2_hwmod,
3469 .clk = "l4_wkup_clk_mux_ck",
3470 .addr = omap44xx_wd_timer2_addrs,
3471 - .addr_cnt = ARRAY_SIZE(omap44xx_wd_timer2_addrs),
3472 .user = OCP_USER_MPU | OCP_USER_SDMA,
3473 };
3475 @@ -4976,6 +4976,7 @@ static struct omap_hwmod_addr_space omap44xx_wd_timer3_addrs[] = {
3476 .pa_end = 0x4013007f,
3477 .flags = ADDR_TYPE_RT
3478 },
3479 + { }
3480 };
3482 /* l4_abe -> wd_timer3 */
3483 @@ -4984,7 +4985,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__wd_timer3 = {
3484 .slave = &omap44xx_wd_timer3_hwmod,
3485 .clk = "ocp_abe_iclk",
3486 .addr = omap44xx_wd_timer3_addrs,
3487 - .addr_cnt = ARRAY_SIZE(omap44xx_wd_timer3_addrs),
3488 .user = OCP_USER_MPU,
3489 };
3491 @@ -4994,6 +4994,7 @@ static struct omap_hwmod_addr_space omap44xx_wd_timer3_dma_addrs[] = {
3492 .pa_end = 0x4903007f,
3493 .flags = ADDR_TYPE_RT
3494 },
3495 + { }
3496 };
3498 /* l4_abe -> wd_timer3 (dma) */
3499 @@ -5002,7 +5003,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__wd_timer3_dma = {
3500 .slave = &omap44xx_wd_timer3_hwmod,
3501 .clk = "ocp_abe_iclk",
3502 .addr = omap44xx_wd_timer3_dma_addrs,
3503 - .addr_cnt = ARRAY_SIZE(omap44xx_wd_timer3_dma_addrs),
3504 .user = OCP_USER_SDMA,
3505 };
3507 diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
3508 index e93438c..f3a3bff 100644
3509 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
3510 +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
3511 @@ -219,7 +219,6 @@ struct omap_hwmod_addr_space {
3512 * @clk: interface clock: OMAP clock name
3513 * @_clk: pointer to the interface struct clk (filled in at runtime)
3514 * @fw: interface firewall data
3515 - * @addr_cnt: ARRAY_SIZE(@addr)
3516 * @width: OCP data width
3517 * @user: initiators using this interface (see OCP_USER_* macros above)
3518 * @flags: OCP interface flags (see OCPIF_* macros above)
3519 @@ -238,7 +237,6 @@ struct omap_hwmod_ocp_if {
3520 union {
3521 struct omap_hwmod_omap2_firewall omap2;
3522 } fw;
3523 - u8 addr_cnt;
3524 u8 width;
3525 u8 user;
3526 u8 flags;
3527 --
3528 1.7.2.5