aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2011-02-25 11:46:33 -0500
committerBenoit Cousson <b-cousson@ti.com>2011-03-10 05:18:50 -0500
commit478f478bc1a58f97f09fd2048488bafdfa9d8fce (patch)
tree6141bea1ded892f18560d42235cdd572d02a5aae
parentb9ccf8afe2d2eafe18f90d2925f8464313fe0b56 (diff)
OMAP3: hwmod data: Remove masters port links for interconnects.
Master ports from interconnect are generating some annoying circular references that become tricky to handle if we have to dynamically remove some IP on some variant platforms. Since they are not used for the moment, and since we can still build that relation using the reverse relation (slave port from the IP toward master port of the interconnect), let remove them for the moment like it is done on OMAP4. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Paul Walmsley <paul@pwsan.com> Cc: Sanjeev Premi <premi@ti.com>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index dec329ff0924..229eb94d3434 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -493,24 +493,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = {
493 &omap3xxx_l3_main__l4_core, 493 &omap3xxx_l3_main__l4_core,
494}; 494};
495 495
496/* Master interfaces on the L4_CORE interconnect */
497static struct omap_hwmod_ocp_if *omap3xxx_l4_core_masters[] = {
498 &omap3xxx_l4_core__l4_wkup,
499 &omap3_l4_core__uart1,
500 &omap3_l4_core__uart2,
501 &omap3_l4_core__i2c1,
502 &omap3_l4_core__i2c2,
503 &omap3_l4_core__i2c3,
504 &omap3_l4_core__sr1,
505 &omap3_l4_core__sr2,
506};
507
508/* L4 CORE */ 496/* L4 CORE */
509static struct omap_hwmod omap3xxx_l4_core_hwmod = { 497static struct omap_hwmod omap3xxx_l4_core_hwmod = {
510 .name = "l4_core", 498 .name = "l4_core",
511 .class = &l4_hwmod_class, 499 .class = &l4_hwmod_class,
512 .masters = omap3xxx_l4_core_masters,
513 .masters_cnt = ARRAY_SIZE(omap3xxx_l4_core_masters),
514 .slaves = omap3xxx_l4_core_slaves, 500 .slaves = omap3xxx_l4_core_slaves,
515 .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_core_slaves), 501 .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_core_slaves),
516 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), 502 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
@@ -522,18 +508,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_l4_per_slaves[] = {
522 &omap3xxx_l3_main__l4_per, 508 &omap3xxx_l3_main__l4_per,
523}; 509};
524 510
525/* Master interfaces on the L4_PER interconnect */
526static struct omap_hwmod_ocp_if *omap3xxx_l4_per_masters[] = {
527 &omap3_l4_per__uart3,
528 &omap3_l4_per__uart4,
529};
530
531/* L4 PER */ 511/* L4 PER */
532static struct omap_hwmod omap3xxx_l4_per_hwmod = { 512static struct omap_hwmod omap3xxx_l4_per_hwmod = {
533 .name = "l4_per", 513 .name = "l4_per",
534 .class = &l4_hwmod_class, 514 .class = &l4_hwmod_class,
535 .masters = omap3xxx_l4_per_masters,
536 .masters_cnt = ARRAY_SIZE(omap3xxx_l4_per_masters),
537 .slaves = omap3xxx_l4_per_slaves, 515 .slaves = omap3xxx_l4_per_slaves,
538 .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_per_slaves), 516 .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_per_slaves),
539 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), 517 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
@@ -545,16 +523,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_l4_wkup_slaves[] = {
545 &omap3xxx_l4_core__l4_wkup, 523 &omap3xxx_l4_core__l4_wkup,
546}; 524};
547 525
548/* Master interfaces on the L4_WKUP interconnect */
549static struct omap_hwmod_ocp_if *omap3xxx_l4_wkup_masters[] = {
550};
551
552/* L4 WKUP */ 526/* L4 WKUP */
553static struct omap_hwmod omap3xxx_l4_wkup_hwmod = { 527static struct omap_hwmod omap3xxx_l4_wkup_hwmod = {
554 .name = "l4_wkup", 528 .name = "l4_wkup",
555 .class = &l4_hwmod_class, 529 .class = &l4_hwmod_class,
556 .masters = omap3xxx_l4_wkup_masters,
557 .masters_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_masters),
558 .slaves = omap3xxx_l4_wkup_slaves, 530 .slaves = omap3xxx_l4_wkup_slaves,
559 .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_slaves), 531 .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_slaves),
560 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), 532 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),