aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-07-09 21:14:07 -0400
committerPaul Walmsley <paul@pwsan.com>2011-07-09 21:14:07 -0400
commit0d619a89998d308c48d06b033eccb7374c456f12 (patch)
treea4145d0529652167a083ed084c4ff8555f5b5178
parent212738a4499d278254ed6fdb400e3b4be4cb1de2 (diff)
omap_hwmod: share identical omap_hwmod_mpu_irqs arrays
To reduce kernel source file data duplication, share struct omap_hwmod_mpu_irqs arrays across OMAP2xxx and 3xxx hwmod data files. Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r--arch/arm/mach-omap2/Makefile11
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2420_data.c167
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2430_data.c166
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c142
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c21
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c162
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_common_data.h29
7 files changed, 275 insertions, 423 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 8a75d176ec6c..f34336560437 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -145,13 +145,18 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o
145obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o 145obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o
146 146
147# hwmod data 147# hwmod data
148obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_interconnect_data.o \ 148obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_ipblock_data.o \
149 omap_hwmod_2xxx_3xxx_ipblock_data.o \
150 omap_hwmod_2xxx_interconnect_data.o \
149 omap_hwmod_2xxx_3xxx_interconnect_data.o \ 151 omap_hwmod_2xxx_3xxx_interconnect_data.o \
150 omap_hwmod_2420_data.o 152 omap_hwmod_2420_data.o
151obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_interconnect_data.o \ 153obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_ipblock_data.o \
154 omap_hwmod_2xxx_3xxx_ipblock_data.o \
155 omap_hwmod_2xxx_interconnect_data.o \
152 omap_hwmod_2xxx_3xxx_interconnect_data.o \ 156 omap_hwmod_2xxx_3xxx_interconnect_data.o \
153 omap_hwmod_2430_data.o 157 omap_hwmod_2430_data.o
154obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_interconnect_data.o \ 158obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_ipblock_data.o \
159 omap_hwmod_2xxx_3xxx_interconnect_data.o \
155 omap_hwmod_3xxx_data.o 160 omap_hwmod_3xxx_data.o
156obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o 161obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o
157 162
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 04730d33ba5c..73157eef2590 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -294,10 +294,6 @@ static struct omap_hwmod_class omap2420_timer_hwmod_class = {
294 294
295/* timer1 */ 295/* timer1 */
296static struct omap_hwmod omap2420_timer1_hwmod; 296static struct omap_hwmod omap2420_timer1_hwmod;
297static struct omap_hwmod_irq_info omap2420_timer1_mpu_irqs[] = {
298 { .irq = 37, },
299 { .irq = -1 }
300};
301 297
302static struct omap_hwmod_addr_space omap2420_timer1_addrs[] = { 298static struct omap_hwmod_addr_space omap2420_timer1_addrs[] = {
303 { 299 {
@@ -325,7 +321,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer1_slaves[] = {
325/* timer1 hwmod */ 321/* timer1 hwmod */
326static struct omap_hwmod omap2420_timer1_hwmod = { 322static struct omap_hwmod omap2420_timer1_hwmod = {
327 .name = "timer1", 323 .name = "timer1",
328 .mpu_irqs = omap2420_timer1_mpu_irqs, 324 .mpu_irqs = omap2_timer1_mpu_irqs,
329 .main_clk = "gpt1_fck", 325 .main_clk = "gpt1_fck",
330 .prcm = { 326 .prcm = {
331 .omap2 = { 327 .omap2 = {
@@ -344,11 +340,6 @@ static struct omap_hwmod omap2420_timer1_hwmod = {
344 340
345/* timer2 */ 341/* timer2 */
346static struct omap_hwmod omap2420_timer2_hwmod; 342static struct omap_hwmod omap2420_timer2_hwmod;
347static struct omap_hwmod_irq_info omap2420_timer2_mpu_irqs[] = {
348 { .irq = 38, },
349 { .irq = -1 }
350};
351
352 343
353/* l4_core -> timer2 */ 344/* l4_core -> timer2 */
354static struct omap_hwmod_ocp_if omap2420_l4_core__timer2 = { 345static struct omap_hwmod_ocp_if omap2420_l4_core__timer2 = {
@@ -367,7 +358,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer2_slaves[] = {
367/* timer2 hwmod */ 358/* timer2 hwmod */
368static struct omap_hwmod omap2420_timer2_hwmod = { 359static struct omap_hwmod omap2420_timer2_hwmod = {
369 .name = "timer2", 360 .name = "timer2",
370 .mpu_irqs = omap2420_timer2_mpu_irqs, 361 .mpu_irqs = omap2_timer2_mpu_irqs,
371 .main_clk = "gpt2_fck", 362 .main_clk = "gpt2_fck",
372 .prcm = { 363 .prcm = {
373 .omap2 = { 364 .omap2 = {
@@ -386,10 +377,6 @@ static struct omap_hwmod omap2420_timer2_hwmod = {
386 377
387/* timer3 */ 378/* timer3 */
388static struct omap_hwmod omap2420_timer3_hwmod; 379static struct omap_hwmod omap2420_timer3_hwmod;
389static struct omap_hwmod_irq_info omap2420_timer3_mpu_irqs[] = {
390 { .irq = 39, },
391 { .irq = -1 }
392};
393 380
394/* l4_core -> timer3 */ 381/* l4_core -> timer3 */
395static struct omap_hwmod_ocp_if omap2420_l4_core__timer3 = { 382static struct omap_hwmod_ocp_if omap2420_l4_core__timer3 = {
@@ -408,7 +395,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer3_slaves[] = {
408/* timer3 hwmod */ 395/* timer3 hwmod */
409static struct omap_hwmod omap2420_timer3_hwmod = { 396static struct omap_hwmod omap2420_timer3_hwmod = {
410 .name = "timer3", 397 .name = "timer3",
411 .mpu_irqs = omap2420_timer3_mpu_irqs, 398 .mpu_irqs = omap2_timer3_mpu_irqs,
412 .main_clk = "gpt3_fck", 399 .main_clk = "gpt3_fck",
413 .prcm = { 400 .prcm = {
414 .omap2 = { 401 .omap2 = {
@@ -427,10 +414,6 @@ static struct omap_hwmod omap2420_timer3_hwmod = {
427 414
428/* timer4 */ 415/* timer4 */
429static struct omap_hwmod omap2420_timer4_hwmod; 416static struct omap_hwmod omap2420_timer4_hwmod;
430static struct omap_hwmod_irq_info omap2420_timer4_mpu_irqs[] = {
431 { .irq = 40, },
432 { .irq = -1 }
433};
434 417
435/* l4_core -> timer4 */ 418/* l4_core -> timer4 */
436static struct omap_hwmod_ocp_if omap2420_l4_core__timer4 = { 419static struct omap_hwmod_ocp_if omap2420_l4_core__timer4 = {
@@ -449,7 +432,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer4_slaves[] = {
449/* timer4 hwmod */ 432/* timer4 hwmod */
450static struct omap_hwmod omap2420_timer4_hwmod = { 433static struct omap_hwmod omap2420_timer4_hwmod = {
451 .name = "timer4", 434 .name = "timer4",
452 .mpu_irqs = omap2420_timer4_mpu_irqs, 435 .mpu_irqs = omap2_timer4_mpu_irqs,
453 .main_clk = "gpt4_fck", 436 .main_clk = "gpt4_fck",
454 .prcm = { 437 .prcm = {
455 .omap2 = { 438 .omap2 = {
@@ -468,10 +451,6 @@ static struct omap_hwmod omap2420_timer4_hwmod = {
468 451
469/* timer5 */ 452/* timer5 */
470static struct omap_hwmod omap2420_timer5_hwmod; 453static struct omap_hwmod omap2420_timer5_hwmod;
471static struct omap_hwmod_irq_info omap2420_timer5_mpu_irqs[] = {
472 { .irq = 41, },
473 { .irq = -1 }
474};
475 454
476/* l4_core -> timer5 */ 455/* l4_core -> timer5 */
477static struct omap_hwmod_ocp_if omap2420_l4_core__timer5 = { 456static struct omap_hwmod_ocp_if omap2420_l4_core__timer5 = {
@@ -490,7 +469,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer5_slaves[] = {
490/* timer5 hwmod */ 469/* timer5 hwmod */
491static struct omap_hwmod omap2420_timer5_hwmod = { 470static struct omap_hwmod omap2420_timer5_hwmod = {
492 .name = "timer5", 471 .name = "timer5",
493 .mpu_irqs = omap2420_timer5_mpu_irqs, 472 .mpu_irqs = omap2_timer5_mpu_irqs,
494 .main_clk = "gpt5_fck", 473 .main_clk = "gpt5_fck",
495 .prcm = { 474 .prcm = {
496 .omap2 = { 475 .omap2 = {
@@ -510,10 +489,6 @@ static struct omap_hwmod omap2420_timer5_hwmod = {
510 489
511/* timer6 */ 490/* timer6 */
512static struct omap_hwmod omap2420_timer6_hwmod; 491static struct omap_hwmod omap2420_timer6_hwmod;
513static struct omap_hwmod_irq_info omap2420_timer6_mpu_irqs[] = {
514 { .irq = 42, },
515 { .irq = -1 }
516};
517 492
518/* l4_core -> timer6 */ 493/* l4_core -> timer6 */
519static struct omap_hwmod_ocp_if omap2420_l4_core__timer6 = { 494static struct omap_hwmod_ocp_if omap2420_l4_core__timer6 = {
@@ -532,7 +507,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer6_slaves[] = {
532/* timer6 hwmod */ 507/* timer6 hwmod */
533static struct omap_hwmod omap2420_timer6_hwmod = { 508static struct omap_hwmod omap2420_timer6_hwmod = {
534 .name = "timer6", 509 .name = "timer6",
535 .mpu_irqs = omap2420_timer6_mpu_irqs, 510 .mpu_irqs = omap2_timer6_mpu_irqs,
536 .main_clk = "gpt6_fck", 511 .main_clk = "gpt6_fck",
537 .prcm = { 512 .prcm = {
538 .omap2 = { 513 .omap2 = {
@@ -551,10 +526,6 @@ static struct omap_hwmod omap2420_timer6_hwmod = {
551 526
552/* timer7 */ 527/* timer7 */
553static struct omap_hwmod omap2420_timer7_hwmod; 528static struct omap_hwmod omap2420_timer7_hwmod;
554static struct omap_hwmod_irq_info omap2420_timer7_mpu_irqs[] = {
555 { .irq = 43, },
556 { .irq = -1 }
557};
558 529
559/* l4_core -> timer7 */ 530/* l4_core -> timer7 */
560static struct omap_hwmod_ocp_if omap2420_l4_core__timer7 = { 531static struct omap_hwmod_ocp_if omap2420_l4_core__timer7 = {
@@ -573,7 +544,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer7_slaves[] = {
573/* timer7 hwmod */ 544/* timer7 hwmod */
574static struct omap_hwmod omap2420_timer7_hwmod = { 545static struct omap_hwmod omap2420_timer7_hwmod = {
575 .name = "timer7", 546 .name = "timer7",
576 .mpu_irqs = omap2420_timer7_mpu_irqs, 547 .mpu_irqs = omap2_timer7_mpu_irqs,
577 .main_clk = "gpt7_fck", 548 .main_clk = "gpt7_fck",
578 .prcm = { 549 .prcm = {
579 .omap2 = { 550 .omap2 = {
@@ -592,10 +563,6 @@ static struct omap_hwmod omap2420_timer7_hwmod = {
592 563
593/* timer8 */ 564/* timer8 */
594static struct omap_hwmod omap2420_timer8_hwmod; 565static struct omap_hwmod omap2420_timer8_hwmod;
595static struct omap_hwmod_irq_info omap2420_timer8_mpu_irqs[] = {
596 { .irq = 44, },
597 { .irq = -1 }
598};
599 566
600/* l4_core -> timer8 */ 567/* l4_core -> timer8 */
601static struct omap_hwmod_ocp_if omap2420_l4_core__timer8 = { 568static struct omap_hwmod_ocp_if omap2420_l4_core__timer8 = {
@@ -614,7 +581,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer8_slaves[] = {
614/* timer8 hwmod */ 581/* timer8 hwmod */
615static struct omap_hwmod omap2420_timer8_hwmod = { 582static struct omap_hwmod omap2420_timer8_hwmod = {
616 .name = "timer8", 583 .name = "timer8",
617 .mpu_irqs = omap2420_timer8_mpu_irqs, 584 .mpu_irqs = omap2_timer8_mpu_irqs,
618 .main_clk = "gpt8_fck", 585 .main_clk = "gpt8_fck",
619 .prcm = { 586 .prcm = {
620 .omap2 = { 587 .omap2 = {
@@ -633,10 +600,6 @@ static struct omap_hwmod omap2420_timer8_hwmod = {
633 600
634/* timer9 */ 601/* timer9 */
635static struct omap_hwmod omap2420_timer9_hwmod; 602static struct omap_hwmod omap2420_timer9_hwmod;
636static struct omap_hwmod_irq_info omap2420_timer9_mpu_irqs[] = {
637 { .irq = 45, },
638 { .irq = -1 }
639};
640 603
641/* l4_core -> timer9 */ 604/* l4_core -> timer9 */
642static struct omap_hwmod_ocp_if omap2420_l4_core__timer9 = { 605static struct omap_hwmod_ocp_if omap2420_l4_core__timer9 = {
@@ -655,7 +618,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer9_slaves[] = {
655/* timer9 hwmod */ 618/* timer9 hwmod */
656static struct omap_hwmod omap2420_timer9_hwmod = { 619static struct omap_hwmod omap2420_timer9_hwmod = {
657 .name = "timer9", 620 .name = "timer9",
658 .mpu_irqs = omap2420_timer9_mpu_irqs, 621 .mpu_irqs = omap2_timer9_mpu_irqs,
659 .main_clk = "gpt9_fck", 622 .main_clk = "gpt9_fck",
660 .prcm = { 623 .prcm = {
661 .omap2 = { 624 .omap2 = {
@@ -674,10 +637,6 @@ static struct omap_hwmod omap2420_timer9_hwmod = {
674 637
675/* timer10 */ 638/* timer10 */
676static struct omap_hwmod omap2420_timer10_hwmod; 639static struct omap_hwmod omap2420_timer10_hwmod;
677static struct omap_hwmod_irq_info omap2420_timer10_mpu_irqs[] = {
678 { .irq = 46, },
679 { .irq = -1 }
680};
681 640
682/* l4_core -> timer10 */ 641/* l4_core -> timer10 */
683static struct omap_hwmod_ocp_if omap2420_l4_core__timer10 = { 642static struct omap_hwmod_ocp_if omap2420_l4_core__timer10 = {
@@ -696,7 +655,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer10_slaves[] = {
696/* timer10 hwmod */ 655/* timer10 hwmod */
697static struct omap_hwmod omap2420_timer10_hwmod = { 656static struct omap_hwmod omap2420_timer10_hwmod = {
698 .name = "timer10", 657 .name = "timer10",
699 .mpu_irqs = omap2420_timer10_mpu_irqs, 658 .mpu_irqs = omap2_timer10_mpu_irqs,
700 .main_clk = "gpt10_fck", 659 .main_clk = "gpt10_fck",
701 .prcm = { 660 .prcm = {
702 .omap2 = { 661 .omap2 = {
@@ -715,10 +674,6 @@ static struct omap_hwmod omap2420_timer10_hwmod = {
715 674
716/* timer11 */ 675/* timer11 */
717static struct omap_hwmod omap2420_timer11_hwmod; 676static struct omap_hwmod omap2420_timer11_hwmod;
718static struct omap_hwmod_irq_info omap2420_timer11_mpu_irqs[] = {
719 { .irq = 47, },
720 { .irq = -1 }
721};
722 677
723/* l4_core -> timer11 */ 678/* l4_core -> timer11 */
724static struct omap_hwmod_ocp_if omap2420_l4_core__timer11 = { 679static struct omap_hwmod_ocp_if omap2420_l4_core__timer11 = {
@@ -737,7 +692,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer11_slaves[] = {
737/* timer11 hwmod */ 692/* timer11 hwmod */
738static struct omap_hwmod omap2420_timer11_hwmod = { 693static struct omap_hwmod omap2420_timer11_hwmod = {
739 .name = "timer11", 694 .name = "timer11",
740 .mpu_irqs = omap2420_timer11_mpu_irqs, 695 .mpu_irqs = omap2_timer11_mpu_irqs,
741 .main_clk = "gpt11_fck", 696 .main_clk = "gpt11_fck",
742 .prcm = { 697 .prcm = {
743 .omap2 = { 698 .omap2 = {
@@ -756,10 +711,6 @@ static struct omap_hwmod omap2420_timer11_hwmod = {
756 711
757/* timer12 */ 712/* timer12 */
758static struct omap_hwmod omap2420_timer12_hwmod; 713static struct omap_hwmod omap2420_timer12_hwmod;
759static struct omap_hwmod_irq_info omap2420_timer12_mpu_irqs[] = {
760 { .irq = 48, },
761 { .irq = -1 }
762};
763 714
764/* l4_core -> timer12 */ 715/* l4_core -> timer12 */
765static struct omap_hwmod_ocp_if omap2420_l4_core__timer12 = { 716static struct omap_hwmod_ocp_if omap2420_l4_core__timer12 = {
@@ -778,7 +729,7 @@ static struct omap_hwmod_ocp_if *omap2420_timer12_slaves[] = {
778/* timer12 hwmod */ 729/* timer12 hwmod */
779static struct omap_hwmod omap2420_timer12_hwmod = { 730static struct omap_hwmod omap2420_timer12_hwmod = {
780 .name = "timer12", 731 .name = "timer12",
781 .mpu_irqs = omap2420_timer12_mpu_irqs, 732 .mpu_irqs = omap2xxx_timer12_mpu_irqs,
782 .main_clk = "gpt12_fck", 733 .main_clk = "gpt12_fck",
783 .prcm = { 734 .prcm = {
784 .omap2 = { 735 .omap2 = {
@@ -877,11 +828,6 @@ static struct omap_hwmod_class uart_class = {
877 828
878/* UART1 */ 829/* UART1 */
879 830
880static struct omap_hwmod_irq_info uart1_mpu_irqs[] = {
881 { .irq = INT_24XX_UART1_IRQ, },
882 { .irq = -1 }
883};
884
885static struct omap_hwmod_dma_info uart1_sdma_reqs[] = { 831static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
886 { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, }, 832 { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, },
887 { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, }, 833 { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, },
@@ -893,7 +839,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {
893 839
894static struct omap_hwmod omap2420_uart1_hwmod = { 840static struct omap_hwmod omap2420_uart1_hwmod = {
895 .name = "uart1", 841 .name = "uart1",
896 .mpu_irqs = uart1_mpu_irqs, 842 .mpu_irqs = omap2_uart1_mpu_irqs,
897 .sdma_reqs = uart1_sdma_reqs, 843 .sdma_reqs = uart1_sdma_reqs,
898 .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs), 844 .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs),
899 .main_clk = "uart1_fck", 845 .main_clk = "uart1_fck",
@@ -914,11 +860,6 @@ static struct omap_hwmod omap2420_uart1_hwmod = {
914 860
915/* UART2 */ 861/* UART2 */
916 862
917static struct omap_hwmod_irq_info uart2_mpu_irqs[] = {
918 { .irq = INT_24XX_UART2_IRQ, },
919 { .irq = -1 }
920};
921
922static struct omap_hwmod_dma_info uart2_sdma_reqs[] = { 863static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
923 { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, }, 864 { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, },
924 { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, }, 865 { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, },
@@ -930,7 +871,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = {
930 871
931static struct omap_hwmod omap2420_uart2_hwmod = { 872static struct omap_hwmod omap2420_uart2_hwmod = {
932 .name = "uart2", 873 .name = "uart2",
933 .mpu_irqs = uart2_mpu_irqs, 874 .mpu_irqs = omap2_uart2_mpu_irqs,
934 .sdma_reqs = uart2_sdma_reqs, 875 .sdma_reqs = uart2_sdma_reqs,
935 .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs), 876 .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs),
936 .main_clk = "uart2_fck", 877 .main_clk = "uart2_fck",
@@ -951,11 +892,6 @@ static struct omap_hwmod omap2420_uart2_hwmod = {
951 892
952/* UART3 */ 893/* UART3 */
953 894
954static struct omap_hwmod_irq_info uart3_mpu_irqs[] = {
955 { .irq = INT_24XX_UART3_IRQ, },
956 { .irq = -1 }
957};
958
959static struct omap_hwmod_dma_info uart3_sdma_reqs[] = { 895static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
960 { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, }, 896 { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, },
961 { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, }, 897 { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, },
@@ -967,7 +903,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = {
967 903
968static struct omap_hwmod omap2420_uart3_hwmod = { 904static struct omap_hwmod omap2420_uart3_hwmod = {
969 .name = "uart3", 905 .name = "uart3",
970 .mpu_irqs = uart3_mpu_irqs, 906 .mpu_irqs = omap2_uart3_mpu_irqs,
971 .sdma_reqs = uart3_sdma_reqs, 907 .sdma_reqs = uart3_sdma_reqs,
972 .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs), 908 .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs),
973 .main_clk = "uart3_fck", 909 .main_clk = "uart3_fck",
@@ -1085,11 +1021,6 @@ static struct omap_hwmod_class omap2420_dispc_hwmod_class = {
1085 .sysc = &omap2420_dispc_sysc, 1021 .sysc = &omap2420_dispc_sysc,
1086}; 1022};
1087 1023
1088static struct omap_hwmod_irq_info omap2420_dispc_irqs[] = {
1089 { .irq = 25 },
1090 { .irq = -1 }
1091};
1092
1093/* l4_core -> dss_dispc */ 1024/* l4_core -> dss_dispc */
1094static struct omap_hwmod_ocp_if omap2420_l4_core__dss_dispc = { 1025static struct omap_hwmod_ocp_if omap2420_l4_core__dss_dispc = {
1095 .master = &omap2420_l4_core_hwmod, 1026 .master = &omap2420_l4_core_hwmod,
@@ -1113,7 +1044,7 @@ static struct omap_hwmod_ocp_if *omap2420_dss_dispc_slaves[] = {
1113static struct omap_hwmod omap2420_dss_dispc_hwmod = { 1044static struct omap_hwmod omap2420_dss_dispc_hwmod = {
1114 .name = "dss_dispc", 1045 .name = "dss_dispc",
1115 .class = &omap2420_dispc_hwmod_class, 1046 .class = &omap2420_dispc_hwmod_class,
1116 .mpu_irqs = omap2420_dispc_irqs, 1047 .mpu_irqs = omap2_dispc_irqs,
1117 .main_clk = "dss1_fck", 1048 .main_clk = "dss1_fck",
1118 .prcm = { 1049 .prcm = {
1119 .omap2 = { 1050 .omap2 = {
@@ -1252,11 +1183,6 @@ static struct omap_i2c_dev_attr i2c_dev_attr;
1252 1183
1253/* I2C1 */ 1184/* I2C1 */
1254 1185
1255static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = {
1256 { .irq = INT_24XX_I2C1_IRQ, },
1257 { .irq = -1 }
1258};
1259
1260static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = { 1186static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = {
1261 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX }, 1187 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX },
1262 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX }, 1188 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX },
@@ -1268,7 +1194,7 @@ static struct omap_hwmod_ocp_if *omap2420_i2c1_slaves[] = {
1268 1194
1269static struct omap_hwmod omap2420_i2c1_hwmod = { 1195static struct omap_hwmod omap2420_i2c1_hwmod = {
1270 .name = "i2c1", 1196 .name = "i2c1",
1271 .mpu_irqs = i2c1_mpu_irqs, 1197 .mpu_irqs = omap2_i2c1_mpu_irqs,
1272 .sdma_reqs = i2c1_sdma_reqs, 1198 .sdma_reqs = i2c1_sdma_reqs,
1273 .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs), 1199 .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs),
1274 .main_clk = "i2c1_fck", 1200 .main_clk = "i2c1_fck",
@@ -1291,11 +1217,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {
1291 1217
1292/* I2C2 */ 1218/* I2C2 */
1293 1219
1294static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = {
1295 { .irq = INT_24XX_I2C2_IRQ, },
1296 { .irq = -1 }
1297};
1298
1299static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = { 1220static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = {
1300 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX }, 1221 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX },
1301 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX }, 1222 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX },
@@ -1307,7 +1228,7 @@ static struct omap_hwmod_ocp_if *omap2420_i2c2_slaves[] = {
1307 1228
1308static struct omap_hwmod omap2420_i2c2_hwmod = { 1229static struct omap_hwmod omap2420_i2c2_hwmod = {
1309 .name = "i2c2", 1230 .name = "i2c2",
1310 .mpu_irqs = i2c2_mpu_irqs, 1231 .mpu_irqs = omap2_i2c2_mpu_irqs,
1311 .sdma_reqs = i2c2_sdma_reqs, 1232 .sdma_reqs = i2c2_sdma_reqs,
1312 .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs), 1233 .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs),
1313 .main_clk = "i2c2_fck", 1234 .main_clk = "i2c2_fck",
@@ -1428,11 +1349,6 @@ static struct omap_hwmod_class omap242x_gpio_hwmod_class = {
1428}; 1349};
1429 1350
1430/* gpio1 */ 1351/* gpio1 */
1431static struct omap_hwmod_irq_info omap242x_gpio1_irqs[] = {
1432 { .irq = 29 }, /* INT_24XX_GPIO_BANK1 */
1433 { .irq = -1 }
1434};
1435
1436static struct omap_hwmod_ocp_if *omap2420_gpio1_slaves[] = { 1352static struct omap_hwmod_ocp_if *omap2420_gpio1_slaves[] = {
1437 &omap2420_l4_wkup__gpio1, 1353 &omap2420_l4_wkup__gpio1,
1438}; 1354};
@@ -1440,7 +1356,7 @@ static struct omap_hwmod_ocp_if *omap2420_gpio1_slaves[] = {
1440static struct omap_hwmod omap2420_gpio1_hwmod = { 1356static struct omap_hwmod omap2420_gpio1_hwmod = {
1441 .name = "gpio1", 1357 .name = "gpio1",
1442 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1358 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1443 .mpu_irqs = omap242x_gpio1_irqs, 1359 .mpu_irqs = omap2_gpio1_irqs,
1444 .main_clk = "gpios_fck", 1360 .main_clk = "gpios_fck",
1445 .prcm = { 1361 .prcm = {
1446 .omap2 = { 1362 .omap2 = {
@@ -1459,11 +1375,6 @@ static struct omap_hwmod omap2420_gpio1_hwmod = {
1459}; 1375};
1460 1376
1461/* gpio2 */ 1377/* gpio2 */
1462static struct omap_hwmod_irq_info omap242x_gpio2_irqs[] = {
1463 { .irq = 30 }, /* INT_24XX_GPIO_BANK2 */
1464 { .irq = -1 }
1465};
1466
1467static struct omap_hwmod_ocp_if *omap2420_gpio2_slaves[] = { 1378static struct omap_hwmod_ocp_if *omap2420_gpio2_slaves[] = {
1468 &omap2420_l4_wkup__gpio2, 1379 &omap2420_l4_wkup__gpio2,
1469}; 1380};
@@ -1471,7 +1382,7 @@ static struct omap_hwmod_ocp_if *omap2420_gpio2_slaves[] = {
1471static struct omap_hwmod omap2420_gpio2_hwmod = { 1382static struct omap_hwmod omap2420_gpio2_hwmod = {
1472 .name = "gpio2", 1383 .name = "gpio2",
1473 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1384 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1474 .mpu_irqs = omap242x_gpio2_irqs, 1385 .mpu_irqs = omap2_gpio2_irqs,
1475 .main_clk = "gpios_fck", 1386 .main_clk = "gpios_fck",
1476 .prcm = { 1387 .prcm = {
1477 .omap2 = { 1388 .omap2 = {
@@ -1490,11 +1401,6 @@ static struct omap_hwmod omap2420_gpio2_hwmod = {
1490}; 1401};
1491 1402
1492/* gpio3 */ 1403/* gpio3 */
1493static struct omap_hwmod_irq_info omap242x_gpio3_irqs[] = {
1494 { .irq = 31 }, /* INT_24XX_GPIO_BANK3 */
1495 { .irq = -1 }
1496};
1497
1498static struct omap_hwmod_ocp_if *omap2420_gpio3_slaves[] = { 1404static struct omap_hwmod_ocp_if *omap2420_gpio3_slaves[] = {
1499 &omap2420_l4_wkup__gpio3, 1405 &omap2420_l4_wkup__gpio3,
1500}; 1406};
@@ -1502,7 +1408,7 @@ static struct omap_hwmod_ocp_if *omap2420_gpio3_slaves[] = {
1502static struct omap_hwmod omap2420_gpio3_hwmod = { 1408static struct omap_hwmod omap2420_gpio3_hwmod = {
1503 .name = "gpio3", 1409 .name = "gpio3",
1504 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1410 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1505 .mpu_irqs = omap242x_gpio3_irqs, 1411 .mpu_irqs = omap2_gpio3_irqs,
1506 .main_clk = "gpios_fck", 1412 .main_clk = "gpios_fck",
1507 .prcm = { 1413 .prcm = {
1508 .omap2 = { 1414 .omap2 = {
@@ -1521,11 +1427,6 @@ static struct omap_hwmod omap2420_gpio3_hwmod = {
1521}; 1427};
1522 1428
1523/* gpio4 */ 1429/* gpio4 */
1524static struct omap_hwmod_irq_info omap242x_gpio4_irqs[] = {
1525 { .irq = 32 }, /* INT_24XX_GPIO_BANK4 */
1526 { .irq = -1 }
1527};
1528
1529static struct omap_hwmod_ocp_if *omap2420_gpio4_slaves[] = { 1430static struct omap_hwmod_ocp_if *omap2420_gpio4_slaves[] = {
1530 &omap2420_l4_wkup__gpio4, 1431 &omap2420_l4_wkup__gpio4,
1531}; 1432};
@@ -1533,7 +1434,7 @@ static struct omap_hwmod_ocp_if *omap2420_gpio4_slaves[] = {
1533static struct omap_hwmod omap2420_gpio4_hwmod = { 1434static struct omap_hwmod omap2420_gpio4_hwmod = {
1534 .name = "gpio4", 1435 .name = "gpio4",
1535 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1436 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1536 .mpu_irqs = omap242x_gpio4_irqs, 1437 .mpu_irqs = omap2_gpio4_irqs,
1537 .main_clk = "gpios_fck", 1438 .main_clk = "gpios_fck",
1538 .prcm = { 1439 .prcm = {
1539 .omap2 = { 1440 .omap2 = {
@@ -1575,14 +1476,6 @@ static struct omap_dma_dev_attr dma_dev_attr = {
1575 .lch_count = 32, 1476 .lch_count = 32,
1576}; 1477};
1577 1478
1578static struct omap_hwmod_irq_info omap2420_dma_system_irqs[] = {
1579 { .name = "0", .irq = 12 }, /* INT_24XX_SDMA_IRQ0 */
1580 { .name = "1", .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */
1581 { .name = "2", .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */
1582 { .name = "3", .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */
1583 { .irq = -1 }
1584};
1585
1586/* dma_system -> L3 */ 1479/* dma_system -> L3 */
1587static struct omap_hwmod_ocp_if omap2420_dma_system__l3 = { 1480static struct omap_hwmod_ocp_if omap2420_dma_system__l3 = {
1588 .master = &omap2420_dma_system_hwmod, 1481 .master = &omap2420_dma_system_hwmod,
@@ -1613,7 +1506,7 @@ static struct omap_hwmod_ocp_if *omap2420_dma_system_slaves[] = {
1613static struct omap_hwmod omap2420_dma_system_hwmod = { 1506static struct omap_hwmod omap2420_dma_system_hwmod = {
1614 .name = "dma", 1507 .name = "dma",
1615 .class = &omap2420_dma_hwmod_class, 1508 .class = &omap2420_dma_hwmod_class,
1616 .mpu_irqs = omap2420_dma_system_irqs, 1509 .mpu_irqs = omap2_dma_system_irqs,
1617 .main_clk = "core_l3_ck", 1510 .main_clk = "core_l3_ck",
1618 .slaves = omap2420_dma_system_slaves, 1511 .slaves = omap2420_dma_system_slaves,
1619 .slaves_cnt = ARRAY_SIZE(omap2420_dma_system_slaves), 1512 .slaves_cnt = ARRAY_SIZE(omap2420_dma_system_slaves),
@@ -1709,11 +1602,6 @@ static struct omap_hwmod_class omap2420_mcspi_class = {
1709}; 1602};
1710 1603
1711/* mcspi1 */ 1604/* mcspi1 */
1712static struct omap_hwmod_irq_info omap2420_mcspi1_mpu_irqs[] = {
1713 { .irq = 65 },
1714 { .irq = -1 }
1715};
1716
1717static struct omap_hwmod_dma_info omap2420_mcspi1_sdma_reqs[] = { 1605static struct omap_hwmod_dma_info omap2420_mcspi1_sdma_reqs[] = {
1718 { .name = "tx0", .dma_req = 35 }, /* DMA_SPI1_TX0 */ 1606 { .name = "tx0", .dma_req = 35 }, /* DMA_SPI1_TX0 */
1719 { .name = "rx0", .dma_req = 36 }, /* DMA_SPI1_RX0 */ 1607 { .name = "rx0", .dma_req = 36 }, /* DMA_SPI1_RX0 */
@@ -1735,7 +1623,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
1735 1623
1736static struct omap_hwmod omap2420_mcspi1_hwmod = { 1624static struct omap_hwmod omap2420_mcspi1_hwmod = {
1737 .name = "mcspi1_hwmod", 1625 .name = "mcspi1_hwmod",
1738 .mpu_irqs = omap2420_mcspi1_mpu_irqs, 1626 .mpu_irqs = omap2_mcspi1_mpu_irqs,
1739 .sdma_reqs = omap2420_mcspi1_sdma_reqs, 1627 .sdma_reqs = omap2420_mcspi1_sdma_reqs,
1740 .sdma_reqs_cnt = ARRAY_SIZE(omap2420_mcspi1_sdma_reqs), 1628 .sdma_reqs_cnt = ARRAY_SIZE(omap2420_mcspi1_sdma_reqs),
1741 .main_clk = "mcspi1_fck", 1629 .main_clk = "mcspi1_fck",
@@ -1756,11 +1644,6 @@ static struct omap_hwmod omap2420_mcspi1_hwmod = {
1756}; 1644};
1757 1645
1758/* mcspi2 */ 1646/* mcspi2 */
1759static struct omap_hwmod_irq_info omap2420_mcspi2_mpu_irqs[] = {
1760 { .irq = 66 },
1761 { .irq = -1 }
1762};
1763
1764static struct omap_hwmod_dma_info omap2420_mcspi2_sdma_reqs[] = { 1647static struct omap_hwmod_dma_info omap2420_mcspi2_sdma_reqs[] = {
1765 { .name = "tx0", .dma_req = 43 }, /* DMA_SPI2_TX0 */ 1648 { .name = "tx0", .dma_req = 43 }, /* DMA_SPI2_TX0 */
1766 { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */ 1649 { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */
@@ -1778,7 +1661,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
1778 1661
1779static struct omap_hwmod omap2420_mcspi2_hwmod = { 1662static struct omap_hwmod omap2420_mcspi2_hwmod = {
1780 .name = "mcspi2_hwmod", 1663 .name = "mcspi2_hwmod",
1781 .mpu_irqs = omap2420_mcspi2_mpu_irqs, 1664 .mpu_irqs = omap2_mcspi2_mpu_irqs,
1782 .sdma_reqs = omap2420_mcspi2_sdma_reqs, 1665 .sdma_reqs = omap2420_mcspi2_sdma_reqs,
1783 .sdma_reqs_cnt = ARRAY_SIZE(omap2420_mcspi2_sdma_reqs), 1666 .sdma_reqs_cnt = ARRAY_SIZE(omap2420_mcspi2_sdma_reqs),
1784 .main_clk = "mcspi2_fck", 1667 .main_clk = "mcspi2_fck",
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 2c28468a37f8..62ecc685f1a2 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -367,10 +367,6 @@ static struct omap_hwmod_class omap2430_timer_hwmod_class = {
367 367
368/* timer1 */ 368/* timer1 */
369static struct omap_hwmod omap2430_timer1_hwmod; 369static struct omap_hwmod omap2430_timer1_hwmod;
370static struct omap_hwmod_irq_info omap2430_timer1_mpu_irqs[] = {
371 { .irq = 37, },
372 { .irq = -1 }
373};
374 370
375static struct omap_hwmod_addr_space omap2430_timer1_addrs[] = { 371static struct omap_hwmod_addr_space omap2430_timer1_addrs[] = {
376 { 372 {
@@ -398,7 +394,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer1_slaves[] = {
398/* timer1 hwmod */ 394/* timer1 hwmod */
399static struct omap_hwmod omap2430_timer1_hwmod = { 395static struct omap_hwmod omap2430_timer1_hwmod = {
400 .name = "timer1", 396 .name = "timer1",
401 .mpu_irqs = omap2430_timer1_mpu_irqs, 397 .mpu_irqs = omap2_timer1_mpu_irqs,
402 .main_clk = "gpt1_fck", 398 .main_clk = "gpt1_fck",
403 .prcm = { 399 .prcm = {
404 .omap2 = { 400 .omap2 = {
@@ -417,10 +413,6 @@ static struct omap_hwmod omap2430_timer1_hwmod = {
417 413
418/* timer2 */ 414/* timer2 */
419static struct omap_hwmod omap2430_timer2_hwmod; 415static struct omap_hwmod omap2430_timer2_hwmod;
420static struct omap_hwmod_irq_info omap2430_timer2_mpu_irqs[] = {
421 { .irq = 38, },
422 { .irq = -1 }
423};
424 416
425/* l4_core -> timer2 */ 417/* l4_core -> timer2 */
426static struct omap_hwmod_ocp_if omap2430_l4_core__timer2 = { 418static struct omap_hwmod_ocp_if omap2430_l4_core__timer2 = {
@@ -439,7 +431,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer2_slaves[] = {
439/* timer2 hwmod */ 431/* timer2 hwmod */
440static struct omap_hwmod omap2430_timer2_hwmod = { 432static struct omap_hwmod omap2430_timer2_hwmod = {
441 .name = "timer2", 433 .name = "timer2",
442 .mpu_irqs = omap2430_timer2_mpu_irqs, 434 .mpu_irqs = omap2_timer2_mpu_irqs,
443 .main_clk = "gpt2_fck", 435 .main_clk = "gpt2_fck",
444 .prcm = { 436 .prcm = {
445 .omap2 = { 437 .omap2 = {
@@ -458,10 +450,6 @@ static struct omap_hwmod omap2430_timer2_hwmod = {
458 450
459/* timer3 */ 451/* timer3 */
460static struct omap_hwmod omap2430_timer3_hwmod; 452static struct omap_hwmod omap2430_timer3_hwmod;
461static struct omap_hwmod_irq_info omap2430_timer3_mpu_irqs[] = {
462 { .irq = 39, },
463 { .irq = -1 }
464};
465 453
466/* l4_core -> timer3 */ 454/* l4_core -> timer3 */
467static struct omap_hwmod_ocp_if omap2430_l4_core__timer3 = { 455static struct omap_hwmod_ocp_if omap2430_l4_core__timer3 = {
@@ -480,7 +468,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer3_slaves[] = {
480/* timer3 hwmod */ 468/* timer3 hwmod */
481static struct omap_hwmod omap2430_timer3_hwmod = { 469static struct omap_hwmod omap2430_timer3_hwmod = {
482 .name = "timer3", 470 .name = "timer3",
483 .mpu_irqs = omap2430_timer3_mpu_irqs, 471 .mpu_irqs = omap2_timer3_mpu_irqs,
484 .main_clk = "gpt3_fck", 472 .main_clk = "gpt3_fck",
485 .prcm = { 473 .prcm = {
486 .omap2 = { 474 .omap2 = {
@@ -499,10 +487,6 @@ static struct omap_hwmod omap2430_timer3_hwmod = {
499 487
500/* timer4 */ 488/* timer4 */
501static struct omap_hwmod omap2430_timer4_hwmod; 489static struct omap_hwmod omap2430_timer4_hwmod;
502static struct omap_hwmod_irq_info omap2430_timer4_mpu_irqs[] = {
503 { .irq = 40, },
504 { .irq = -1 }
505};
506 490
507/* l4_core -> timer4 */ 491/* l4_core -> timer4 */
508static struct omap_hwmod_ocp_if omap2430_l4_core__timer4 = { 492static struct omap_hwmod_ocp_if omap2430_l4_core__timer4 = {
@@ -521,7 +505,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer4_slaves[] = {
521/* timer4 hwmod */ 505/* timer4 hwmod */
522static struct omap_hwmod omap2430_timer4_hwmod = { 506static struct omap_hwmod omap2430_timer4_hwmod = {
523 .name = "timer4", 507 .name = "timer4",
524 .mpu_irqs = omap2430_timer4_mpu_irqs, 508 .mpu_irqs = omap2_timer4_mpu_irqs,
525 .main_clk = "gpt4_fck", 509 .main_clk = "gpt4_fck",
526 .prcm = { 510 .prcm = {
527 .omap2 = { 511 .omap2 = {
@@ -540,10 +524,6 @@ static struct omap_hwmod omap2430_timer4_hwmod = {
540 524
541/* timer5 */ 525/* timer5 */
542static struct omap_hwmod omap2430_timer5_hwmod; 526static struct omap_hwmod omap2430_timer5_hwmod;
543static struct omap_hwmod_irq_info omap2430_timer5_mpu_irqs[] = {
544 { .irq = 41, },
545 { .irq = -1 }
546};
547 527
548/* l4_core -> timer5 */ 528/* l4_core -> timer5 */
549static struct omap_hwmod_ocp_if omap2430_l4_core__timer5 = { 529static struct omap_hwmod_ocp_if omap2430_l4_core__timer5 = {
@@ -562,7 +542,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer5_slaves[] = {
562/* timer5 hwmod */ 542/* timer5 hwmod */
563static struct omap_hwmod omap2430_timer5_hwmod = { 543static struct omap_hwmod omap2430_timer5_hwmod = {
564 .name = "timer5", 544 .name = "timer5",
565 .mpu_irqs = omap2430_timer5_mpu_irqs, 545 .mpu_irqs = omap2_timer5_mpu_irqs,
566 .main_clk = "gpt5_fck", 546 .main_clk = "gpt5_fck",
567 .prcm = { 547 .prcm = {
568 .omap2 = { 548 .omap2 = {
@@ -581,10 +561,6 @@ static struct omap_hwmod omap2430_timer5_hwmod = {
581 561
582/* timer6 */ 562/* timer6 */
583static struct omap_hwmod omap2430_timer6_hwmod; 563static struct omap_hwmod omap2430_timer6_hwmod;
584static struct omap_hwmod_irq_info omap2430_timer6_mpu_irqs[] = {
585 { .irq = 42, },
586 { .irq = -1 }
587};
588 564
589/* l4_core -> timer6 */ 565/* l4_core -> timer6 */
590static struct omap_hwmod_ocp_if omap2430_l4_core__timer6 = { 566static struct omap_hwmod_ocp_if omap2430_l4_core__timer6 = {
@@ -603,7 +579,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer6_slaves[] = {
603/* timer6 hwmod */ 579/* timer6 hwmod */
604static struct omap_hwmod omap2430_timer6_hwmod = { 580static struct omap_hwmod omap2430_timer6_hwmod = {
605 .name = "timer6", 581 .name = "timer6",
606 .mpu_irqs = omap2430_timer6_mpu_irqs, 582 .mpu_irqs = omap2_timer6_mpu_irqs,
607 .main_clk = "gpt6_fck", 583 .main_clk = "gpt6_fck",
608 .prcm = { 584 .prcm = {
609 .omap2 = { 585 .omap2 = {
@@ -622,10 +598,6 @@ static struct omap_hwmod omap2430_timer6_hwmod = {
622 598
623/* timer7 */ 599/* timer7 */
624static struct omap_hwmod omap2430_timer7_hwmod; 600static struct omap_hwmod omap2430_timer7_hwmod;
625static struct omap_hwmod_irq_info omap2430_timer7_mpu_irqs[] = {
626 { .irq = 43, },
627 { .irq = -1 }
628};
629 601
630/* l4_core -> timer7 */ 602/* l4_core -> timer7 */
631static struct omap_hwmod_ocp_if omap2430_l4_core__timer7 = { 603static struct omap_hwmod_ocp_if omap2430_l4_core__timer7 = {
@@ -644,7 +616,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer7_slaves[] = {
644/* timer7 hwmod */ 616/* timer7 hwmod */
645static struct omap_hwmod omap2430_timer7_hwmod = { 617static struct omap_hwmod omap2430_timer7_hwmod = {
646 .name = "timer7", 618 .name = "timer7",
647 .mpu_irqs = omap2430_timer7_mpu_irqs, 619 .mpu_irqs = omap2_timer7_mpu_irqs,
648 .main_clk = "gpt7_fck", 620 .main_clk = "gpt7_fck",
649 .prcm = { 621 .prcm = {
650 .omap2 = { 622 .omap2 = {
@@ -663,10 +635,6 @@ static struct omap_hwmod omap2430_timer7_hwmod = {
663 635
664/* timer8 */ 636/* timer8 */
665static struct omap_hwmod omap2430_timer8_hwmod; 637static struct omap_hwmod omap2430_timer8_hwmod;
666static struct omap_hwmod_irq_info omap2430_timer8_mpu_irqs[] = {
667 { .irq = 44, },
668 { .irq = -1 }
669};
670 638
671/* l4_core -> timer8 */ 639/* l4_core -> timer8 */
672static struct omap_hwmod_ocp_if omap2430_l4_core__timer8 = { 640static struct omap_hwmod_ocp_if omap2430_l4_core__timer8 = {
@@ -685,7 +653,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer8_slaves[] = {
685/* timer8 hwmod */ 653/* timer8 hwmod */
686static struct omap_hwmod omap2430_timer8_hwmod = { 654static struct omap_hwmod omap2430_timer8_hwmod = {
687 .name = "timer8", 655 .name = "timer8",
688 .mpu_irqs = omap2430_timer8_mpu_irqs, 656 .mpu_irqs = omap2_timer8_mpu_irqs,
689 .main_clk = "gpt8_fck", 657 .main_clk = "gpt8_fck",
690 .prcm = { 658 .prcm = {
691 .omap2 = { 659 .omap2 = {
@@ -704,10 +672,6 @@ static struct omap_hwmod omap2430_timer8_hwmod = {
704 672
705/* timer9 */ 673/* timer9 */
706static struct omap_hwmod omap2430_timer9_hwmod; 674static struct omap_hwmod omap2430_timer9_hwmod;
707static struct omap_hwmod_irq_info omap2430_timer9_mpu_irqs[] = {
708 { .irq = 45, },
709 { .irq = -1 }
710};
711 675
712/* l4_core -> timer9 */ 676/* l4_core -> timer9 */
713static struct omap_hwmod_ocp_if omap2430_l4_core__timer9 = { 677static struct omap_hwmod_ocp_if omap2430_l4_core__timer9 = {
@@ -726,7 +690,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer9_slaves[] = {
726/* timer9 hwmod */ 690/* timer9 hwmod */
727static struct omap_hwmod omap2430_timer9_hwmod = { 691static struct omap_hwmod omap2430_timer9_hwmod = {
728 .name = "timer9", 692 .name = "timer9",
729 .mpu_irqs = omap2430_timer9_mpu_irqs, 693 .mpu_irqs = omap2_timer9_mpu_irqs,
730 .main_clk = "gpt9_fck", 694 .main_clk = "gpt9_fck",
731 .prcm = { 695 .prcm = {
732 .omap2 = { 696 .omap2 = {
@@ -745,10 +709,6 @@ static struct omap_hwmod omap2430_timer9_hwmod = {
745 709
746/* timer10 */ 710/* timer10 */
747static struct omap_hwmod omap2430_timer10_hwmod; 711static struct omap_hwmod omap2430_timer10_hwmod;
748static struct omap_hwmod_irq_info omap2430_timer10_mpu_irqs[] = {
749 { .irq = 46, },
750 { .irq = -1 }
751};
752 712
753/* l4_core -> timer10 */ 713/* l4_core -> timer10 */
754static struct omap_hwmod_ocp_if omap2430_l4_core__timer10 = { 714static struct omap_hwmod_ocp_if omap2430_l4_core__timer10 = {
@@ -767,7 +727,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer10_slaves[] = {
767/* timer10 hwmod */ 727/* timer10 hwmod */
768static struct omap_hwmod omap2430_timer10_hwmod = { 728static struct omap_hwmod omap2430_timer10_hwmod = {
769 .name = "timer10", 729 .name = "timer10",
770 .mpu_irqs = omap2430_timer10_mpu_irqs, 730 .mpu_irqs = omap2_timer10_mpu_irqs,
771 .main_clk = "gpt10_fck", 731 .main_clk = "gpt10_fck",
772 .prcm = { 732 .prcm = {
773 .omap2 = { 733 .omap2 = {
@@ -786,10 +746,6 @@ static struct omap_hwmod omap2430_timer10_hwmod = {
786 746
787/* timer11 */ 747/* timer11 */
788static struct omap_hwmod omap2430_timer11_hwmod; 748static struct omap_hwmod omap2430_timer11_hwmod;
789static struct omap_hwmod_irq_info omap2430_timer11_mpu_irqs[] = {
790 { .irq = 47, },
791 { .irq = -1 }
792};
793 749
794/* l4_core -> timer11 */ 750/* l4_core -> timer11 */
795static struct omap_hwmod_ocp_if omap2430_l4_core__timer11 = { 751static struct omap_hwmod_ocp_if omap2430_l4_core__timer11 = {
@@ -808,7 +764,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer11_slaves[] = {
808/* timer11 hwmod */ 764/* timer11 hwmod */
809static struct omap_hwmod omap2430_timer11_hwmod = { 765static struct omap_hwmod omap2430_timer11_hwmod = {
810 .name = "timer11", 766 .name = "timer11",
811 .mpu_irqs = omap2430_timer11_mpu_irqs, 767 .mpu_irqs = omap2_timer11_mpu_irqs,
812 .main_clk = "gpt11_fck", 768 .main_clk = "gpt11_fck",
813 .prcm = { 769 .prcm = {
814 .omap2 = { 770 .omap2 = {
@@ -827,10 +783,6 @@ static struct omap_hwmod omap2430_timer11_hwmod = {
827 783
828/* timer12 */ 784/* timer12 */
829static struct omap_hwmod omap2430_timer12_hwmod; 785static struct omap_hwmod omap2430_timer12_hwmod;
830static struct omap_hwmod_irq_info omap2430_timer12_mpu_irqs[] = {
831 { .irq = 48, },
832 { .irq = -1 }
833};
834 786
835/* l4_core -> timer12 */ 787/* l4_core -> timer12 */
836static struct omap_hwmod_ocp_if omap2430_l4_core__timer12 = { 788static struct omap_hwmod_ocp_if omap2430_l4_core__timer12 = {
@@ -849,7 +801,7 @@ static struct omap_hwmod_ocp_if *omap2430_timer12_slaves[] = {
849/* timer12 hwmod */ 801/* timer12 hwmod */
850static struct omap_hwmod omap2430_timer12_hwmod = { 802static struct omap_hwmod omap2430_timer12_hwmod = {
851 .name = "timer12", 803 .name = "timer12",
852 .mpu_irqs = omap2430_timer12_mpu_irqs, 804 .mpu_irqs = omap2xxx_timer12_mpu_irqs,
853 .main_clk = "gpt12_fck", 805 .main_clk = "gpt12_fck",
854 .prcm = { 806 .prcm = {
855 .omap2 = { 807 .omap2 = {
@@ -948,11 +900,6 @@ static struct omap_hwmod_class uart_class = {
948 900
949/* UART1 */ 901/* UART1 */
950 902
951static struct omap_hwmod_irq_info uart1_mpu_irqs[] = {
952 { .irq = INT_24XX_UART1_IRQ, },
953 { .irq = -1 }
954};
955
956static struct omap_hwmod_dma_info uart1_sdma_reqs[] = { 903static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
957 { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, }, 904 { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, },
958 { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, }, 905 { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, },
@@ -964,7 +911,7 @@ static struct omap_hwmod_ocp_if *omap2430_uart1_slaves[] = {
964 911
965static struct omap_hwmod omap2430_uart1_hwmod = { 912static struct omap_hwmod omap2430_uart1_hwmod = {
966 .name = "uart1", 913 .name = "uart1",
967 .mpu_irqs = uart1_mpu_irqs, 914 .mpu_irqs = omap2_uart1_mpu_irqs,
968 .sdma_reqs = uart1_sdma_reqs, 915 .sdma_reqs = uart1_sdma_reqs,
969 .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs), 916 .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs),
970 .main_clk = "uart1_fck", 917 .main_clk = "uart1_fck",
@@ -985,11 +932,6 @@ static struct omap_hwmod omap2430_uart1_hwmod = {
985 932
986/* UART2 */ 933/* UART2 */
987 934
988static struct omap_hwmod_irq_info uart2_mpu_irqs[] = {
989 { .irq = INT_24XX_UART2_IRQ, },
990 { .irq = -1 }
991};
992
993static struct omap_hwmod_dma_info uart2_sdma_reqs[] = { 935static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
994 { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, }, 936 { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, },
995 { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, }, 937 { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, },
@@ -1001,7 +943,7 @@ static struct omap_hwmod_ocp_if *omap2430_uart2_slaves[] = {
1001 943
1002static struct omap_hwmod omap2430_uart2_hwmod = { 944static struct omap_hwmod omap2430_uart2_hwmod = {
1003 .name = "uart2", 945 .name = "uart2",
1004 .mpu_irqs = uart2_mpu_irqs, 946 .mpu_irqs = omap2_uart2_mpu_irqs,
1005 .sdma_reqs = uart2_sdma_reqs, 947 .sdma_reqs = uart2_sdma_reqs,
1006 .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs), 948 .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs),
1007 .main_clk = "uart2_fck", 949 .main_clk = "uart2_fck",
@@ -1022,11 +964,6 @@ static struct omap_hwmod omap2430_uart2_hwmod = {
1022 964
1023/* UART3 */ 965/* UART3 */
1024 966
1025static struct omap_hwmod_irq_info uart3_mpu_irqs[] = {
1026 { .irq = INT_24XX_UART3_IRQ, },
1027 { .irq = -1 }
1028};
1029
1030static struct omap_hwmod_dma_info uart3_sdma_reqs[] = { 967static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
1031 { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, }, 968 { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, },
1032 { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, }, 969 { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, },
@@ -1038,7 +975,7 @@ static struct omap_hwmod_ocp_if *omap2430_uart3_slaves[] = {
1038 975
1039static struct omap_hwmod omap2430_uart3_hwmod = { 976static struct omap_hwmod omap2430_uart3_hwmod = {
1040 .name = "uart3", 977 .name = "uart3",
1041 .mpu_irqs = uart3_mpu_irqs, 978 .mpu_irqs = omap2_uart3_mpu_irqs,
1042 .sdma_reqs = uart3_sdma_reqs, 979 .sdma_reqs = uart3_sdma_reqs,
1043 .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs), 980 .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs),
1044 .main_clk = "uart3_fck", 981 .main_clk = "uart3_fck",
@@ -1150,11 +1087,6 @@ static struct omap_hwmod_class omap2430_dispc_hwmod_class = {
1150 .sysc = &omap2430_dispc_sysc, 1087 .sysc = &omap2430_dispc_sysc,
1151}; 1088};
1152 1089
1153static struct omap_hwmod_irq_info omap2430_dispc_irqs[] = {
1154 { .irq = 25 },
1155 { .irq = -1 }
1156};
1157
1158/* l4_core -> dss_dispc */ 1090/* l4_core -> dss_dispc */
1159static struct omap_hwmod_ocp_if omap2430_l4_core__dss_dispc = { 1091static struct omap_hwmod_ocp_if omap2430_l4_core__dss_dispc = {
1160 .master = &omap2430_l4_core_hwmod, 1092 .master = &omap2430_l4_core_hwmod,
@@ -1172,7 +1104,7 @@ static struct omap_hwmod_ocp_if *omap2430_dss_dispc_slaves[] = {
1172static struct omap_hwmod omap2430_dss_dispc_hwmod = { 1104static struct omap_hwmod omap2430_dss_dispc_hwmod = {
1173 .name = "dss_dispc", 1105 .name = "dss_dispc",
1174 .class = &omap2430_dispc_hwmod_class, 1106 .class = &omap2430_dispc_hwmod_class,
1175 .mpu_irqs = omap2430_dispc_irqs, 1107 .mpu_irqs = omap2_dispc_irqs,
1176 .main_clk = "dss1_fck", 1108 .main_clk = "dss1_fck",
1177 .prcm = { 1109 .prcm = {
1178 .omap2 = { 1110 .omap2 = {
@@ -1302,11 +1234,6 @@ static struct omap_i2c_dev_attr i2c_dev_attr = {
1302 1234
1303/* I2C1 */ 1235/* I2C1 */
1304 1236
1305static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = {
1306 { .irq = INT_24XX_I2C1_IRQ, },
1307 { .irq = -1 }
1308};
1309
1310static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = { 1237static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = {
1311 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX }, 1238 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX },
1312 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX }, 1239 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX },
@@ -1318,7 +1245,7 @@ static struct omap_hwmod_ocp_if *omap2430_i2c1_slaves[] = {
1318 1245
1319static struct omap_hwmod omap2430_i2c1_hwmod = { 1246static struct omap_hwmod omap2430_i2c1_hwmod = {
1320 .name = "i2c1", 1247 .name = "i2c1",
1321 .mpu_irqs = i2c1_mpu_irqs, 1248 .mpu_irqs = omap2_i2c1_mpu_irqs,
1322 .sdma_reqs = i2c1_sdma_reqs, 1249 .sdma_reqs = i2c1_sdma_reqs,
1323 .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs), 1250 .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs),
1324 .main_clk = "i2chs1_fck", 1251 .main_clk = "i2chs1_fck",
@@ -1348,11 +1275,6 @@ static struct omap_hwmod omap2430_i2c1_hwmod = {
1348 1275
1349/* I2C2 */ 1276/* I2C2 */
1350 1277
1351static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = {
1352 { .irq = INT_24XX_I2C2_IRQ, },
1353 { .irq = -1 }
1354};
1355
1356static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = { 1278static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = {
1357 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX }, 1279 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX },
1358 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX }, 1280 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX },
@@ -1364,7 +1286,7 @@ static struct omap_hwmod_ocp_if *omap2430_i2c2_slaves[] = {
1364 1286
1365static struct omap_hwmod omap2430_i2c2_hwmod = { 1287static struct omap_hwmod omap2430_i2c2_hwmod = {
1366 .name = "i2c2", 1288 .name = "i2c2",
1367 .mpu_irqs = i2c2_mpu_irqs, 1289 .mpu_irqs = omap2_i2c2_mpu_irqs,
1368 .sdma_reqs = i2c2_sdma_reqs, 1290 .sdma_reqs = i2c2_sdma_reqs,
1369 .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs), 1291 .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs),
1370 .main_clk = "i2chs2_fck", 1292 .main_clk = "i2chs2_fck",
@@ -1502,11 +1424,6 @@ static struct omap_hwmod_class omap243x_gpio_hwmod_class = {
1502}; 1424};
1503 1425
1504/* gpio1 */ 1426/* gpio1 */
1505static struct omap_hwmod_irq_info omap243x_gpio1_irqs[] = {
1506 { .irq = 29 }, /* INT_24XX_GPIO_BANK1 */
1507 { .irq = -1 }
1508};
1509
1510static struct omap_hwmod_ocp_if *omap2430_gpio1_slaves[] = { 1427static struct omap_hwmod_ocp_if *omap2430_gpio1_slaves[] = {
1511 &omap2430_l4_wkup__gpio1, 1428 &omap2430_l4_wkup__gpio1,
1512}; 1429};
@@ -1514,7 +1431,7 @@ static struct omap_hwmod_ocp_if *omap2430_gpio1_slaves[] = {
1514static struct omap_hwmod omap2430_gpio1_hwmod = { 1431static struct omap_hwmod omap2430_gpio1_hwmod = {
1515 .name = "gpio1", 1432 .name = "gpio1",
1516 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1433 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1517 .mpu_irqs = omap243x_gpio1_irqs, 1434 .mpu_irqs = omap2_gpio1_irqs,
1518 .main_clk = "gpios_fck", 1435 .main_clk = "gpios_fck",
1519 .prcm = { 1436 .prcm = {
1520 .omap2 = { 1437 .omap2 = {
@@ -1533,11 +1450,6 @@ static struct omap_hwmod omap2430_gpio1_hwmod = {
1533}; 1450};
1534 1451
1535/* gpio2 */ 1452/* gpio2 */
1536static struct omap_hwmod_irq_info omap243x_gpio2_irqs[] = {
1537 { .irq = 30 }, /* INT_24XX_GPIO_BANK2 */
1538 { .irq = -1 }
1539};
1540
1541static struct omap_hwmod_ocp_if *omap2430_gpio2_slaves[] = { 1453static struct omap_hwmod_ocp_if *omap2430_gpio2_slaves[] = {
1542 &omap2430_l4_wkup__gpio2, 1454 &omap2430_l4_wkup__gpio2,
1543}; 1455};
@@ -1545,7 +1457,7 @@ static struct omap_hwmod_ocp_if *omap2430_gpio2_slaves[] = {
1545static struct omap_hwmod omap2430_gpio2_hwmod = { 1457static struct omap_hwmod omap2430_gpio2_hwmod = {
1546 .name = "gpio2", 1458 .name = "gpio2",
1547 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1459 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1548 .mpu_irqs = omap243x_gpio2_irqs, 1460 .mpu_irqs = omap2_gpio2_irqs,
1549 .main_clk = "gpios_fck", 1461 .main_clk = "gpios_fck",
1550 .prcm = { 1462 .prcm = {
1551 .omap2 = { 1463 .omap2 = {
@@ -1564,11 +1476,6 @@ static struct omap_hwmod omap2430_gpio2_hwmod = {
1564}; 1476};
1565 1477
1566/* gpio3 */ 1478/* gpio3 */
1567static struct omap_hwmod_irq_info omap243x_gpio3_irqs[] = {
1568 { .irq = 31 }, /* INT_24XX_GPIO_BANK3 */
1569 { .irq = -1 }
1570};
1571
1572static struct omap_hwmod_ocp_if *omap2430_gpio3_slaves[] = { 1479static struct omap_hwmod_ocp_if *omap2430_gpio3_slaves[] = {
1573 &omap2430_l4_wkup__gpio3, 1480 &omap2430_l4_wkup__gpio3,
1574}; 1481};
@@ -1576,7 +1483,7 @@ static struct omap_hwmod_ocp_if *omap2430_gpio3_slaves[] = {
1576static struct omap_hwmod omap2430_gpio3_hwmod = { 1483static struct omap_hwmod omap2430_gpio3_hwmod = {
1577 .name = "gpio3", 1484 .name = "gpio3",
1578 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1485 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1579 .mpu_irqs = omap243x_gpio3_irqs, 1486 .mpu_irqs = omap2_gpio3_irqs,
1580 .main_clk = "gpios_fck", 1487 .main_clk = "gpios_fck",
1581 .prcm = { 1488 .prcm = {
1582 .omap2 = { 1489 .omap2 = {
@@ -1595,11 +1502,6 @@ static struct omap_hwmod omap2430_gpio3_hwmod = {
1595}; 1502};
1596 1503
1597/* gpio4 */ 1504/* gpio4 */
1598static struct omap_hwmod_irq_info omap243x_gpio4_irqs[] = {
1599 { .irq = 32 }, /* INT_24XX_GPIO_BANK4 */
1600 { .irq = -1 }
1601};
1602
1603static struct omap_hwmod_ocp_if *omap2430_gpio4_slaves[] = { 1505static struct omap_hwmod_ocp_if *omap2430_gpio4_slaves[] = {
1604 &omap2430_l4_wkup__gpio4, 1506 &omap2430_l4_wkup__gpio4,
1605}; 1507};
@@ -1607,7 +1509,7 @@ static struct omap_hwmod_ocp_if *omap2430_gpio4_slaves[] = {
1607static struct omap_hwmod omap2430_gpio4_hwmod = { 1509static struct omap_hwmod omap2430_gpio4_hwmod = {
1608 .name = "gpio4", 1510 .name = "gpio4",
1609 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1511 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
1610 .mpu_irqs = omap243x_gpio4_irqs, 1512 .mpu_irqs = omap2_gpio4_irqs,
1611 .main_clk = "gpios_fck", 1513 .main_clk = "gpios_fck",
1612 .prcm = { 1514 .prcm = {
1613 .omap2 = { 1515 .omap2 = {
@@ -1680,14 +1582,6 @@ static struct omap_dma_dev_attr dma_dev_attr = {
1680 .lch_count = 32, 1582 .lch_count = 32,
1681}; 1583};
1682 1584
1683static struct omap_hwmod_irq_info omap2430_dma_system_irqs[] = {
1684 { .name = "0", .irq = 12 }, /* INT_24XX_SDMA_IRQ0 */
1685 { .name = "1", .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */
1686 { .name = "2", .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */
1687 { .name = "3", .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */
1688 { .irq = -1 }
1689};
1690
1691/* dma_system -> L3 */ 1585/* dma_system -> L3 */
1692static struct omap_hwmod_ocp_if omap2430_dma_system__l3 = { 1586static struct omap_hwmod_ocp_if omap2430_dma_system__l3 = {
1693 .master = &omap2430_dma_system_hwmod, 1587 .master = &omap2430_dma_system_hwmod,
@@ -1718,7 +1612,7 @@ static struct omap_hwmod_ocp_if *omap2430_dma_system_slaves[] = {
1718static struct omap_hwmod omap2430_dma_system_hwmod = { 1612static struct omap_hwmod omap2430_dma_system_hwmod = {
1719 .name = "dma", 1613 .name = "dma",
1720 .class = &omap2430_dma_hwmod_class, 1614 .class = &omap2430_dma_hwmod_class,
1721 .mpu_irqs = omap2430_dma_system_irqs, 1615 .mpu_irqs = omap2_dma_system_irqs,
1722 .main_clk = "core_l3_ck", 1616 .main_clk = "core_l3_ck",
1723 .slaves = omap2430_dma_system_slaves, 1617 .slaves = omap2430_dma_system_slaves,
1724 .slaves_cnt = ARRAY_SIZE(omap2430_dma_system_slaves), 1618 .slaves_cnt = ARRAY_SIZE(omap2430_dma_system_slaves),
@@ -1813,11 +1707,6 @@ static struct omap_hwmod_class omap2430_mcspi_class = {
1813}; 1707};
1814 1708
1815/* mcspi1 */ 1709/* mcspi1 */
1816static struct omap_hwmod_irq_info omap2430_mcspi1_mpu_irqs[] = {
1817 { .irq = 65 },
1818 { .irq = -1 }
1819};
1820
1821static struct omap_hwmod_dma_info omap2430_mcspi1_sdma_reqs[] = { 1710static struct omap_hwmod_dma_info omap2430_mcspi1_sdma_reqs[] = {
1822 { .name = "tx0", .dma_req = 35 }, /* DMA_SPI1_TX0 */ 1711 { .name = "tx0", .dma_req = 35 }, /* DMA_SPI1_TX0 */
1823 { .name = "rx0", .dma_req = 36 }, /* DMA_SPI1_RX0 */ 1712 { .name = "rx0", .dma_req = 36 }, /* DMA_SPI1_RX0 */
@@ -1839,7 +1728,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
1839 1728
1840static struct omap_hwmod omap2430_mcspi1_hwmod = { 1729static struct omap_hwmod omap2430_mcspi1_hwmod = {
1841 .name = "mcspi1_hwmod", 1730 .name = "mcspi1_hwmod",
1842 .mpu_irqs = omap2430_mcspi1_mpu_irqs, 1731 .mpu_irqs = omap2_mcspi1_mpu_irqs,
1843 .sdma_reqs = omap2430_mcspi1_sdma_reqs, 1732 .sdma_reqs = omap2430_mcspi1_sdma_reqs,
1844 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi1_sdma_reqs), 1733 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi1_sdma_reqs),
1845 .main_clk = "mcspi1_fck", 1734 .main_clk = "mcspi1_fck",
@@ -1860,11 +1749,6 @@ static struct omap_hwmod omap2430_mcspi1_hwmod = {
1860}; 1749};
1861 1750
1862/* mcspi2 */ 1751/* mcspi2 */
1863static struct omap_hwmod_irq_info omap2430_mcspi2_mpu_irqs[] = {
1864 { .irq = 66 },
1865 { .irq = -1 }
1866};
1867
1868static struct omap_hwmod_dma_info omap2430_mcspi2_sdma_reqs[] = { 1752static struct omap_hwmod_dma_info omap2430_mcspi2_sdma_reqs[] = {
1869 { .name = "tx0", .dma_req = 43 }, /* DMA_SPI2_TX0 */ 1753 { .name = "tx0", .dma_req = 43 }, /* DMA_SPI2_TX0 */
1870 { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */ 1754 { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */
@@ -1882,7 +1766,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
1882 1766
1883static struct omap_hwmod omap2430_mcspi2_hwmod = { 1767static struct omap_hwmod omap2430_mcspi2_hwmod = {
1884 .name = "mcspi2_hwmod", 1768 .name = "mcspi2_hwmod",
1885 .mpu_irqs = omap2430_mcspi2_mpu_irqs, 1769 .mpu_irqs = omap2_mcspi2_mpu_irqs,
1886 .sdma_reqs = omap2430_mcspi2_sdma_reqs, 1770 .sdma_reqs = omap2430_mcspi2_sdma_reqs,
1887 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi2_sdma_reqs), 1771 .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi2_sdma_reqs),
1888 .main_clk = "mcspi2_fck", 1772 .main_clk = "mcspi2_fck",
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
new file mode 100644
index 000000000000..245294b97f6e
--- /dev/null
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
@@ -0,0 +1,142 @@
1/*
2 * omap_hwmod_2xxx_3xxx_ipblock_data.c - common IP block data for OMAP2/3
3 *
4 * Copyright (C) 2011 Nokia Corporation
5 * Paul Walmsley
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation.
10 */
11#include <plat/omap_hwmod.h>
12#include <plat/serial.h>
13
14#include <mach/irqs.h>
15
16#include "omap_hwmod_common_data.h"
17
18struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[] = {
19 { .irq = 37, },
20 { .irq = -1 }
21};
22
23struct omap_hwmod_irq_info omap2_timer2_mpu_irqs[] = {
24 { .irq = 38, },
25 { .irq = -1 }
26};
27
28struct omap_hwmod_irq_info omap2_timer3_mpu_irqs[] = {
29 { .irq = 39, },
30 { .irq = -1 }
31};
32
33struct omap_hwmod_irq_info omap2_timer4_mpu_irqs[] = {
34 { .irq = 40, },
35 { .irq = -1 }
36};
37
38struct omap_hwmod_irq_info omap2_timer5_mpu_irqs[] = {
39 { .irq = 41, },
40 { .irq = -1 }
41};
42
43struct omap_hwmod_irq_info omap2_timer6_mpu_irqs[] = {
44 { .irq = 42, },
45 { .irq = -1 }
46};
47
48struct omap_hwmod_irq_info omap2_timer7_mpu_irqs[] = {
49 { .irq = 43, },
50 { .irq = -1 }
51};
52
53struct omap_hwmod_irq_info omap2_timer8_mpu_irqs[] = {
54 { .irq = 44, },
55 { .irq = -1 }
56};
57
58struct omap_hwmod_irq_info omap2_timer9_mpu_irqs[] = {
59 { .irq = 45, },
60 { .irq = -1 }
61};
62
63struct omap_hwmod_irq_info omap2_timer10_mpu_irqs[] = {
64 { .irq = 46, },
65 { .irq = -1 }
66};
67
68struct omap_hwmod_irq_info omap2_timer11_mpu_irqs[] = {
69 { .irq = 47, },
70 { .irq = -1 }
71};
72
73struct omap_hwmod_irq_info omap2_uart1_mpu_irqs[] = {
74 { .irq = INT_24XX_UART1_IRQ, },
75 { .irq = -1 }
76};
77
78struct omap_hwmod_irq_info omap2_uart2_mpu_irqs[] = {
79 { .irq = INT_24XX_UART2_IRQ, },
80 { .irq = -1 }
81};
82
83struct omap_hwmod_irq_info omap2_uart3_mpu_irqs[] = {
84 { .irq = INT_24XX_UART3_IRQ, },
85 { .irq = -1 }
86};
87
88struct omap_hwmod_irq_info omap2_dispc_irqs[] = {
89 { .irq = 25 },
90 { .irq = -1 }
91};
92
93struct omap_hwmod_irq_info omap2_i2c1_mpu_irqs[] = {
94 { .irq = INT_24XX_I2C1_IRQ, },
95 { .irq = -1 }
96};
97
98struct omap_hwmod_irq_info omap2_i2c2_mpu_irqs[] = {
99 { .irq = INT_24XX_I2C2_IRQ, },
100 { .irq = -1 }
101};
102
103struct omap_hwmod_irq_info omap2_gpio1_irqs[] = {
104 { .irq = 29 }, /* INT_24XX_GPIO_BANK1 */
105 { .irq = -1 }
106};
107
108struct omap_hwmod_irq_info omap2_gpio2_irqs[] = {
109 { .irq = 30 }, /* INT_24XX_GPIO_BANK2 */
110 { .irq = -1 }
111};
112
113struct omap_hwmod_irq_info omap2_gpio3_irqs[] = {
114 { .irq = 31 }, /* INT_24XX_GPIO_BANK3 */
115 { .irq = -1 }
116};
117
118struct omap_hwmod_irq_info omap2_gpio4_irqs[] = {
119 { .irq = 32 }, /* INT_24XX_GPIO_BANK4 */
120 { .irq = -1 }
121};
122
123struct omap_hwmod_irq_info omap2_dma_system_irqs[] = {
124 { .name = "0", .irq = 12 }, /* INT_24XX_SDMA_IRQ0 */
125 { .name = "1", .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */
126 { .name = "2", .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */
127 { .name = "3", .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */
128 { .irq = -1 }
129};
130
131struct omap_hwmod_irq_info omap2_mcspi1_mpu_irqs[] = {
132 { .irq = 65 },
133 { .irq = -1 }
134};
135
136struct omap_hwmod_irq_info omap2_mcspi2_mpu_irqs[] = {
137 { .irq = 66 },
138 { .irq = -1 }
139};
140
141
142
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
new file mode 100644
index 000000000000..5a078a652c33
--- /dev/null
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -0,0 +1,21 @@
1/*
2 * omap_hwmod_2xxx_ipblock_data.c - common IP block data for OMAP2xxx
3 *
4 * Copyright (C) 2011 Nokia Corporation
5 * Paul Walmsley
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation.
10 */
11#include <plat/omap_hwmod.h>
12#include <plat/serial.h>
13
14#include <mach/irqs.h>
15
16#include "omap_hwmod_common_data.h"
17
18struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[] = {
19 { .irq = 48, },
20 { .irq = -1 }
21};
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index cc178b573fe2..6bac4bb14df3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -151,7 +151,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_l3_main_masters[] = {
151static struct omap_hwmod omap3xxx_l3_main_hwmod = { 151static struct omap_hwmod omap3xxx_l3_main_hwmod = {
152 .name = "l3_main", 152 .name = "l3_main",
153 .class = &l3_hwmod_class, 153 .class = &l3_hwmod_class,
154 .mpu_irqs = omap3xxx_l3_main_irqs, 154 .mpu_irqs = omap3xxx_l3_main_irqs,
155 .masters = omap3xxx_l3_main_masters, 155 .masters = omap3xxx_l3_main_masters,
156 .masters_cnt = ARRAY_SIZE(omap3xxx_l3_main_masters), 156 .masters_cnt = ARRAY_SIZE(omap3xxx_l3_main_masters),
157 .slaves = omap3xxx_l3_main_slaves, 157 .slaves = omap3xxx_l3_main_slaves,
@@ -572,10 +572,6 @@ static struct omap_hwmod_class omap3xxx_timer_hwmod_class = {
572 572
573/* timer1 */ 573/* timer1 */
574static struct omap_hwmod omap3xxx_timer1_hwmod; 574static struct omap_hwmod omap3xxx_timer1_hwmod;
575static struct omap_hwmod_irq_info omap3xxx_timer1_mpu_irqs[] = {
576 { .irq = 37, },
577 { .irq = -1 }
578};
579 575
580static struct omap_hwmod_addr_space omap3xxx_timer1_addrs[] = { 576static struct omap_hwmod_addr_space omap3xxx_timer1_addrs[] = {
581 { 577 {
@@ -603,7 +599,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer1_slaves[] = {
603/* timer1 hwmod */ 599/* timer1 hwmod */
604static struct omap_hwmod omap3xxx_timer1_hwmod = { 600static struct omap_hwmod omap3xxx_timer1_hwmod = {
605 .name = "timer1", 601 .name = "timer1",
606 .mpu_irqs = omap3xxx_timer1_mpu_irqs, 602 .mpu_irqs = omap2_timer1_mpu_irqs,
607 .main_clk = "gpt1_fck", 603 .main_clk = "gpt1_fck",
608 .prcm = { 604 .prcm = {
609 .omap2 = { 605 .omap2 = {
@@ -622,10 +618,6 @@ static struct omap_hwmod omap3xxx_timer1_hwmod = {
622 618
623/* timer2 */ 619/* timer2 */
624static struct omap_hwmod omap3xxx_timer2_hwmod; 620static struct omap_hwmod omap3xxx_timer2_hwmod;
625static struct omap_hwmod_irq_info omap3xxx_timer2_mpu_irqs[] = {
626 { .irq = 38, },
627 { .irq = -1 }
628};
629 621
630static struct omap_hwmod_addr_space omap3xxx_timer2_addrs[] = { 622static struct omap_hwmod_addr_space omap3xxx_timer2_addrs[] = {
631 { 623 {
@@ -653,7 +645,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer2_slaves[] = {
653/* timer2 hwmod */ 645/* timer2 hwmod */
654static struct omap_hwmod omap3xxx_timer2_hwmod = { 646static struct omap_hwmod omap3xxx_timer2_hwmod = {
655 .name = "timer2", 647 .name = "timer2",
656 .mpu_irqs = omap3xxx_timer2_mpu_irqs, 648 .mpu_irqs = omap2_timer2_mpu_irqs,
657 .main_clk = "gpt2_fck", 649 .main_clk = "gpt2_fck",
658 .prcm = { 650 .prcm = {
659 .omap2 = { 651 .omap2 = {
@@ -672,10 +664,6 @@ static struct omap_hwmod omap3xxx_timer2_hwmod = {
672 664
673/* timer3 */ 665/* timer3 */
674static struct omap_hwmod omap3xxx_timer3_hwmod; 666static struct omap_hwmod omap3xxx_timer3_hwmod;
675static struct omap_hwmod_irq_info omap3xxx_timer3_mpu_irqs[] = {
676 { .irq = 39, },
677 { .irq = -1 }
678};
679 667
680static struct omap_hwmod_addr_space omap3xxx_timer3_addrs[] = { 668static struct omap_hwmod_addr_space omap3xxx_timer3_addrs[] = {
681 { 669 {
@@ -703,7 +691,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer3_slaves[] = {
703/* timer3 hwmod */ 691/* timer3 hwmod */
704static struct omap_hwmod omap3xxx_timer3_hwmod = { 692static struct omap_hwmod omap3xxx_timer3_hwmod = {
705 .name = "timer3", 693 .name = "timer3",
706 .mpu_irqs = omap3xxx_timer3_mpu_irqs, 694 .mpu_irqs = omap2_timer3_mpu_irqs,
707 .main_clk = "gpt3_fck", 695 .main_clk = "gpt3_fck",
708 .prcm = { 696 .prcm = {
709 .omap2 = { 697 .omap2 = {
@@ -722,10 +710,6 @@ static struct omap_hwmod omap3xxx_timer3_hwmod = {
722 710
723/* timer4 */ 711/* timer4 */
724static struct omap_hwmod omap3xxx_timer4_hwmod; 712static struct omap_hwmod omap3xxx_timer4_hwmod;
725static struct omap_hwmod_irq_info omap3xxx_timer4_mpu_irqs[] = {
726 { .irq = 40, },
727 { .irq = -1 }
728};
729 713
730static struct omap_hwmod_addr_space omap3xxx_timer4_addrs[] = { 714static struct omap_hwmod_addr_space omap3xxx_timer4_addrs[] = {
731 { 715 {
@@ -753,7 +737,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer4_slaves[] = {
753/* timer4 hwmod */ 737/* timer4 hwmod */
754static struct omap_hwmod omap3xxx_timer4_hwmod = { 738static struct omap_hwmod omap3xxx_timer4_hwmod = {
755 .name = "timer4", 739 .name = "timer4",
756 .mpu_irqs = omap3xxx_timer4_mpu_irqs, 740 .mpu_irqs = omap2_timer4_mpu_irqs,
757 .main_clk = "gpt4_fck", 741 .main_clk = "gpt4_fck",
758 .prcm = { 742 .prcm = {
759 .omap2 = { 743 .omap2 = {
@@ -772,10 +756,6 @@ static struct omap_hwmod omap3xxx_timer4_hwmod = {
772 756
773/* timer5 */ 757/* timer5 */
774static struct omap_hwmod omap3xxx_timer5_hwmod; 758static struct omap_hwmod omap3xxx_timer5_hwmod;
775static struct omap_hwmod_irq_info omap3xxx_timer5_mpu_irqs[] = {
776 { .irq = 41, },
777 { .irq = -1 }
778};
779 759
780static struct omap_hwmod_addr_space omap3xxx_timer5_addrs[] = { 760static struct omap_hwmod_addr_space omap3xxx_timer5_addrs[] = {
781 { 761 {
@@ -803,7 +783,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer5_slaves[] = {
803/* timer5 hwmod */ 783/* timer5 hwmod */
804static struct omap_hwmod omap3xxx_timer5_hwmod = { 784static struct omap_hwmod omap3xxx_timer5_hwmod = {
805 .name = "timer5", 785 .name = "timer5",
806 .mpu_irqs = omap3xxx_timer5_mpu_irqs, 786 .mpu_irqs = omap2_timer5_mpu_irqs,
807 .main_clk = "gpt5_fck", 787 .main_clk = "gpt5_fck",
808 .prcm = { 788 .prcm = {
809 .omap2 = { 789 .omap2 = {
@@ -822,10 +802,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = {
822 802
823/* timer6 */ 803/* timer6 */
824static struct omap_hwmod omap3xxx_timer6_hwmod; 804static struct omap_hwmod omap3xxx_timer6_hwmod;
825static struct omap_hwmod_irq_info omap3xxx_timer6_mpu_irqs[] = {
826 { .irq = 42, },
827 { .irq = -1 }
828};
829 805
830static struct omap_hwmod_addr_space omap3xxx_timer6_addrs[] = { 806static struct omap_hwmod_addr_space omap3xxx_timer6_addrs[] = {
831 { 807 {
@@ -853,7 +829,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer6_slaves[] = {
853/* timer6 hwmod */ 829/* timer6 hwmod */
854static struct omap_hwmod omap3xxx_timer6_hwmod = { 830static struct omap_hwmod omap3xxx_timer6_hwmod = {
855 .name = "timer6", 831 .name = "timer6",
856 .mpu_irqs = omap3xxx_timer6_mpu_irqs, 832 .mpu_irqs = omap2_timer6_mpu_irqs,
857 .main_clk = "gpt6_fck", 833 .main_clk = "gpt6_fck",
858 .prcm = { 834 .prcm = {
859 .omap2 = { 835 .omap2 = {
@@ -872,10 +848,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = {
872 848
873/* timer7 */ 849/* timer7 */
874static struct omap_hwmod omap3xxx_timer7_hwmod; 850static struct omap_hwmod omap3xxx_timer7_hwmod;
875static struct omap_hwmod_irq_info omap3xxx_timer7_mpu_irqs[] = {
876 { .irq = 43, },
877 { .irq = -1 }
878};
879 851
880static struct omap_hwmod_addr_space omap3xxx_timer7_addrs[] = { 852static struct omap_hwmod_addr_space omap3xxx_timer7_addrs[] = {
881 { 853 {
@@ -903,7 +875,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer7_slaves[] = {
903/* timer7 hwmod */ 875/* timer7 hwmod */
904static struct omap_hwmod omap3xxx_timer7_hwmod = { 876static struct omap_hwmod omap3xxx_timer7_hwmod = {
905 .name = "timer7", 877 .name = "timer7",
906 .mpu_irqs = omap3xxx_timer7_mpu_irqs, 878 .mpu_irqs = omap2_timer7_mpu_irqs,
907 .main_clk = "gpt7_fck", 879 .main_clk = "gpt7_fck",
908 .prcm = { 880 .prcm = {
909 .omap2 = { 881 .omap2 = {
@@ -922,10 +894,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = {
922 894
923/* timer8 */ 895/* timer8 */
924static struct omap_hwmod omap3xxx_timer8_hwmod; 896static struct omap_hwmod omap3xxx_timer8_hwmod;
925static struct omap_hwmod_irq_info omap3xxx_timer8_mpu_irqs[] = {
926 { .irq = 44, },
927 { .irq = -1 }
928};
929 897
930static struct omap_hwmod_addr_space omap3xxx_timer8_addrs[] = { 898static struct omap_hwmod_addr_space omap3xxx_timer8_addrs[] = {
931 { 899 {
@@ -953,7 +921,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer8_slaves[] = {
953/* timer8 hwmod */ 921/* timer8 hwmod */
954static struct omap_hwmod omap3xxx_timer8_hwmod = { 922static struct omap_hwmod omap3xxx_timer8_hwmod = {
955 .name = "timer8", 923 .name = "timer8",
956 .mpu_irqs = omap3xxx_timer8_mpu_irqs, 924 .mpu_irqs = omap2_timer8_mpu_irqs,
957 .main_clk = "gpt8_fck", 925 .main_clk = "gpt8_fck",
958 .prcm = { 926 .prcm = {
959 .omap2 = { 927 .omap2 = {
@@ -972,10 +940,6 @@ static struct omap_hwmod omap3xxx_timer8_hwmod = {
972 940
973/* timer9 */ 941/* timer9 */
974static struct omap_hwmod omap3xxx_timer9_hwmod; 942static struct omap_hwmod omap3xxx_timer9_hwmod;
975static struct omap_hwmod_irq_info omap3xxx_timer9_mpu_irqs[] = {
976 { .irq = 45, },
977 { .irq = -1 }
978};
979 943
980static struct omap_hwmod_addr_space omap3xxx_timer9_addrs[] = { 944static struct omap_hwmod_addr_space omap3xxx_timer9_addrs[] = {
981 { 945 {
@@ -1003,7 +967,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer9_slaves[] = {
1003/* timer9 hwmod */ 967/* timer9 hwmod */
1004static struct omap_hwmod omap3xxx_timer9_hwmod = { 968static struct omap_hwmod omap3xxx_timer9_hwmod = {
1005 .name = "timer9", 969 .name = "timer9",
1006 .mpu_irqs = omap3xxx_timer9_mpu_irqs, 970 .mpu_irqs = omap2_timer9_mpu_irqs,
1007 .main_clk = "gpt9_fck", 971 .main_clk = "gpt9_fck",
1008 .prcm = { 972 .prcm = {
1009 .omap2 = { 973 .omap2 = {
@@ -1022,10 +986,6 @@ static struct omap_hwmod omap3xxx_timer9_hwmod = {
1022 986
1023/* timer10 */ 987/* timer10 */
1024static struct omap_hwmod omap3xxx_timer10_hwmod; 988static struct omap_hwmod omap3xxx_timer10_hwmod;
1025static struct omap_hwmod_irq_info omap3xxx_timer10_mpu_irqs[] = {
1026 { .irq = 46, },
1027 { .irq = -1 }
1028};
1029 989
1030/* l4_core -> timer10 */ 990/* l4_core -> timer10 */
1031static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer10 = { 991static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer10 = {
@@ -1044,7 +1004,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer10_slaves[] = {
1044/* timer10 hwmod */ 1004/* timer10 hwmod */
1045static struct omap_hwmod omap3xxx_timer10_hwmod = { 1005static struct omap_hwmod omap3xxx_timer10_hwmod = {
1046 .name = "timer10", 1006 .name = "timer10",
1047 .mpu_irqs = omap3xxx_timer10_mpu_irqs, 1007 .mpu_irqs = omap2_timer10_mpu_irqs,
1048 .main_clk = "gpt10_fck", 1008 .main_clk = "gpt10_fck",
1049 .prcm = { 1009 .prcm = {
1050 .omap2 = { 1010 .omap2 = {
@@ -1063,10 +1023,6 @@ static struct omap_hwmod omap3xxx_timer10_hwmod = {
1063 1023
1064/* timer11 */ 1024/* timer11 */
1065static struct omap_hwmod omap3xxx_timer11_hwmod; 1025static struct omap_hwmod omap3xxx_timer11_hwmod;
1066static struct omap_hwmod_irq_info omap3xxx_timer11_mpu_irqs[] = {
1067 { .irq = 47, },
1068 { .irq = -1 }
1069};
1070 1026
1071/* l4_core -> timer11 */ 1027/* l4_core -> timer11 */
1072static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer11 = { 1028static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer11 = {
@@ -1085,7 +1041,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer11_slaves[] = {
1085/* timer11 hwmod */ 1041/* timer11 hwmod */
1086static struct omap_hwmod omap3xxx_timer11_hwmod = { 1042static struct omap_hwmod omap3xxx_timer11_hwmod = {
1087 .name = "timer11", 1043 .name = "timer11",
1088 .mpu_irqs = omap3xxx_timer11_mpu_irqs, 1044 .mpu_irqs = omap2_timer11_mpu_irqs,
1089 .main_clk = "gpt11_fck", 1045 .main_clk = "gpt11_fck",
1090 .prcm = { 1046 .prcm = {
1091 .omap2 = { 1047 .omap2 = {
@@ -1254,11 +1210,6 @@ static struct omap_hwmod_class uart_class = {
1254 1210
1255/* UART1 */ 1211/* UART1 */
1256 1212
1257static struct omap_hwmod_irq_info uart1_mpu_irqs[] = {
1258 { .irq = INT_24XX_UART1_IRQ, },
1259 { .irq = -1 }
1260};
1261
1262static struct omap_hwmod_dma_info uart1_sdma_reqs[] = { 1213static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
1263 { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, }, 1214 { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, },
1264 { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, }, 1215 { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, },
@@ -1270,7 +1221,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
1270 1221
1271static struct omap_hwmod omap3xxx_uart1_hwmod = { 1222static struct omap_hwmod omap3xxx_uart1_hwmod = {
1272 .name = "uart1", 1223 .name = "uart1",
1273 .mpu_irqs = uart1_mpu_irqs, 1224 .mpu_irqs = omap2_uart1_mpu_irqs,
1274 .sdma_reqs = uart1_sdma_reqs, 1225 .sdma_reqs = uart1_sdma_reqs,
1275 .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs), 1226 .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs),
1276 .main_clk = "uart1_fck", 1227 .main_clk = "uart1_fck",
@@ -1291,11 +1242,6 @@ static struct omap_hwmod omap3xxx_uart1_hwmod = {
1291 1242
1292/* UART2 */ 1243/* UART2 */
1293 1244
1294static struct omap_hwmod_irq_info uart2_mpu_irqs[] = {
1295 { .irq = INT_24XX_UART2_IRQ, },
1296 { .irq = -1 }
1297};
1298
1299static struct omap_hwmod_dma_info uart2_sdma_reqs[] = { 1245static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
1300 { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, }, 1246 { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, },
1301 { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, }, 1247 { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, },
@@ -1307,7 +1253,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
1307 1253
1308static struct omap_hwmod omap3xxx_uart2_hwmod = { 1254static struct omap_hwmod omap3xxx_uart2_hwmod = {
1309 .name = "uart2", 1255 .name = "uart2",
1310 .mpu_irqs = uart2_mpu_irqs, 1256 .mpu_irqs = omap2_uart2_mpu_irqs,
1311 .sdma_reqs = uart2_sdma_reqs, 1257 .sdma_reqs = uart2_sdma_reqs,
1312 .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs), 1258 .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs),
1313 .main_clk = "uart2_fck", 1259 .main_clk = "uart2_fck",
@@ -1328,11 +1274,6 @@ static struct omap_hwmod omap3xxx_uart2_hwmod = {
1328 1274
1329/* UART3 */ 1275/* UART3 */
1330 1276
1331static struct omap_hwmod_irq_info uart3_mpu_irqs[] = {
1332 { .irq = INT_24XX_UART3_IRQ, },
1333 { .irq = -1 }
1334};
1335
1336static struct omap_hwmod_dma_info uart3_sdma_reqs[] = { 1277static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
1337 { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, }, 1278 { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, },
1338 { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, }, 1279 { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, },
@@ -1344,7 +1285,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
1344 1285
1345static struct omap_hwmod omap3xxx_uart3_hwmod = { 1286static struct omap_hwmod omap3xxx_uart3_hwmod = {
1346 .name = "uart3", 1287 .name = "uart3",
1347 .mpu_irqs = uart3_mpu_irqs, 1288 .mpu_irqs = omap2_uart3_mpu_irqs,
1348 .sdma_reqs = uart3_sdma_reqs, 1289 .sdma_reqs = uart3_sdma_reqs,
1349 .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs), 1290 .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs),
1350 .main_clk = "uart3_fck", 1291 .main_clk = "uart3_fck",
@@ -1555,11 +1496,6 @@ static struct omap_hwmod_class omap3xxx_dispc_hwmod_class = {
1555 .sysc = &omap3xxx_dispc_sysc, 1496 .sysc = &omap3xxx_dispc_sysc,
1556}; 1497};
1557 1498
1558static struct omap_hwmod_irq_info omap3xxx_dispc_irqs[] = {
1559 { .irq = 25 },
1560 { .irq = -1 }
1561};
1562
1563/* l4_core -> dss_dispc */ 1499/* l4_core -> dss_dispc */
1564static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dispc = { 1500static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dispc = {
1565 .master = &omap3xxx_l4_core_hwmod, 1501 .master = &omap3xxx_l4_core_hwmod,
@@ -1584,7 +1520,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_dss_dispc_slaves[] = {
1584static struct omap_hwmod omap3xxx_dss_dispc_hwmod = { 1520static struct omap_hwmod omap3xxx_dss_dispc_hwmod = {
1585 .name = "dss_dispc", 1521 .name = "dss_dispc",
1586 .class = &omap3xxx_dispc_hwmod_class, 1522 .class = &omap3xxx_dispc_hwmod_class,
1587 .mpu_irqs = omap3xxx_dispc_irqs, 1523 .mpu_irqs = omap2_dispc_irqs,
1588 .main_clk = "dss1_alwon_fck", 1524 .main_clk = "dss1_alwon_fck",
1589 .prcm = { 1525 .prcm = {
1590 .omap2 = { 1526 .omap2 = {
@@ -1781,11 +1717,6 @@ static struct omap_i2c_dev_attr i2c1_dev_attr = {
1781 .fifo_depth = 8, /* bytes */ 1717 .fifo_depth = 8, /* bytes */
1782}; 1718};
1783 1719
1784static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = {
1785 { .irq = INT_24XX_I2C1_IRQ, },
1786 { .irq = -1 }
1787};
1788
1789static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = { 1720static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = {
1790 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX }, 1721 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX },
1791 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX }, 1722 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX },
@@ -1797,7 +1728,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c1_slaves[] = {
1797 1728
1798static struct omap_hwmod omap3xxx_i2c1_hwmod = { 1729static struct omap_hwmod omap3xxx_i2c1_hwmod = {
1799 .name = "i2c1", 1730 .name = "i2c1",
1800 .mpu_irqs = i2c1_mpu_irqs, 1731 .mpu_irqs = omap2_i2c1_mpu_irqs,
1801 .sdma_reqs = i2c1_sdma_reqs, 1732 .sdma_reqs = i2c1_sdma_reqs,
1802 .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs), 1733 .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs),
1803 .main_clk = "i2c1_fck", 1734 .main_clk = "i2c1_fck",
@@ -1823,11 +1754,6 @@ static struct omap_i2c_dev_attr i2c2_dev_attr = {
1823 .fifo_depth = 8, /* bytes */ 1754 .fifo_depth = 8, /* bytes */
1824}; 1755};
1825 1756
1826static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = {
1827 { .irq = INT_24XX_I2C2_IRQ, },
1828 { .irq = -1 }
1829};
1830
1831static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = { 1757static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = {
1832 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX }, 1758 { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX },
1833 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX }, 1759 { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX },
@@ -1839,7 +1765,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c2_slaves[] = {
1839 1765
1840static struct omap_hwmod omap3xxx_i2c2_hwmod = { 1766static struct omap_hwmod omap3xxx_i2c2_hwmod = {
1841 .name = "i2c2", 1767 .name = "i2c2",
1842 .mpu_irqs = i2c2_mpu_irqs, 1768 .mpu_irqs = omap2_i2c2_mpu_irqs,
1843 .sdma_reqs = i2c2_sdma_reqs, 1769 .sdma_reqs = i2c2_sdma_reqs,
1844 .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs), 1770 .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs),
1845 .main_clk = "i2c2_fck", 1771 .main_clk = "i2c2_fck",
@@ -2032,11 +1958,6 @@ static struct omap_gpio_dev_attr gpio_dev_attr = {
2032}; 1958};
2033 1959
2034/* gpio1 */ 1960/* gpio1 */
2035static struct omap_hwmod_irq_info omap3xxx_gpio1_irqs[] = {
2036 { .irq = 29 }, /* INT_34XX_GPIO_BANK1 */
2037 { .irq = -1 }
2038};
2039
2040static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { 1961static struct omap_hwmod_opt_clk gpio1_opt_clks[] = {
2041 { .role = "dbclk", .clk = "gpio1_dbck", }, 1962 { .role = "dbclk", .clk = "gpio1_dbck", },
2042}; 1963};
@@ -2048,7 +1969,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_gpio1_slaves[] = {
2048static struct omap_hwmod omap3xxx_gpio1_hwmod = { 1969static struct omap_hwmod omap3xxx_gpio1_hwmod = {
2049 .name = "gpio1", 1970 .name = "gpio1",
2050 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 1971 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
2051 .mpu_irqs = omap3xxx_gpio1_irqs, 1972 .mpu_irqs = omap2_gpio1_irqs,
2052 .main_clk = "gpio1_ick", 1973 .main_clk = "gpio1_ick",
2053 .opt_clks = gpio1_opt_clks, 1974 .opt_clks = gpio1_opt_clks,
2054 .opt_clks_cnt = ARRAY_SIZE(gpio1_opt_clks), 1975 .opt_clks_cnt = ARRAY_SIZE(gpio1_opt_clks),
@@ -2069,11 +1990,6 @@ static struct omap_hwmod omap3xxx_gpio1_hwmod = {
2069}; 1990};
2070 1991
2071/* gpio2 */ 1992/* gpio2 */
2072static struct omap_hwmod_irq_info omap3xxx_gpio2_irqs[] = {
2073 { .irq = 30 }, /* INT_34XX_GPIO_BANK2 */
2074 { .irq = -1 }
2075};
2076
2077static struct omap_hwmod_opt_clk gpio2_opt_clks[] = { 1993static struct omap_hwmod_opt_clk gpio2_opt_clks[] = {
2078 { .role = "dbclk", .clk = "gpio2_dbck", }, 1994 { .role = "dbclk", .clk = "gpio2_dbck", },
2079}; 1995};
@@ -2085,7 +2001,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_gpio2_slaves[] = {
2085static struct omap_hwmod omap3xxx_gpio2_hwmod = { 2001static struct omap_hwmod omap3xxx_gpio2_hwmod = {
2086 .name = "gpio2", 2002 .name = "gpio2",
2087 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 2003 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
2088 .mpu_irqs = omap3xxx_gpio2_irqs, 2004 .mpu_irqs = omap2_gpio2_irqs,
2089 .main_clk = "gpio2_ick", 2005 .main_clk = "gpio2_ick",
2090 .opt_clks = gpio2_opt_clks, 2006 .opt_clks = gpio2_opt_clks,
2091 .opt_clks_cnt = ARRAY_SIZE(gpio2_opt_clks), 2007 .opt_clks_cnt = ARRAY_SIZE(gpio2_opt_clks),
@@ -2106,11 +2022,6 @@ static struct omap_hwmod omap3xxx_gpio2_hwmod = {
2106}; 2022};
2107 2023
2108/* gpio3 */ 2024/* gpio3 */
2109static struct omap_hwmod_irq_info omap3xxx_gpio3_irqs[] = {
2110 { .irq = 31 }, /* INT_34XX_GPIO_BANK3 */
2111 { .irq = -1 }
2112};
2113
2114static struct omap_hwmod_opt_clk gpio3_opt_clks[] = { 2025static struct omap_hwmod_opt_clk gpio3_opt_clks[] = {
2115 { .role = "dbclk", .clk = "gpio3_dbck", }, 2026 { .role = "dbclk", .clk = "gpio3_dbck", },
2116}; 2027};
@@ -2122,7 +2033,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_gpio3_slaves[] = {
2122static struct omap_hwmod omap3xxx_gpio3_hwmod = { 2033static struct omap_hwmod omap3xxx_gpio3_hwmod = {
2123 .name = "gpio3", 2034 .name = "gpio3",
2124 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 2035 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
2125 .mpu_irqs = omap3xxx_gpio3_irqs, 2036 .mpu_irqs = omap2_gpio3_irqs,
2126 .main_clk = "gpio3_ick", 2037 .main_clk = "gpio3_ick",
2127 .opt_clks = gpio3_opt_clks, 2038 .opt_clks = gpio3_opt_clks,
2128 .opt_clks_cnt = ARRAY_SIZE(gpio3_opt_clks), 2039 .opt_clks_cnt = ARRAY_SIZE(gpio3_opt_clks),
@@ -2143,11 +2054,6 @@ static struct omap_hwmod omap3xxx_gpio3_hwmod = {
2143}; 2054};
2144 2055
2145/* gpio4 */ 2056/* gpio4 */
2146static struct omap_hwmod_irq_info omap3xxx_gpio4_irqs[] = {
2147 { .irq = 32 }, /* INT_34XX_GPIO_BANK4 */
2148 { .irq = -1 }
2149};
2150
2151static struct omap_hwmod_opt_clk gpio4_opt_clks[] = { 2057static struct omap_hwmod_opt_clk gpio4_opt_clks[] = {
2152 { .role = "dbclk", .clk = "gpio4_dbck", }, 2058 { .role = "dbclk", .clk = "gpio4_dbck", },
2153}; 2059};
@@ -2159,7 +2065,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_gpio4_slaves[] = {
2159static struct omap_hwmod omap3xxx_gpio4_hwmod = { 2065static struct omap_hwmod omap3xxx_gpio4_hwmod = {
2160 .name = "gpio4", 2066 .name = "gpio4",
2161 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, 2067 .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
2162 .mpu_irqs = omap3xxx_gpio4_irqs, 2068 .mpu_irqs = omap2_gpio4_irqs,
2163 .main_clk = "gpio4_ick", 2069 .main_clk = "gpio4_ick",
2164 .opt_clks = gpio4_opt_clks, 2070 .opt_clks = gpio4_opt_clks,
2165 .opt_clks_cnt = ARRAY_SIZE(gpio4_opt_clks), 2071 .opt_clks_cnt = ARRAY_SIZE(gpio4_opt_clks),
@@ -2287,14 +2193,6 @@ static struct omap_hwmod_class omap3xxx_dma_hwmod_class = {
2287}; 2193};
2288 2194
2289/* dma_system */ 2195/* dma_system */
2290static struct omap_hwmod_irq_info omap3xxx_dma_system_irqs[] = {
2291 { .name = "0", .irq = 12 }, /* INT_24XX_SDMA_IRQ0 */
2292 { .name = "1", .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */
2293 { .name = "2", .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */
2294 { .name = "3", .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */
2295 { .irq = -1 }
2296};
2297
2298static struct omap_hwmod_addr_space omap3xxx_dma_system_addrs[] = { 2196static struct omap_hwmod_addr_space omap3xxx_dma_system_addrs[] = {
2299 { 2197 {
2300 .pa_start = 0x48056000, 2198 .pa_start = 0x48056000,
@@ -2326,7 +2224,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_dma_system_slaves[] = {
2326static struct omap_hwmod omap3xxx_dma_system_hwmod = { 2224static struct omap_hwmod omap3xxx_dma_system_hwmod = {
2327 .name = "dma", 2225 .name = "dma",
2328 .class = &omap3xxx_dma_hwmod_class, 2226 .class = &omap3xxx_dma_hwmod_class,
2329 .mpu_irqs = omap3xxx_dma_system_irqs, 2227 .mpu_irqs = omap2_dma_system_irqs,
2330 .main_clk = "core_l3_ick", 2228 .main_clk = "core_l3_ick",
2331 .prcm = { 2229 .prcm = {
2332 .omap2 = { 2230 .omap2 = {
@@ -3044,11 +2942,6 @@ static struct omap_hwmod_class omap34xx_mcspi_class = {
3044}; 2942};
3045 2943
3046/* mcspi1 */ 2944/* mcspi1 */
3047static struct omap_hwmod_irq_info omap34xx_mcspi1_mpu_irqs[] = {
3048 { .name = "irq", .irq = 65 },
3049 { .irq = -1 }
3050};
3051
3052static struct omap_hwmod_dma_info omap34xx_mcspi1_sdma_reqs[] = { 2945static struct omap_hwmod_dma_info omap34xx_mcspi1_sdma_reqs[] = {
3053 { .name = "tx0", .dma_req = 35 }, 2946 { .name = "tx0", .dma_req = 35 },
3054 { .name = "rx0", .dma_req = 36 }, 2947 { .name = "rx0", .dma_req = 36 },
@@ -3070,7 +2963,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
3070 2963
3071static struct omap_hwmod omap34xx_mcspi1 = { 2964static struct omap_hwmod omap34xx_mcspi1 = {
3072 .name = "mcspi1", 2965 .name = "mcspi1",
3073 .mpu_irqs = omap34xx_mcspi1_mpu_irqs, 2966 .mpu_irqs = omap2_mcspi1_mpu_irqs,
3074 .sdma_reqs = omap34xx_mcspi1_sdma_reqs, 2967 .sdma_reqs = omap34xx_mcspi1_sdma_reqs,
3075 .sdma_reqs_cnt = ARRAY_SIZE(omap34xx_mcspi1_sdma_reqs), 2968 .sdma_reqs_cnt = ARRAY_SIZE(omap34xx_mcspi1_sdma_reqs),
3076 .main_clk = "mcspi1_fck", 2969 .main_clk = "mcspi1_fck",
@@ -3091,11 +2984,6 @@ static struct omap_hwmod omap34xx_mcspi1 = {
3091}; 2984};
3092 2985
3093/* mcspi2 */ 2986/* mcspi2 */
3094static struct omap_hwmod_irq_info omap34xx_mcspi2_mpu_irqs[] = {
3095 { .name = "irq", .irq = 66 },
3096 { .irq = -1 }
3097};
3098
3099static struct omap_hwmod_dma_info omap34xx_mcspi2_sdma_reqs[] = { 2987static struct omap_hwmod_dma_info omap34xx_mcspi2_sdma_reqs[] = {
3100 { .name = "tx0", .dma_req = 43 }, 2988 { .name = "tx0", .dma_req = 43 },
3101 { .name = "rx0", .dma_req = 44 }, 2989 { .name = "rx0", .dma_req = 44 },
@@ -3113,7 +3001,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
3113 3001
3114static struct omap_hwmod omap34xx_mcspi2 = { 3002static struct omap_hwmod omap34xx_mcspi2 = {
3115 .name = "mcspi2", 3003 .name = "mcspi2",
3116 .mpu_irqs = omap34xx_mcspi2_mpu_irqs, 3004 .mpu_irqs = omap2_mcspi2_mpu_irqs,
3117 .sdma_reqs = omap34xx_mcspi2_sdma_reqs, 3005 .sdma_reqs = omap34xx_mcspi2_sdma_reqs,
3118 .sdma_reqs_cnt = ARRAY_SIZE(omap34xx_mcspi2_sdma_reqs), 3006 .sdma_reqs_cnt = ARRAY_SIZE(omap34xx_mcspi2_sdma_reqs),
3119 .main_clk = "mcspi2_fck", 3007 .main_clk = "mcspi2_fck",
diff --git a/arch/arm/mach-omap2/omap_hwmod_common_data.h b/arch/arm/mach-omap2/omap_hwmod_common_data.h
index 76a2f11e5f4e..1ac878c46af3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_common_data.h
+++ b/arch/arm/mach-omap2/omap_hwmod_common_data.h
@@ -49,6 +49,35 @@ extern struct omap_hwmod_addr_space omap2_dma_system_addrs[];
49extern struct omap_hwmod_addr_space omap2_mailbox_addrs[]; 49extern struct omap_hwmod_addr_space omap2_mailbox_addrs[];
50extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[]; 50extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[];
51 51
52/* Common IP block data across OMAP2xxx */
53extern struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[];
54
55/* Common IP block data across OMAP2/3 */
56extern struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[];
57extern struct omap_hwmod_irq_info omap2_timer2_mpu_irqs[];
58extern struct omap_hwmod_irq_info omap2_timer3_mpu_irqs[];
59extern struct omap_hwmod_irq_info omap2_timer4_mpu_irqs[];
60extern struct omap_hwmod_irq_info omap2_timer5_mpu_irqs[];
61extern struct omap_hwmod_irq_info omap2_timer6_mpu_irqs[];
62extern struct omap_hwmod_irq_info omap2_timer7_mpu_irqs[];
63extern struct omap_hwmod_irq_info omap2_timer8_mpu_irqs[];
64extern struct omap_hwmod_irq_info omap2_timer9_mpu_irqs[];
65extern struct omap_hwmod_irq_info omap2_timer10_mpu_irqs[];
66extern struct omap_hwmod_irq_info omap2_timer11_mpu_irqs[];
67extern struct omap_hwmod_irq_info omap2_uart1_mpu_irqs[];
68extern struct omap_hwmod_irq_info omap2_uart2_mpu_irqs[];
69extern struct omap_hwmod_irq_info omap2_uart3_mpu_irqs[];
70extern struct omap_hwmod_irq_info omap2_dispc_irqs[];
71extern struct omap_hwmod_irq_info omap2_i2c1_mpu_irqs[];
72extern struct omap_hwmod_irq_info omap2_i2c2_mpu_irqs[];
73extern struct omap_hwmod_irq_info omap2_gpio1_irqs[];
74extern struct omap_hwmod_irq_info omap2_gpio2_irqs[];
75extern struct omap_hwmod_irq_info omap2_gpio3_irqs[];
76extern struct omap_hwmod_irq_info omap2_gpio4_irqs[];
77extern struct omap_hwmod_irq_info omap2_dma_system_irqs[];
78extern struct omap_hwmod_irq_info omap2_mcspi1_mpu_irqs[];
79extern struct omap_hwmod_irq_info omap2_mcspi2_mpu_irqs[];
80
52/* OMAP hwmod classes - forward declarations */ 81/* OMAP hwmod classes - forward declarations */
53extern struct omap_hwmod_class l3_hwmod_class; 82extern struct omap_hwmod_class l3_hwmod_class;
54extern struct omap_hwmod_class l4_hwmod_class; 83extern struct omap_hwmod_class l4_hwmod_class;