diff options
author | Benoit Cousson <b-cousson@ti.com> | 2011-07-09 21:14:28 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2011-07-09 21:14:28 -0400 |
commit | 7e69ed974259b42c4f87a44222415dbb7472898d (patch) | |
tree | 2917bd7b613d88b3b2a58d5c37fce1a7c5ebb3e0 /arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |
parent | 00fe610b7a699780e956756be91ba60343302e49 (diff) |
OMAP4: hwmod data: Align interconnect format with regular modules
The interconnect modules were using a slightly different layout than
the regular modules.
Align the layout for better consitency.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_44xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 0b73d8ee1de..346a028e95c 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |||
@@ -80,7 +80,12 @@ static struct omap_hwmod_class omap44xx_dmm_hwmod_class = { | |||
80 | .name = "dmm", | 80 | .name = "dmm", |
81 | }; | 81 | }; |
82 | 82 | ||
83 | /* dmm interface data */ | 83 | /* dmm */ |
84 | static struct omap_hwmod_irq_info omap44xx_dmm_irqs[] = { | ||
85 | { .irq = 113 + OMAP44XX_IRQ_GIC_START }, | ||
86 | { .irq = -1 } | ||
87 | }; | ||
88 | |||
84 | /* l3_main_1 -> dmm */ | 89 | /* l3_main_1 -> dmm */ |
85 | static struct omap_hwmod_ocp_if omap44xx_l3_main_1__dmm = { | 90 | static struct omap_hwmod_ocp_if omap44xx_l3_main_1__dmm = { |
86 | .master = &omap44xx_l3_main_1_hwmod, | 91 | .master = &omap44xx_l3_main_1_hwmod, |
@@ -113,17 +118,12 @@ static struct omap_hwmod_ocp_if *omap44xx_dmm_slaves[] = { | |||
113 | &omap44xx_mpu__dmm, | 118 | &omap44xx_mpu__dmm, |
114 | }; | 119 | }; |
115 | 120 | ||
116 | static struct omap_hwmod_irq_info omap44xx_dmm_irqs[] = { | ||
117 | { .irq = 113 + OMAP44XX_IRQ_GIC_START }, | ||
118 | { .irq = -1 } | ||
119 | }; | ||
120 | |||
121 | static struct omap_hwmod omap44xx_dmm_hwmod = { | 121 | static struct omap_hwmod omap44xx_dmm_hwmod = { |
122 | .name = "dmm", | 122 | .name = "dmm", |
123 | .class = &omap44xx_dmm_hwmod_class, | 123 | .class = &omap44xx_dmm_hwmod_class, |
124 | .mpu_irqs = omap44xx_dmm_irqs, | ||
124 | .slaves = omap44xx_dmm_slaves, | 125 | .slaves = omap44xx_dmm_slaves, |
125 | .slaves_cnt = ARRAY_SIZE(omap44xx_dmm_slaves), | 126 | .slaves_cnt = ARRAY_SIZE(omap44xx_dmm_slaves), |
126 | .mpu_irqs = omap44xx_dmm_irqs, | ||
127 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 127 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
128 | }; | 128 | }; |
129 | 129 | ||
@@ -135,7 +135,7 @@ static struct omap_hwmod_class omap44xx_emif_fw_hwmod_class = { | |||
135 | .name = "emif_fw", | 135 | .name = "emif_fw", |
136 | }; | 136 | }; |
137 | 137 | ||
138 | /* emif_fw interface data */ | 138 | /* emif_fw */ |
139 | /* dmm -> emif_fw */ | 139 | /* dmm -> emif_fw */ |
140 | static struct omap_hwmod_ocp_if omap44xx_dmm__emif_fw = { | 140 | static struct omap_hwmod_ocp_if omap44xx_dmm__emif_fw = { |
141 | .master = &omap44xx_dmm_hwmod, | 141 | .master = &omap44xx_dmm_hwmod, |
@@ -184,7 +184,7 @@ static struct omap_hwmod_class omap44xx_l3_hwmod_class = { | |||
184 | .name = "l3", | 184 | .name = "l3", |
185 | }; | 185 | }; |
186 | 186 | ||
187 | /* l3_instr interface data */ | 187 | /* l3_instr */ |
188 | /* iva -> l3_instr */ | 188 | /* iva -> l3_instr */ |
189 | static struct omap_hwmod_ocp_if omap44xx_iva__l3_instr = { | 189 | static struct omap_hwmod_ocp_if omap44xx_iva__l3_instr = { |
190 | .master = &omap44xx_iva_hwmod, | 190 | .master = &omap44xx_iva_hwmod, |
@@ -215,7 +215,7 @@ static struct omap_hwmod omap44xx_l3_instr_hwmod = { | |||
215 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 215 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
216 | }; | 216 | }; |
217 | 217 | ||
218 | /* l3_main_1 interface data */ | 218 | /* l3_main_1 */ |
219 | static struct omap_hwmod_irq_info omap44xx_l3_main_1_irqs[] = { | 219 | static struct omap_hwmod_irq_info omap44xx_l3_main_1_irqs[] = { |
220 | { .name = "dbg_err", .irq = 9 + OMAP44XX_IRQ_GIC_START }, | 220 | { .name = "dbg_err", .irq = 9 + OMAP44XX_IRQ_GIC_START }, |
221 | { .name = "app_err", .irq = 10 + OMAP44XX_IRQ_GIC_START }, | 221 | { .name = "app_err", .irq = 10 + OMAP44XX_IRQ_GIC_START }, |
@@ -302,13 +302,13 @@ static struct omap_hwmod_ocp_if *omap44xx_l3_main_1_slaves[] = { | |||
302 | static struct omap_hwmod omap44xx_l3_main_1_hwmod = { | 302 | static struct omap_hwmod omap44xx_l3_main_1_hwmod = { |
303 | .name = "l3_main_1", | 303 | .name = "l3_main_1", |
304 | .class = &omap44xx_l3_hwmod_class, | 304 | .class = &omap44xx_l3_hwmod_class, |
305 | .mpu_irqs = omap44xx_l3_main_1_irqs, | ||
305 | .slaves = omap44xx_l3_main_1_slaves, | 306 | .slaves = omap44xx_l3_main_1_slaves, |
306 | .slaves_cnt = ARRAY_SIZE(omap44xx_l3_main_1_slaves), | 307 | .slaves_cnt = ARRAY_SIZE(omap44xx_l3_main_1_slaves), |
307 | .mpu_irqs = omap44xx_l3_main_1_irqs, | ||
308 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 308 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
309 | }; | 309 | }; |
310 | 310 | ||
311 | /* l3_main_2 interface data */ | 311 | /* l3_main_2 */ |
312 | /* dma_system -> l3_main_2 */ | 312 | /* dma_system -> l3_main_2 */ |
313 | static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = { | 313 | static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = { |
314 | .master = &omap44xx_dma_system_hwmod, | 314 | .master = &omap44xx_dma_system_hwmod, |
@@ -403,7 +403,7 @@ static struct omap_hwmod omap44xx_l3_main_2_hwmod = { | |||
403 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 403 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
404 | }; | 404 | }; |
405 | 405 | ||
406 | /* l3_main_3 interface data */ | 406 | /* l3_main_3 */ |
407 | static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = { | 407 | static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = { |
408 | { | 408 | { |
409 | .pa_start = 0x45000000, | 409 | .pa_start = 0x45000000, |
@@ -461,7 +461,7 @@ static struct omap_hwmod_class omap44xx_l4_hwmod_class = { | |||
461 | .name = "l4", | 461 | .name = "l4", |
462 | }; | 462 | }; |
463 | 463 | ||
464 | /* l4_abe interface data */ | 464 | /* l4_abe */ |
465 | /* aess -> l4_abe */ | 465 | /* aess -> l4_abe */ |
466 | static struct omap_hwmod_ocp_if omap44xx_aess__l4_abe = { | 466 | static struct omap_hwmod_ocp_if omap44xx_aess__l4_abe = { |
467 | .master = &omap44xx_aess_hwmod, | 467 | .master = &omap44xx_aess_hwmod, |
@@ -510,7 +510,7 @@ static struct omap_hwmod omap44xx_l4_abe_hwmod = { | |||
510 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 510 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
511 | }; | 511 | }; |
512 | 512 | ||
513 | /* l4_cfg interface data */ | 513 | /* l4_cfg */ |
514 | /* l3_main_1 -> l4_cfg */ | 514 | /* l3_main_1 -> l4_cfg */ |
515 | static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l4_cfg = { | 515 | static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l4_cfg = { |
516 | .master = &omap44xx_l3_main_1_hwmod, | 516 | .master = &omap44xx_l3_main_1_hwmod, |
@@ -532,7 +532,7 @@ static struct omap_hwmod omap44xx_l4_cfg_hwmod = { | |||
532 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 532 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
533 | }; | 533 | }; |
534 | 534 | ||
535 | /* l4_per interface data */ | 535 | /* l4_per */ |
536 | /* l3_main_2 -> l4_per */ | 536 | /* l3_main_2 -> l4_per */ |
537 | static struct omap_hwmod_ocp_if omap44xx_l3_main_2__l4_per = { | 537 | static struct omap_hwmod_ocp_if omap44xx_l3_main_2__l4_per = { |
538 | .master = &omap44xx_l3_main_2_hwmod, | 538 | .master = &omap44xx_l3_main_2_hwmod, |
@@ -554,7 +554,7 @@ static struct omap_hwmod omap44xx_l4_per_hwmod = { | |||
554 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 554 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
555 | }; | 555 | }; |
556 | 556 | ||
557 | /* l4_wkup interface data */ | 557 | /* l4_wkup */ |
558 | /* l4_cfg -> l4_wkup */ | 558 | /* l4_cfg -> l4_wkup */ |
559 | static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l4_wkup = { | 559 | static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l4_wkup = { |
560 | .master = &omap44xx_l4_cfg_hwmod, | 560 | .master = &omap44xx_l4_cfg_hwmod, |
@@ -584,7 +584,7 @@ static struct omap_hwmod_class omap44xx_mpu_bus_hwmod_class = { | |||
584 | .name = "mpu_bus", | 584 | .name = "mpu_bus", |
585 | }; | 585 | }; |
586 | 586 | ||
587 | /* mpu_private interface data */ | 587 | /* mpu_private */ |
588 | /* mpu -> mpu_private */ | 588 | /* mpu -> mpu_private */ |
589 | static struct omap_hwmod_ocp_if omap44xx_mpu__mpu_private = { | 589 | static struct omap_hwmod_ocp_if omap44xx_mpu__mpu_private = { |
590 | .master = &omap44xx_mpu_hwmod, | 590 | .master = &omap44xx_mpu_hwmod, |