aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap_hwmod_2430_data.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2430_data.c')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2430_data.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 9531ef2802f2..2c28468a37f8 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -369,6 +369,7 @@ static struct omap_hwmod_class omap2430_timer_hwmod_class = {
369static struct omap_hwmod omap2430_timer1_hwmod; 369static struct omap_hwmod omap2430_timer1_hwmod;
370static struct omap_hwmod_irq_info omap2430_timer1_mpu_irqs[] = { 370static struct omap_hwmod_irq_info omap2430_timer1_mpu_irqs[] = {
371 { .irq = 37, }, 371 { .irq = 37, },
372 { .irq = -1 }
372}; 373};
373 374
374static struct omap_hwmod_addr_space omap2430_timer1_addrs[] = { 375static struct omap_hwmod_addr_space omap2430_timer1_addrs[] = {
@@ -398,7 +399,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer1_slaves[] = {
398static struct omap_hwmod omap2430_timer1_hwmod = { 399static struct omap_hwmod omap2430_timer1_hwmod = {
399 .name = "timer1", 400 .name = "timer1",
400 .mpu_irqs = omap2430_timer1_mpu_irqs, 401 .mpu_irqs = omap2430_timer1_mpu_irqs,
401 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer1_mpu_irqs),
402 .main_clk = "gpt1_fck", 402 .main_clk = "gpt1_fck",
403 .prcm = { 403 .prcm = {
404 .omap2 = { 404 .omap2 = {
@@ -419,6 +419,7 @@ static struct omap_hwmod omap2430_timer1_hwmod = {
419static struct omap_hwmod omap2430_timer2_hwmod; 419static struct omap_hwmod omap2430_timer2_hwmod;
420static struct omap_hwmod_irq_info omap2430_timer2_mpu_irqs[] = { 420static struct omap_hwmod_irq_info omap2430_timer2_mpu_irqs[] = {
421 { .irq = 38, }, 421 { .irq = 38, },
422 { .irq = -1 }
422}; 423};
423 424
424/* l4_core -> timer2 */ 425/* l4_core -> timer2 */
@@ -439,7 +440,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer2_slaves[] = {
439static struct omap_hwmod omap2430_timer2_hwmod = { 440static struct omap_hwmod omap2430_timer2_hwmod = {
440 .name = "timer2", 441 .name = "timer2",
441 .mpu_irqs = omap2430_timer2_mpu_irqs, 442 .mpu_irqs = omap2430_timer2_mpu_irqs,
442 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer2_mpu_irqs),
443 .main_clk = "gpt2_fck", 443 .main_clk = "gpt2_fck",
444 .prcm = { 444 .prcm = {
445 .omap2 = { 445 .omap2 = {
@@ -460,6 +460,7 @@ static struct omap_hwmod omap2430_timer2_hwmod = {
460static struct omap_hwmod omap2430_timer3_hwmod; 460static struct omap_hwmod omap2430_timer3_hwmod;
461static struct omap_hwmod_irq_info omap2430_timer3_mpu_irqs[] = { 461static struct omap_hwmod_irq_info omap2430_timer3_mpu_irqs[] = {
462 { .irq = 39, }, 462 { .irq = 39, },
463 { .irq = -1 }
463}; 464};
464 465
465/* l4_core -> timer3 */ 466/* l4_core -> timer3 */
@@ -480,7 +481,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer3_slaves[] = {
480static struct omap_hwmod omap2430_timer3_hwmod = { 481static struct omap_hwmod omap2430_timer3_hwmod = {
481 .name = "timer3", 482 .name = "timer3",
482 .mpu_irqs = omap2430_timer3_mpu_irqs, 483 .mpu_irqs = omap2430_timer3_mpu_irqs,
483 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer3_mpu_irqs),
484 .main_clk = "gpt3_fck", 484 .main_clk = "gpt3_fck",
485 .prcm = { 485 .prcm = {
486 .omap2 = { 486 .omap2 = {
@@ -501,6 +501,7 @@ static struct omap_hwmod omap2430_timer3_hwmod = {
501static struct omap_hwmod omap2430_timer4_hwmod; 501static struct omap_hwmod omap2430_timer4_hwmod;
502static struct omap_hwmod_irq_info omap2430_timer4_mpu_irqs[] = { 502static struct omap_hwmod_irq_info omap2430_timer4_mpu_irqs[] = {
503 { .irq = 40, }, 503 { .irq = 40, },
504 { .irq = -1 }
504}; 505};
505 506
506/* l4_core -> timer4 */ 507/* l4_core -> timer4 */
@@ -521,7 +522,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer4_slaves[] = {
521static struct omap_hwmod omap2430_timer4_hwmod = { 522static struct omap_hwmod omap2430_timer4_hwmod = {
522 .name = "timer4", 523 .name = "timer4",
523 .mpu_irqs = omap2430_timer4_mpu_irqs, 524 .mpu_irqs = omap2430_timer4_mpu_irqs,
524 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer4_mpu_irqs),
525 .main_clk = "gpt4_fck", 525 .main_clk = "gpt4_fck",
526 .prcm = { 526 .prcm = {
527 .omap2 = { 527 .omap2 = {
@@ -542,6 +542,7 @@ static struct omap_hwmod omap2430_timer4_hwmod = {
542static struct omap_hwmod omap2430_timer5_hwmod; 542static struct omap_hwmod omap2430_timer5_hwmod;
543static struct omap_hwmod_irq_info omap2430_timer5_mpu_irqs[] = { 543static struct omap_hwmod_irq_info omap2430_timer5_mpu_irqs[] = {
544 { .irq = 41, }, 544 { .irq = 41, },
545 { .irq = -1 }
545}; 546};
546 547
547/* l4_core -> timer5 */ 548/* l4_core -> timer5 */
@@ -562,7 +563,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer5_slaves[] = {
562static struct omap_hwmod omap2430_timer5_hwmod = { 563static struct omap_hwmod omap2430_timer5_hwmod = {
563 .name = "timer5", 564 .name = "timer5",
564 .mpu_irqs = omap2430_timer5_mpu_irqs, 565 .mpu_irqs = omap2430_timer5_mpu_irqs,
565 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer5_mpu_irqs),
566 .main_clk = "gpt5_fck", 566 .main_clk = "gpt5_fck",
567 .prcm = { 567 .prcm = {
568 .omap2 = { 568 .omap2 = {
@@ -583,6 +583,7 @@ static struct omap_hwmod omap2430_timer5_hwmod = {
583static struct omap_hwmod omap2430_timer6_hwmod; 583static struct omap_hwmod omap2430_timer6_hwmod;
584static struct omap_hwmod_irq_info omap2430_timer6_mpu_irqs[] = { 584static struct omap_hwmod_irq_info omap2430_timer6_mpu_irqs[] = {
585 { .irq = 42, }, 585 { .irq = 42, },
586 { .irq = -1 }
586}; 587};
587 588
588/* l4_core -> timer6 */ 589/* l4_core -> timer6 */
@@ -603,7 +604,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer6_slaves[] = {
603static struct omap_hwmod omap2430_timer6_hwmod = { 604static struct omap_hwmod omap2430_timer6_hwmod = {
604 .name = "timer6", 605 .name = "timer6",
605 .mpu_irqs = omap2430_timer6_mpu_irqs, 606 .mpu_irqs = omap2430_timer6_mpu_irqs,
606 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer6_mpu_irqs),
607 .main_clk = "gpt6_fck", 607 .main_clk = "gpt6_fck",
608 .prcm = { 608 .prcm = {
609 .omap2 = { 609 .omap2 = {
@@ -624,6 +624,7 @@ static struct omap_hwmod omap2430_timer6_hwmod = {
624static struct omap_hwmod omap2430_timer7_hwmod; 624static struct omap_hwmod omap2430_timer7_hwmod;
625static struct omap_hwmod_irq_info omap2430_timer7_mpu_irqs[] = { 625static struct omap_hwmod_irq_info omap2430_timer7_mpu_irqs[] = {
626 { .irq = 43, }, 626 { .irq = 43, },
627 { .irq = -1 }
627}; 628};
628 629
629/* l4_core -> timer7 */ 630/* l4_core -> timer7 */
@@ -644,7 +645,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer7_slaves[] = {
644static struct omap_hwmod omap2430_timer7_hwmod = { 645static struct omap_hwmod omap2430_timer7_hwmod = {
645 .name = "timer7", 646 .name = "timer7",
646 .mpu_irqs = omap2430_timer7_mpu_irqs, 647 .mpu_irqs = omap2430_timer7_mpu_irqs,
647 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer7_mpu_irqs),
648 .main_clk = "gpt7_fck", 648 .main_clk = "gpt7_fck",
649 .prcm = { 649 .prcm = {
650 .omap2 = { 650 .omap2 = {
@@ -665,6 +665,7 @@ static struct omap_hwmod omap2430_timer7_hwmod = {
665static struct omap_hwmod omap2430_timer8_hwmod; 665static struct omap_hwmod omap2430_timer8_hwmod;
666static struct omap_hwmod_irq_info omap2430_timer8_mpu_irqs[] = { 666static struct omap_hwmod_irq_info omap2430_timer8_mpu_irqs[] = {
667 { .irq = 44, }, 667 { .irq = 44, },
668 { .irq = -1 }
668}; 669};
669 670
670/* l4_core -> timer8 */ 671/* l4_core -> timer8 */
@@ -685,7 +686,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer8_slaves[] = {
685static struct omap_hwmod omap2430_timer8_hwmod = { 686static struct omap_hwmod omap2430_timer8_hwmod = {
686 .name = "timer8", 687 .name = "timer8",
687 .mpu_irqs = omap2430_timer8_mpu_irqs, 688 .mpu_irqs = omap2430_timer8_mpu_irqs,
688 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer8_mpu_irqs),
689 .main_clk = "gpt8_fck", 689 .main_clk = "gpt8_fck",
690 .prcm = { 690 .prcm = {
691 .omap2 = { 691 .omap2 = {
@@ -706,6 +706,7 @@ static struct omap_hwmod omap2430_timer8_hwmod = {
706static struct omap_hwmod omap2430_timer9_hwmod; 706static struct omap_hwmod omap2430_timer9_hwmod;
707static struct omap_hwmod_irq_info omap2430_timer9_mpu_irqs[] = { 707static struct omap_hwmod_irq_info omap2430_timer9_mpu_irqs[] = {
708 { .irq = 45, }, 708 { .irq = 45, },
709 { .irq = -1 }
709}; 710};
710 711
711/* l4_core -> timer9 */ 712/* l4_core -> timer9 */
@@ -726,7 +727,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer9_slaves[] = {
726static struct omap_hwmod omap2430_timer9_hwmod = { 727static struct omap_hwmod omap2430_timer9_hwmod = {
727 .name = "timer9", 728 .name = "timer9",
728 .mpu_irqs = omap2430_timer9_mpu_irqs, 729 .mpu_irqs = omap2430_timer9_mpu_irqs,
729 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer9_mpu_irqs),
730 .main_clk = "gpt9_fck", 730 .main_clk = "gpt9_fck",
731 .prcm = { 731 .prcm = {
732 .omap2 = { 732 .omap2 = {
@@ -747,6 +747,7 @@ static struct omap_hwmod omap2430_timer9_hwmod = {
747static struct omap_hwmod omap2430_timer10_hwmod; 747static struct omap_hwmod omap2430_timer10_hwmod;
748static struct omap_hwmod_irq_info omap2430_timer10_mpu_irqs[] = { 748static struct omap_hwmod_irq_info omap2430_timer10_mpu_irqs[] = {
749 { .irq = 46, }, 749 { .irq = 46, },
750 { .irq = -1 }
750}; 751};
751 752
752/* l4_core -> timer10 */ 753/* l4_core -> timer10 */
@@ -767,7 +768,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer10_slaves[] = {
767static struct omap_hwmod omap2430_timer10_hwmod = { 768static struct omap_hwmod omap2430_timer10_hwmod = {
768 .name = "timer10", 769 .name = "timer10",
769 .mpu_irqs = omap2430_timer10_mpu_irqs, 770 .mpu_irqs = omap2430_timer10_mpu_irqs,
770 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer10_mpu_irqs),
771 .main_clk = "gpt10_fck", 771 .main_clk = "gpt10_fck",
772 .prcm = { 772 .prcm = {
773 .omap2 = { 773 .omap2 = {
@@ -788,6 +788,7 @@ static struct omap_hwmod omap2430_timer10_hwmod = {
788static struct omap_hwmod omap2430_timer11_hwmod; 788static struct omap_hwmod omap2430_timer11_hwmod;
789static struct omap_hwmod_irq_info omap2430_timer11_mpu_irqs[] = { 789static struct omap_hwmod_irq_info omap2430_timer11_mpu_irqs[] = {
790 { .irq = 47, }, 790 { .irq = 47, },
791 { .irq = -1 }
791}; 792};
792 793
793/* l4_core -> timer11 */ 794/* l4_core -> timer11 */
@@ -808,7 +809,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer11_slaves[] = {
808static struct omap_hwmod omap2430_timer11_hwmod = { 809static struct omap_hwmod omap2430_timer11_hwmod = {
809 .name = "timer11", 810 .name = "timer11",
810 .mpu_irqs = omap2430_timer11_mpu_irqs, 811 .mpu_irqs = omap2430_timer11_mpu_irqs,
811 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer11_mpu_irqs),
812 .main_clk = "gpt11_fck", 812 .main_clk = "gpt11_fck",
813 .prcm = { 813 .prcm = {
814 .omap2 = { 814 .omap2 = {
@@ -829,6 +829,7 @@ static struct omap_hwmod omap2430_timer11_hwmod = {
829static struct omap_hwmod omap2430_timer12_hwmod; 829static struct omap_hwmod omap2430_timer12_hwmod;
830static struct omap_hwmod_irq_info omap2430_timer12_mpu_irqs[] = { 830static struct omap_hwmod_irq_info omap2430_timer12_mpu_irqs[] = {
831 { .irq = 48, }, 831 { .irq = 48, },
832 { .irq = -1 }
832}; 833};
833 834
834/* l4_core -> timer12 */ 835/* l4_core -> timer12 */
@@ -849,7 +850,6 @@ static struct omap_hwmod_ocp_if *omap2430_timer12_slaves[] = {
849static struct omap_hwmod omap2430_timer12_hwmod = { 850static struct omap_hwmod omap2430_timer12_hwmod = {
850 .name = "timer12", 851 .name = "timer12",
851 .mpu_irqs = omap2430_timer12_mpu_irqs, 852 .mpu_irqs = omap2430_timer12_mpu_irqs,
852 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_timer12_mpu_irqs),
853 .main_clk = "gpt12_fck", 853 .main_clk = "gpt12_fck",
854 .prcm = { 854 .prcm = {
855 .omap2 = { 855 .omap2 = {
@@ -950,6 +950,7 @@ static struct omap_hwmod_class uart_class = {
950 950
951static struct omap_hwmod_irq_info uart1_mpu_irqs[] = { 951static struct omap_hwmod_irq_info uart1_mpu_irqs[] = {
952 { .irq = INT_24XX_UART1_IRQ, }, 952 { .irq = INT_24XX_UART1_IRQ, },
953 { .irq = -1 }
953}; 954};
954 955
955static struct omap_hwmod_dma_info uart1_sdma_reqs[] = { 956static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
@@ -964,7 +965,6 @@ static struct omap_hwmod_ocp_if *omap2430_uart1_slaves[] = {
964static struct omap_hwmod omap2430_uart1_hwmod = { 965static struct omap_hwmod omap2430_uart1_hwmod = {
965 .name = "uart1", 966 .name = "uart1",
966 .mpu_irqs = uart1_mpu_irqs, 967 .mpu_irqs = uart1_mpu_irqs,
967 .mpu_irqs_cnt = ARRAY_SIZE(uart1_mpu_irqs),
968 .sdma_reqs = uart1_sdma_reqs, 968 .sdma_reqs = uart1_sdma_reqs,
969 .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs), 969 .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs),
970 .main_clk = "uart1_fck", 970 .main_clk = "uart1_fck",
@@ -987,6 +987,7 @@ static struct omap_hwmod omap2430_uart1_hwmod = {
987 987
988static struct omap_hwmod_irq_info uart2_mpu_irqs[] = { 988static struct omap_hwmod_irq_info uart2_mpu_irqs[] = {
989 { .irq = INT_24XX_UART2_IRQ, }, 989 { .irq = INT_24XX_UART2_IRQ, },
990 { .irq = -1 }
990}; 991};
991 992
992static struct omap_hwmod_dma_info uart2_sdma_reqs[] = { 993static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
@@ -1001,7 +1002,6 @@ static struct omap_hwmod_ocp_if *omap2430_uart2_slaves[] = {
1001static struct omap_hwmod omap2430_uart2_hwmod = { 1002static struct omap_hwmod omap2430_uart2_hwmod = {
1002 .name = "uart2", 1003 .name = "uart2",
1003 .mpu_irqs = uart2_mpu_irqs, 1004 .mpu_irqs = uart2_mpu_irqs,
1004 .mpu_irqs_cnt = ARRAY_SIZE(uart2_mpu_irqs),
1005 .sdma_reqs = uart2_sdma_reqs, 1005 .sdma_reqs = uart2_sdma_reqs,
1006 .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs), 1006 .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs),
1007 .main_clk = "uart2_fck", 1007 .main_clk = "uart2_fck",
@@ -1024,6 +1024,7 @@ static struct omap_hwmod omap2430_uart2_hwmod = {
1024 1024
1025static struct omap_hwmod_irq_info uart3_mpu_irqs[] = { 1025static struct omap_hwmod_irq_info uart3_mpu_irqs[] = {
1026 { .irq = INT_24XX_UART3_IRQ, }, 1026 { .irq = INT_24XX_UART3_IRQ, },
1027 { .irq = -1 }
1027}; 1028};
1028 1029
1029static struct omap_hwmod_dma_info uart3_sdma_reqs[] = { 1030static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
@@ -1038,7 +1039,6 @@ static struct omap_hwmod_ocp_if *omap2430_uart3_slaves[] = {
1038static struct omap_hwmod omap2430_uart3_hwmod = { 1039static struct omap_hwmod omap2430_uart3_hwmod = {
1039 .name = "uart3", 1040 .name = "uart3",
1040 .mpu_irqs = uart3_mpu_irqs, 1041 .mpu_irqs = uart3_mpu_irqs,
1041 .mpu_irqs_cnt = ARRAY_SIZE(uart3_mpu_irqs),
1042 .sdma_reqs = uart3_sdma_reqs, 1042 .sdma_reqs = uart3_sdma_reqs,
1043 .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs), 1043 .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs),
1044 .main_clk = "uart3_fck", 1044 .main_clk = "uart3_fck",
@@ -1152,6 +1152,7 @@ static struct omap_hwmod_class omap2430_dispc_hwmod_class = {
1152 1152
1153static struct omap_hwmod_irq_info omap2430_dispc_irqs[] = { 1153static struct omap_hwmod_irq_info omap2430_dispc_irqs[] = {
1154 { .irq = 25 }, 1154 { .irq = 25 },
1155 { .irq = -1 }
1155}; 1156};
1156 1157
1157/* l4_core -> dss_dispc */ 1158/* l4_core -> dss_dispc */
@@ -1172,7 +1173,6 @@ static struct omap_hwmod omap2430_dss_dispc_hwmod = {
1172 .name = "dss_dispc", 1173 .name = "dss_dispc",
1173 .class = &omap2430_dispc_hwmod_class, 1174 .class = &omap2430_dispc_hwmod_class,
1174 .mpu_irqs = omap2430_dispc_irqs, 1175 .mpu_irqs = omap2430_dispc_irqs,
1175 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_dispc_irqs),
1176 .main_clk = "dss1_fck", 1176 .main_clk = "dss1_fck",
1177 .prcm = { 1177 .prcm = {
1178 .omap2 = { 1178 .omap2 = {
@@ -1304,6 +1304,7 @@ static struct omap_i2c_dev_attr i2c_dev_attr = {
1304 1304
1305static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = { 1305static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = {
1306 { .irq = INT_24XX_I2C1_IRQ, }, 1306 { .irq = INT_24XX_I2C1_IRQ, },
1307 { .irq = -1 }
1307}; 1308};
1308 1309
1309static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = { 1310static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = {
@@ -1318,7 +1319,6 @@ static struct omap_hwmod_ocp_if *omap2430_i2c1_slaves[] = {
1318static struct omap_hwmod omap2430_i2c1_hwmod = { 1319static struct omap_hwmod omap2430_i2c1_hwmod = {
1319 .name = "i2c1", 1320 .name = "i2c1",
1320 .mpu_irqs = i2c1_mpu_irqs, 1321 .mpu_irqs = i2c1_mpu_irqs,
1321 .mpu_irqs_cnt = ARRAY_SIZE(i2c1_mpu_irqs),
1322 .sdma_reqs = i2c1_sdma_reqs, 1322 .sdma_reqs = i2c1_sdma_reqs,
1323 .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs), 1323 .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs),
1324 .main_clk = "i2chs1_fck", 1324 .main_clk = "i2chs1_fck",
@@ -1350,6 +1350,7 @@ static struct omap_hwmod omap2430_i2c1_hwmod = {
1350 1350
1351static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = { 1351static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = {
1352 { .irq = INT_24XX_I2C2_IRQ, }, 1352 { .irq = INT_24XX_I2C2_IRQ, },
1353 { .irq = -1 }
1353}; 1354};
1354 1355
1355static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = { 1356static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = {
@@ -1364,7 +1365,6 @@ static struct omap_hwmod_ocp_if *omap2430_i2c2_slaves[] = {
1364static struct omap_hwmod omap2430_i2c2_hwmod = { 1365static struct omap_hwmod omap2430_i2c2_hwmod = {
1365 .name = "i2c2", 1366 .name = "i2c2",
1366 .mpu_irqs = i2c2_mpu_irqs, 1367 .mpu_irqs = i2c2_mpu_irqs,
1367 .mpu_irqs_cnt = ARRAY_SIZE(i2c2_mpu_irqs),
1368 .sdma_reqs = i2c2_sdma_reqs, 1368 .sdma_reqs = i2c2_sdma_reqs,
1369 .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs), 1369 .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs),
1370 .main_clk = "i2chs2_fck", 1370 .main_clk = "i2chs2_fck",
@@ -1504,6 +1504,7 @@ static struct omap_hwmod_class omap243x_gpio_hwmod_class = {
1504/* gpio1 */ 1504/* gpio1 */
1505static struct omap_hwmod_irq_info omap243x_gpio1_irqs[] = { 1505static struct omap_hwmod_irq_info omap243x_gpio1_irqs[] = {
1506 { .irq = 29 }, /* INT_24XX_GPIO_BANK1 */ 1506 { .irq = 29 }, /* INT_24XX_GPIO_BANK1 */
1507 { .irq = -1 }
1507}; 1508};
1508 1509
1509static struct omap_hwmod_ocp_if *omap2430_gpio1_slaves[] = { 1510static struct omap_hwmod_ocp_if *omap2430_gpio1_slaves[] = {
@@ -1514,7 +1515,6 @@ static struct omap_hwmod omap2430_gpio1_hwmod = {
1514 .name = "gpio1", 1515 .name = "gpio1",
1515 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1516 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1516 .mpu_irqs = omap243x_gpio1_irqs, 1517 .mpu_irqs = omap243x_gpio1_irqs,
1517 .mpu_irqs_cnt = ARRAY_SIZE(omap243x_gpio1_irqs),
1518 .main_clk = "gpios_fck", 1518 .main_clk = "gpios_fck",
1519 .prcm = { 1519 .prcm = {
1520 .omap2 = { 1520 .omap2 = {
@@ -1535,6 +1535,7 @@ static struct omap_hwmod omap2430_gpio1_hwmod = {
1535/* gpio2 */ 1535/* gpio2 */
1536static struct omap_hwmod_irq_info omap243x_gpio2_irqs[] = { 1536static struct omap_hwmod_irq_info omap243x_gpio2_irqs[] = {
1537 { .irq = 30 }, /* INT_24XX_GPIO_BANK2 */ 1537 { .irq = 30 }, /* INT_24XX_GPIO_BANK2 */
1538 { .irq = -1 }
1538}; 1539};
1539 1540
1540static struct omap_hwmod_ocp_if *omap2430_gpio2_slaves[] = { 1541static struct omap_hwmod_ocp_if *omap2430_gpio2_slaves[] = {
@@ -1545,7 +1546,6 @@ static struct omap_hwmod omap2430_gpio2_hwmod = {
1545 .name = "gpio2", 1546 .name = "gpio2",
1546 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1547 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1547 .mpu_irqs = omap243x_gpio2_irqs, 1548 .mpu_irqs = omap243x_gpio2_irqs,
1548 .mpu_irqs_cnt = ARRAY_SIZE(omap243x_gpio2_irqs),
1549 .main_clk = "gpios_fck", 1549 .main_clk = "gpios_fck",
1550 .prcm = { 1550 .prcm = {
1551 .omap2 = { 1551 .omap2 = {
@@ -1566,6 +1566,7 @@ static struct omap_hwmod omap2430_gpio2_hwmod = {
1566/* gpio3 */ 1566/* gpio3 */
1567static struct omap_hwmod_irq_info omap243x_gpio3_irqs[] = { 1567static struct omap_hwmod_irq_info omap243x_gpio3_irqs[] = {
1568 { .irq = 31 }, /* INT_24XX_GPIO_BANK3 */ 1568 { .irq = 31 }, /* INT_24XX_GPIO_BANK3 */
1569 { .irq = -1 }
1569}; 1570};
1570 1571
1571static struct omap_hwmod_ocp_if *omap2430_gpio3_slaves[] = { 1572static struct omap_hwmod_ocp_if *omap2430_gpio3_slaves[] = {
@@ -1576,7 +1577,6 @@ static struct omap_hwmod omap2430_gpio3_hwmod = {
1576 .name = "gpio3", 1577 .name = "gpio3",
1577 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1578 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1578 .mpu_irqs = omap243x_gpio3_irqs, 1579 .mpu_irqs = omap243x_gpio3_irqs,
1579 .mpu_irqs_cnt = ARRAY_SIZE(omap243x_gpio3_irqs),
1580 .main_clk = "gpios_fck", 1580 .main_clk = "gpios_fck",
1581 .prcm = { 1581 .prcm = {
1582 .omap2 = { 1582 .omap2 = {
@@ -1597,6 +1597,7 @@ static struct omap_hwmod omap2430_gpio3_hwmod = {
1597/* gpio4 */ 1597/* gpio4 */
1598static struct omap_hwmod_irq_info omap243x_gpio4_irqs[] = { 1598static struct omap_hwmod_irq_info omap243x_gpio4_irqs[] = {
1599 { .irq = 32 }, /* INT_24XX_GPIO_BANK4 */ 1599 { .irq = 32 }, /* INT_24XX_GPIO_BANK4 */
1600 { .irq = -1 }
1600}; 1601};
1601 1602
1602static struct omap_hwmod_ocp_if *omap2430_gpio4_slaves[] = { 1603static struct omap_hwmod_ocp_if *omap2430_gpio4_slaves[] = {
@@ -1607,7 +1608,6 @@ static struct omap_hwmod omap2430_gpio4_hwmod = {
1607 .name = "gpio4", 1608 .name = "gpio4",
1608 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1609 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1609 .mpu_irqs = omap243x_gpio4_irqs, 1610 .mpu_irqs = omap243x_gpio4_irqs,
1610 .mpu_irqs_cnt = ARRAY_SIZE(omap243x_gpio4_irqs),
1611 .main_clk = "gpios_fck", 1611 .main_clk = "gpios_fck",
1612 .prcm = { 1612 .prcm = {
1613 .omap2 = { 1613 .omap2 = {
@@ -1628,6 +1628,7 @@ static struct omap_hwmod omap2430_gpio4_hwmod = {
1628/* gpio5 */ 1628/* gpio5 */
1629static struct omap_hwmod_irq_info omap243x_gpio5_irqs[] = { 1629static struct omap_hwmod_irq_info omap243x_gpio5_irqs[] = {
1630 { .irq = 33 }, /* INT_24XX_GPIO_BANK5 */ 1630 { .irq = 33 }, /* INT_24XX_GPIO_BANK5 */
1631 { .irq = -1 }
1631}; 1632};
1632 1633
1633static struct omap_hwmod_ocp_if *omap2430_gpio5_slaves[] = { 1634static struct omap_hwmod_ocp_if *omap2430_gpio5_slaves[] = {
@@ -1638,7 +1639,6 @@ static struct omap_hwmod omap2430_gpio5_hwmod = {
1638 .name = "gpio5", 1639 .name = "gpio5",
1639 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1640 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1640 .mpu_irqs = omap243x_gpio5_irqs, 1641 .mpu_irqs = omap243x_gpio5_irqs,
1641 .mpu_irqs_cnt = ARRAY_SIZE(omap243x_gpio5_irqs),
1642 .main_clk = "gpio5_fck", 1642 .main_clk = "gpio5_fck",
1643 .prcm = { 1643 .prcm = {
1644 .omap2 = { 1644 .omap2 = {
@@ -1685,6 +1685,7 @@ static struct omap_hwmod_irq_info omap2430_dma_system_irqs[] = {
1685 { .name = "1", .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */ 1685 { .name = "1", .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */
1686 { .name = "2", .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */ 1686 { .name = "2", .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */
1687 { .name = "3", .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */ 1687 { .name = "3", .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */
1688 { .irq = -1 }
1688}; 1689};
1689 1690
1690/* dma_system -> L3 */ 1691/* dma_system -> L3 */
@@ -1718,7 +1719,6 @@ static struct omap_hwmod omap2430_dma_system_hwmod = {
1718 .name = "dma", 1719 .name = "dma",
1719 .class = &omap2430_dma_hwmod_class, 1720 .class = &omap2430_dma_hwmod_class,
1720 .mpu_irqs = omap2430_dma_system_irqs, 1721 .mpu_irqs = omap2430_dma_system_irqs,
1721 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_dma_system_irqs),
1722 .main_clk = "core_l3_ck", 1722 .main_clk = "core_l3_ck",
1723 .slaves = omap2430_dma_system_slaves, 1723 .slaves = omap2430_dma_system_slaves,
1724 .slaves_cnt = ARRAY_SIZE(omap2430_dma_system_slaves), 1724 .slaves_cnt = ARRAY_SIZE(omap2430_dma_system_slaves),
@@ -1754,6 +1754,7 @@ static struct omap_hwmod_class omap2430_mailbox_hwmod_class = {
1754static struct omap_hwmod omap2430_mailbox_hwmod; 1754static struct omap_hwmod omap2430_mailbox_hwmod;
1755static struct omap_hwmod_irq_info omap2430_mailbox_irqs[] = { 1755static struct omap_hwmod_irq_info omap2430_mailbox_irqs[] = {
1756 { .irq = 26 }, 1756 { .irq = 26 },
1757 { .irq = -1 }
1757}; 1758};
1758 1759
1759/* l4_core -> mailbox */ 1760/* l4_core -> mailbox */
@@ -1773,7 +1774,6 @@ static struct omap_hwmod omap2430_mailbox_hwmod = {
1773 .name = "mailbox", 1774 .name = "mailbox",
1774 .class = &omap2430_mailbox_hwmod_class, 1775 .class = &omap2430_mailbox_hwmod_class,
1775 .mpu_irqs = omap2430_mailbox_irqs, 1776 .mpu_irqs = omap2430_mailbox_irqs,
1776 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mailbox_irqs),
1777 .main_clk = "mailboxes_ick", 1777 .main_clk = "mailboxes_ick",
1778 .prcm = { 1778 .prcm = {
1779 .omap2 = { 1779 .omap2 = {
@@ -1815,6 +1815,7 @@ static struct omap_hwmod_class omap2430_mcspi_class = {
1815/* mcspi1 */ 1815/* mcspi1 */
1816static struct omap_hwmod_irq_info omap2430_mcspi1_mpu_irqs[] = { 1816static struct omap_hwmod_irq_info omap2430_mcspi1_mpu_irqs[] = {
1817 { .irq = 65 }, 1817 { .irq = 65 },
1818 { .irq = -1 }
1818}; 1819};
1819 1820
1820static struct omap_hwmod_dma_info omap2430_mcspi1_sdma_reqs[] = { 1821static struct omap_hwmod_dma_info omap2430_mcspi1_sdma_reqs[] = {
@@ -1839,7 +1840,6 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
1839static struct omap_hwmod omap2430_mcspi1_hwmod = { 1840static struct omap_hwmod omap2430_mcspi1_hwmod = {
1840 .name = "mcspi1_hwmod", 1841 .name = "mcspi1_hwmod",
1841 .mpu_irqs = omap2430_mcspi1_mpu_irqs, 1842 .mpu_irqs = omap2430_mcspi1_mpu_irqs,
1842 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mcspi1_mpu_irqs),
1843 .sdma_reqs = omap2430_mcspi1_sdma_reqs, 1843 .sdma_reqs = omap2430_mcspi1_sdma_reqs,
1844 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi1_sdma_reqs), 1844 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi1_sdma_reqs),
1845 .main_clk = "mcspi1_fck", 1845 .main_clk = "mcspi1_fck",
@@ -1862,6 +1862,7 @@ static struct omap_hwmod omap2430_mcspi1_hwmod = {
1862/* mcspi2 */ 1862/* mcspi2 */
1863static struct omap_hwmod_irq_info omap2430_mcspi2_mpu_irqs[] = { 1863static struct omap_hwmod_irq_info omap2430_mcspi2_mpu_irqs[] = {
1864 { .irq = 66 }, 1864 { .irq = 66 },
1865 { .irq = -1 }
1865}; 1866};
1866 1867
1867static struct omap_hwmod_dma_info omap2430_mcspi2_sdma_reqs[] = { 1868static struct omap_hwmod_dma_info omap2430_mcspi2_sdma_reqs[] = {
@@ -1882,7 +1883,6 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
1882static struct omap_hwmod omap2430_mcspi2_hwmod = { 1883static struct omap_hwmod omap2430_mcspi2_hwmod = {
1883 .name = "mcspi2_hwmod", 1884 .name = "mcspi2_hwmod",
1884 .mpu_irqs = omap2430_mcspi2_mpu_irqs, 1885 .mpu_irqs = omap2430_mcspi2_mpu_irqs,
1885 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mcspi2_mpu_irqs),
1886 .sdma_reqs = omap2430_mcspi2_sdma_reqs, 1886 .sdma_reqs = omap2430_mcspi2_sdma_reqs,
1887 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi2_sdma_reqs), 1887 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi2_sdma_reqs),
1888 .main_clk = "mcspi2_fck", 1888 .main_clk = "mcspi2_fck",
@@ -1905,6 +1905,7 @@ static struct omap_hwmod omap2430_mcspi2_hwmod = {
1905/* mcspi3 */ 1905/* mcspi3 */
1906static struct omap_hwmod_irq_info omap2430_mcspi3_mpu_irqs[] = { 1906static struct omap_hwmod_irq_info omap2430_mcspi3_mpu_irqs[] = {
1907 { .irq = 91 }, 1907 { .irq = 91 },
1908 { .irq = -1 }
1908}; 1909};
1909 1910
1910static struct omap_hwmod_dma_info omap2430_mcspi3_sdma_reqs[] = { 1911static struct omap_hwmod_dma_info omap2430_mcspi3_sdma_reqs[] = {
@@ -1925,7 +1926,6 @@ static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = {
1925static struct omap_hwmod omap2430_mcspi3_hwmod = { 1926static struct omap_hwmod omap2430_mcspi3_hwmod = {
1926 .name = "mcspi3_hwmod", 1927 .name = "mcspi3_hwmod",
1927 .mpu_irqs = omap2430_mcspi3_mpu_irqs, 1928 .mpu_irqs = omap2430_mcspi3_mpu_irqs,
1928 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mcspi3_mpu_irqs),
1929 .sdma_reqs = omap2430_mcspi3_sdma_reqs, 1929 .sdma_reqs = omap2430_mcspi3_sdma_reqs,
1930 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi3_sdma_reqs), 1930 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi3_sdma_reqs),
1931 .main_clk = "mcspi3_fck", 1931 .main_clk = "mcspi3_fck",
@@ -1970,12 +1970,12 @@ static struct omap_hwmod_irq_info omap2430_usbhsotg_mpu_irqs[] = {
1970 1970
1971 { .name = "mc", .irq = 92 }, 1971 { .name = "mc", .irq = 92 },
1972 { .name = "dma", .irq = 93 }, 1972 { .name = "dma", .irq = 93 },
1973 { .irq = -1 }
1973}; 1974};
1974 1975
1975static struct omap_hwmod omap2430_usbhsotg_hwmod = { 1976static struct omap_hwmod omap2430_usbhsotg_hwmod = {
1976 .name = "usb_otg_hs", 1977 .name = "usb_otg_hs",
1977 .mpu_irqs = omap2430_usbhsotg_mpu_irqs, 1978 .mpu_irqs = omap2430_usbhsotg_mpu_irqs,
1978 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_usbhsotg_mpu_irqs),
1979 .main_clk = "usbhs_ick", 1979 .main_clk = "usbhs_ick",
1980 .prcm = { 1980 .prcm = {
1981 .omap2 = { 1981 .omap2 = {
@@ -2025,6 +2025,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp1_irqs[] = {
2025 { .name = "rx", .irq = 60 }, 2025 { .name = "rx", .irq = 60 },
2026 { .name = "ovr", .irq = 61 }, 2026 { .name = "ovr", .irq = 61 },
2027 { .name = "common", .irq = 64 }, 2027 { .name = "common", .irq = 64 },
2028 { .irq = -1 }
2028}; 2029};
2029 2030
2030static struct omap_hwmod_dma_info omap2430_mcbsp1_sdma_chs[] = { 2031static struct omap_hwmod_dma_info omap2430_mcbsp1_sdma_chs[] = {
@@ -2050,7 +2051,6 @@ static struct omap_hwmod omap2430_mcbsp1_hwmod = {
2050 .name = "mcbsp1", 2051 .name = "mcbsp1",
2051 .class = &omap2430_mcbsp_hwmod_class, 2052 .class = &omap2430_mcbsp_hwmod_class,
2052 .mpu_irqs = omap2430_mcbsp1_irqs, 2053 .mpu_irqs = omap2430_mcbsp1_irqs,
2053 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mcbsp1_irqs),
2054 .sdma_reqs = omap2430_mcbsp1_sdma_chs, 2054 .sdma_reqs = omap2430_mcbsp1_sdma_chs,
2055 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp1_sdma_chs), 2055 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp1_sdma_chs),
2056 .main_clk = "mcbsp1_fck", 2056 .main_clk = "mcbsp1_fck",
@@ -2073,6 +2073,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp2_irqs[] = {
2073 { .name = "tx", .irq = 62 }, 2073 { .name = "tx", .irq = 62 },
2074 { .name = "rx", .irq = 63 }, 2074 { .name = "rx", .irq = 63 },
2075 { .name = "common", .irq = 16 }, 2075 { .name = "common", .irq = 16 },
2076 { .irq = -1 }
2076}; 2077};
2077 2078
2078static struct omap_hwmod_dma_info omap2430_mcbsp2_sdma_chs[] = { 2079static struct omap_hwmod_dma_info omap2430_mcbsp2_sdma_chs[] = {
@@ -2098,7 +2099,6 @@ static struct omap_hwmod omap2430_mcbsp2_hwmod = {
2098 .name = "mcbsp2", 2099 .name = "mcbsp2",
2099 .class = &omap2430_mcbsp_hwmod_class, 2100 .class = &omap2430_mcbsp_hwmod_class,
2100 .mpu_irqs = omap2430_mcbsp2_irqs, 2101 .mpu_irqs = omap2430_mcbsp2_irqs,
2101 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mcbsp2_irqs),
2102 .sdma_reqs = omap2430_mcbsp2_sdma_chs, 2102 .sdma_reqs = omap2430_mcbsp2_sdma_chs,
2103 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp2_sdma_chs), 2103 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp2_sdma_chs),
2104 .main_clk = "mcbsp2_fck", 2104 .main_clk = "mcbsp2_fck",
@@ -2121,6 +2121,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp3_irqs[] = {
2121 { .name = "tx", .irq = 89 }, 2121 { .name = "tx", .irq = 89 },
2122 { .name = "rx", .irq = 90 }, 2122 { .name = "rx", .irq = 90 },
2123 { .name = "common", .irq = 17 }, 2123 { .name = "common", .irq = 17 },
2124 { .irq = -1 }
2124}; 2125};
2125 2126
2126static struct omap_hwmod_dma_info omap2430_mcbsp3_sdma_chs[] = { 2127static struct omap_hwmod_dma_info omap2430_mcbsp3_sdma_chs[] = {
@@ -2156,7 +2157,6 @@ static struct omap_hwmod omap2430_mcbsp3_hwmod = {
2156 .name = "mcbsp3", 2157 .name = "mcbsp3",
2157 .class = &omap2430_mcbsp_hwmod_class, 2158 .class = &omap2430_mcbsp_hwmod_class,
2158 .mpu_irqs = omap2430_mcbsp3_irqs, 2159 .mpu_irqs = omap2430_mcbsp3_irqs,
2159 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mcbsp3_irqs),
2160 .sdma_reqs = omap2430_mcbsp3_sdma_chs, 2160 .sdma_reqs = omap2430_mcbsp3_sdma_chs,
2161 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp3_sdma_chs), 2161 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp3_sdma_chs),
2162 .main_clk = "mcbsp3_fck", 2162 .main_clk = "mcbsp3_fck",
@@ -2179,6 +2179,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp4_irqs[] = {
2179 { .name = "tx", .irq = 54 }, 2179 { .name = "tx", .irq = 54 },
2180 { .name = "rx", .irq = 55 }, 2180 { .name = "rx", .irq = 55 },
2181 { .name = "common", .irq = 18 }, 2181 { .name = "common", .irq = 18 },
2182 { .irq = -1 }
2182}; 2183};
2183 2184
2184static struct omap_hwmod_dma_info omap2430_mcbsp4_sdma_chs[] = { 2185static struct omap_hwmod_dma_info omap2430_mcbsp4_sdma_chs[] = {
@@ -2214,7 +2215,6 @@ static struct omap_hwmod omap2430_mcbsp4_hwmod = {
2214 .name = "mcbsp4", 2215 .name = "mcbsp4",
2215 .class = &omap2430_mcbsp_hwmod_class, 2216 .class = &omap2430_mcbsp_hwmod_class,
2216 .mpu_irqs = omap2430_mcbsp4_irqs, 2217 .mpu_irqs = omap2430_mcbsp4_irqs,
2217 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mcbsp4_irqs),
2218 .sdma_reqs = omap2430_mcbsp4_sdma_chs, 2218 .sdma_reqs = omap2430_mcbsp4_sdma_chs,
2219 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp4_sdma_chs), 2219 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp4_sdma_chs),
2220 .main_clk = "mcbsp4_fck", 2220 .main_clk = "mcbsp4_fck",
@@ -2237,6 +2237,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp5_irqs[] = {
2237 { .name = "tx", .irq = 81 }, 2237 { .name = "tx", .irq = 81 },
2238 { .name = "rx", .irq = 82 }, 2238 { .name = "rx", .irq = 82 },
2239 { .name = "common", .irq = 19 }, 2239 { .name = "common", .irq = 19 },
2240 { .irq = -1 }
2240}; 2241};
2241 2242
2242static struct omap_hwmod_dma_info omap2430_mcbsp5_sdma_chs[] = { 2243static struct omap_hwmod_dma_info omap2430_mcbsp5_sdma_chs[] = {
@@ -2272,7 +2273,6 @@ static struct omap_hwmod omap2430_mcbsp5_hwmod = {
2272 .name = "mcbsp5", 2273 .name = "mcbsp5",
2273 .class = &omap2430_mcbsp_hwmod_class, 2274 .class = &omap2430_mcbsp_hwmod_class,
2274 .mpu_irqs = omap2430_mcbsp5_irqs, 2275 .mpu_irqs = omap2430_mcbsp5_irqs,
2275 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mcbsp5_irqs),
2276 .sdma_reqs = omap2430_mcbsp5_sdma_chs, 2276 .sdma_reqs = omap2430_mcbsp5_sdma_chs,
2277 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp5_sdma_chs), 2277 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp5_sdma_chs),
2278 .main_clk = "mcbsp5_fck", 2278 .main_clk = "mcbsp5_fck",
@@ -2312,6 +2312,7 @@ static struct omap_hwmod_class omap2430_mmc_class = {
2312 2312
2313static struct omap_hwmod_irq_info omap2430_mmc1_mpu_irqs[] = { 2313static struct omap_hwmod_irq_info omap2430_mmc1_mpu_irqs[] = {
2314 { .irq = 83 }, 2314 { .irq = 83 },
2315 { .irq = -1 }
2315}; 2316};
2316 2317
2317static struct omap_hwmod_dma_info omap2430_mmc1_sdma_reqs[] = { 2318static struct omap_hwmod_dma_info omap2430_mmc1_sdma_reqs[] = {
@@ -2335,7 +2336,6 @@ static struct omap_hwmod omap2430_mmc1_hwmod = {
2335 .name = "mmc1", 2336 .name = "mmc1",
2336 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 2337 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
2337 .mpu_irqs = omap2430_mmc1_mpu_irqs, 2338 .mpu_irqs = omap2430_mmc1_mpu_irqs,
2338 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mmc1_mpu_irqs),
2339 .sdma_reqs = omap2430_mmc1_sdma_reqs, 2339 .sdma_reqs = omap2430_mmc1_sdma_reqs,
2340 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mmc1_sdma_reqs), 2340 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mmc1_sdma_reqs),
2341 .opt_clks = omap2430_mmc1_opt_clks, 2341 .opt_clks = omap2430_mmc1_opt_clks,
@@ -2361,6 +2361,7 @@ static struct omap_hwmod omap2430_mmc1_hwmod = {
2361 2361
2362static struct omap_hwmod_irq_info omap2430_mmc2_mpu_irqs[] = { 2362static struct omap_hwmod_irq_info omap2430_mmc2_mpu_irqs[] = {
2363 { .irq = 86 }, 2363 { .irq = 86 },
2364 { .irq = -1 }
2364}; 2365};
2365 2366
2366static struct omap_hwmod_dma_info omap2430_mmc2_sdma_reqs[] = { 2367static struct omap_hwmod_dma_info omap2430_mmc2_sdma_reqs[] = {
@@ -2380,7 +2381,6 @@ static struct omap_hwmod omap2430_mmc2_hwmod = {
2380 .name = "mmc2", 2381 .name = "mmc2",
2381 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 2382 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
2382 .mpu_irqs = omap2430_mmc2_mpu_irqs, 2383 .mpu_irqs = omap2430_mmc2_mpu_irqs,
2383 .mpu_irqs_cnt = ARRAY_SIZE(omap2430_mmc2_mpu_irqs),
2384 .sdma_reqs = omap2430_mmc2_sdma_reqs, 2384 .sdma_reqs = omap2430_mmc2_sdma_reqs,
2385 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mmc2_sdma_reqs), 2385 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mmc2_sdma_reqs),
2386 .opt_clks = omap2430_mmc2_opt_clks, 2386 .opt_clks = omap2430_mmc2_opt_clks,