diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-04-19 06:04:34 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-04-19 06:25:06 -0400 |
commit | 6a29755fd7b92dc58908826f8d570a20a07a6fce (patch) | |
tree | 95fe09a59217b082db9575bab222d531786eedee /arch/arm/mach-omap2/omap_hwmod_2430_data.c | |
parent | cb48427ef7ee274528bf0132bb69a7ca378dc9d2 (diff) |
ARM: OMAP2xxx: hwmod data: share common interface data
Several struct omap_hwmod_ocp_if records can be shared between OMAP2420
and OMAP2430. Move these shared records out of the chip-specific files
into mach-omap2/omap_hwmod_2xxx_interconnect_data.c. This should save some
memory and source lines, at the cost of readability.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: BenoƮt Cousson <b-cousson@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2430_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2430_data.c | 256 |
1 files changed, 21 insertions, 235 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index 8b04938d3edb..23ca551b70bb 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c | |||
@@ -524,32 +524,6 @@ static struct omap_hwmod omap2430_mmc2_hwmod = { | |||
524 | */ | 524 | */ |
525 | 525 | ||
526 | /* L3 -> L4_CORE interface */ | 526 | /* L3 -> L4_CORE interface */ |
527 | static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = { | ||
528 | .master = &omap2xxx_l3_main_hwmod, | ||
529 | .slave = &omap2xxx_l4_core_hwmod, | ||
530 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
531 | }; | ||
532 | |||
533 | /* MPU -> L3 interface */ | ||
534 | static struct omap_hwmod_ocp_if omap2430_mpu__l3_main = { | ||
535 | .master = &omap2xxx_mpu_hwmod, | ||
536 | .slave = &omap2xxx_l3_main_hwmod, | ||
537 | .user = OCP_USER_MPU, | ||
538 | }; | ||
539 | |||
540 | /* DSS -> l3 */ | ||
541 | static struct omap_hwmod_ocp_if omap2430_dss__l3 = { | ||
542 | .master = &omap2xxx_dss_core_hwmod, | ||
543 | .slave = &omap2xxx_l3_main_hwmod, | ||
544 | .fw = { | ||
545 | .omap2 = { | ||
546 | .l3_perm_bit = OMAP2_L3_CORE_FW_CONNID_DSS, | ||
547 | .flags = OMAP_FIREWALL_L3, | ||
548 | } | ||
549 | }, | ||
550 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
551 | }; | ||
552 | |||
553 | /* l3_core -> usbhsotg interface */ | 527 | /* l3_core -> usbhsotg interface */ |
554 | static struct omap_hwmod_ocp_if omap2430_usbhsotg__l3 = { | 528 | static struct omap_hwmod_ocp_if omap2430_usbhsotg__l3 = { |
555 | .master = &omap2430_usbhsotg_hwmod, | 529 | .master = &omap2430_usbhsotg_hwmod, |
@@ -576,40 +550,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = { | |||
576 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 550 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
577 | }; | 551 | }; |
578 | 552 | ||
579 | /* L4_CORE -> L4_WKUP interface */ | ||
580 | static struct omap_hwmod_ocp_if omap2430_l4_core__l4_wkup = { | ||
581 | .master = &omap2xxx_l4_core_hwmod, | ||
582 | .slave = &omap2xxx_l4_wkup_hwmod, | ||
583 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
584 | }; | ||
585 | |||
586 | /* L4 CORE -> UART1 interface */ | ||
587 | static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = { | ||
588 | .master = &omap2xxx_l4_core_hwmod, | ||
589 | .slave = &omap2xxx_uart1_hwmod, | ||
590 | .clk = "uart1_ick", | ||
591 | .addr = omap2xxx_uart1_addr_space, | ||
592 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
593 | }; | ||
594 | |||
595 | /* L4 CORE -> UART2 interface */ | ||
596 | static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = { | ||
597 | .master = &omap2xxx_l4_core_hwmod, | ||
598 | .slave = &omap2xxx_uart2_hwmod, | ||
599 | .clk = "uart2_ick", | ||
600 | .addr = omap2xxx_uart2_addr_space, | ||
601 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
602 | }; | ||
603 | |||
604 | /* L4 PER -> UART3 interface */ | ||
605 | static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = { | ||
606 | .master = &omap2xxx_l4_core_hwmod, | ||
607 | .slave = &omap2xxx_uart3_hwmod, | ||
608 | .clk = "uart3_ick", | ||
609 | .addr = omap2xxx_uart3_addr_space, | ||
610 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
611 | }; | ||
612 | |||
613 | static struct omap_hwmod_addr_space omap2430_usbhsotg_addrs[] = { | 553 | static struct omap_hwmod_addr_space omap2430_usbhsotg_addrs[] = { |
614 | { | 554 | { |
615 | .pa_start = OMAP243X_HS_BASE, | 555 | .pa_start = OMAP243X_HS_BASE, |
@@ -646,24 +586,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mmc2 = { | |||
646 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 586 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
647 | }; | 587 | }; |
648 | 588 | ||
649 | /* l4 core -> mcspi1 interface */ | ||
650 | static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = { | ||
651 | .master = &omap2xxx_l4_core_hwmod, | ||
652 | .slave = &omap2xxx_mcspi1_hwmod, | ||
653 | .clk = "mcspi1_ick", | ||
654 | .addr = omap2_mcspi1_addr_space, | ||
655 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
656 | }; | ||
657 | |||
658 | /* l4 core -> mcspi2 interface */ | ||
659 | static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = { | ||
660 | .master = &omap2xxx_l4_core_hwmod, | ||
661 | .slave = &omap2xxx_mcspi2_hwmod, | ||
662 | .clk = "mcspi2_ick", | ||
663 | .addr = omap2_mcspi2_addr_space, | ||
664 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
665 | }; | ||
666 | |||
667 | /* l4 core -> mcspi3 interface */ | 589 | /* l4 core -> mcspi3 interface */ |
668 | static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = { | 590 | static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = { |
669 | .master = &omap2xxx_l4_core_hwmod, | 591 | .master = &omap2xxx_l4_core_hwmod, |
@@ -699,105 +621,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__timer1 = { | |||
699 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 621 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
700 | }; | 622 | }; |
701 | 623 | ||
702 | /* l4_core -> timer2 */ | ||
703 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer2 = { | ||
704 | .master = &omap2xxx_l4_core_hwmod, | ||
705 | .slave = &omap2xxx_timer2_hwmod, | ||
706 | .clk = "gpt2_ick", | ||
707 | .addr = omap2xxx_timer2_addrs, | ||
708 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
709 | }; | ||
710 | |||
711 | /* l4_core -> timer3 */ | ||
712 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer3 = { | ||
713 | .master = &omap2xxx_l4_core_hwmod, | ||
714 | .slave = &omap2xxx_timer3_hwmod, | ||
715 | .clk = "gpt3_ick", | ||
716 | .addr = omap2xxx_timer3_addrs, | ||
717 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
718 | }; | ||
719 | |||
720 | /* l4_core -> timer4 */ | ||
721 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer4 = { | ||
722 | .master = &omap2xxx_l4_core_hwmod, | ||
723 | .slave = &omap2xxx_timer4_hwmod, | ||
724 | .clk = "gpt4_ick", | ||
725 | .addr = omap2xxx_timer4_addrs, | ||
726 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
727 | }; | ||
728 | |||
729 | /* l4_core -> timer5 */ | ||
730 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer5 = { | ||
731 | .master = &omap2xxx_l4_core_hwmod, | ||
732 | .slave = &omap2xxx_timer5_hwmod, | ||
733 | .clk = "gpt5_ick", | ||
734 | .addr = omap2xxx_timer5_addrs, | ||
735 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
736 | }; | ||
737 | |||
738 | /* l4_core -> timer6 */ | ||
739 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer6 = { | ||
740 | .master = &omap2xxx_l4_core_hwmod, | ||
741 | .slave = &omap2xxx_timer6_hwmod, | ||
742 | .clk = "gpt6_ick", | ||
743 | .addr = omap2xxx_timer6_addrs, | ||
744 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
745 | }; | ||
746 | |||
747 | /* l4_core -> timer7 */ | ||
748 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer7 = { | ||
749 | .master = &omap2xxx_l4_core_hwmod, | ||
750 | .slave = &omap2xxx_timer7_hwmod, | ||
751 | .clk = "gpt7_ick", | ||
752 | .addr = omap2xxx_timer7_addrs, | ||
753 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
754 | }; | ||
755 | |||
756 | /* l4_core -> timer8 */ | ||
757 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer8 = { | ||
758 | .master = &omap2xxx_l4_core_hwmod, | ||
759 | .slave = &omap2xxx_timer8_hwmod, | ||
760 | .clk = "gpt8_ick", | ||
761 | .addr = omap2xxx_timer8_addrs, | ||
762 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
763 | }; | ||
764 | |||
765 | /* l4_core -> timer9 */ | ||
766 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer9 = { | ||
767 | .master = &omap2xxx_l4_core_hwmod, | ||
768 | .slave = &omap2xxx_timer9_hwmod, | ||
769 | .clk = "gpt9_ick", | ||
770 | .addr = omap2xxx_timer9_addrs, | ||
771 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
772 | }; | ||
773 | |||
774 | /* l4_core -> timer10 */ | ||
775 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer10 = { | ||
776 | .master = &omap2xxx_l4_core_hwmod, | ||
777 | .slave = &omap2xxx_timer10_hwmod, | ||
778 | .clk = "gpt10_ick", | ||
779 | .addr = omap2_timer10_addrs, | ||
780 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
781 | }; | ||
782 | |||
783 | /* l4_core -> timer11 */ | ||
784 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer11 = { | ||
785 | .master = &omap2xxx_l4_core_hwmod, | ||
786 | .slave = &omap2xxx_timer11_hwmod, | ||
787 | .clk = "gpt11_ick", | ||
788 | .addr = omap2_timer11_addrs, | ||
789 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
790 | }; | ||
791 | |||
792 | /* l4_core -> timer12 */ | ||
793 | static struct omap_hwmod_ocp_if omap2430_l4_core__timer12 = { | ||
794 | .master = &omap2xxx_l4_core_hwmod, | ||
795 | .slave = &omap2xxx_timer12_hwmod, | ||
796 | .clk = "gpt12_ick", | ||
797 | .addr = omap2xxx_timer12_addrs, | ||
798 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
799 | }; | ||
800 | |||
801 | /* l4_wkup -> wd_timer2 */ | 624 | /* l4_wkup -> wd_timer2 */ |
802 | static struct omap_hwmod_addr_space omap2430_wd_timer2_addrs[] = { | 625 | static struct omap_hwmod_addr_space omap2430_wd_timer2_addrs[] = { |
803 | { | 626 | { |
@@ -816,43 +639,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = { | |||
816 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 639 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
817 | }; | 640 | }; |
818 | 641 | ||
819 | /* l4_core -> dss */ | ||
820 | static struct omap_hwmod_ocp_if omap2430_l4_core__dss = { | ||
821 | .master = &omap2xxx_l4_core_hwmod, | ||
822 | .slave = &omap2xxx_dss_core_hwmod, | ||
823 | .clk = "dss_ick", | ||
824 | .addr = omap2_dss_addrs, | ||
825 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
826 | }; | ||
827 | |||
828 | /* l4_core -> dss_dispc */ | ||
829 | static struct omap_hwmod_ocp_if omap2430_l4_core__dss_dispc = { | ||
830 | .master = &omap2xxx_l4_core_hwmod, | ||
831 | .slave = &omap2xxx_dss_dispc_hwmod, | ||
832 | .clk = "dss_ick", | ||
833 | .addr = omap2_dss_dispc_addrs, | ||
834 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
835 | }; | ||
836 | |||
837 | /* l4_core -> dss_rfbi */ | ||
838 | static struct omap_hwmod_ocp_if omap2430_l4_core__dss_rfbi = { | ||
839 | .master = &omap2xxx_l4_core_hwmod, | ||
840 | .slave = &omap2xxx_dss_rfbi_hwmod, | ||
841 | .clk = "dss_ick", | ||
842 | .addr = omap2_dss_rfbi_addrs, | ||
843 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
844 | }; | ||
845 | |||
846 | /* l4_core -> dss_venc */ | ||
847 | static struct omap_hwmod_ocp_if omap2430_l4_core__dss_venc = { | ||
848 | .master = &omap2xxx_l4_core_hwmod, | ||
849 | .slave = &omap2xxx_dss_venc_hwmod, | ||
850 | .clk = "dss_ick", | ||
851 | .addr = omap2_dss_venc_addrs, | ||
852 | .flags = OCPIF_SWSUP_IDLE, | ||
853 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
854 | }; | ||
855 | |||
856 | /* l4_wkup -> gpio1 */ | 642 | /* l4_wkup -> gpio1 */ |
857 | static struct omap_hwmod_addr_space omap2430_gpio1_addr_space[] = { | 643 | static struct omap_hwmod_addr_space omap2430_gpio1_addr_space[] = { |
858 | { | 644 | { |
@@ -1044,40 +830,40 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp5 = { | |||
1044 | }; | 830 | }; |
1045 | 831 | ||
1046 | static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = { | 832 | static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = { |
1047 | &omap2430_l3_main__l4_core, | 833 | &omap2xxx_l3_main__l4_core, |
1048 | &omap2430_mpu__l3_main, | 834 | &omap2xxx_mpu__l3_main, |
1049 | &omap2430_dss__l3, | 835 | &omap2xxx_dss__l3, |
1050 | &omap2430_usbhsotg__l3, | 836 | &omap2430_usbhsotg__l3, |
1051 | &omap2430_l4_core__i2c1, | 837 | &omap2430_l4_core__i2c1, |
1052 | &omap2430_l4_core__i2c2, | 838 | &omap2430_l4_core__i2c2, |
1053 | &omap2430_l4_core__l4_wkup, | 839 | &omap2xxx_l4_core__l4_wkup, |
1054 | &omap2_l4_core__uart1, | 840 | &omap2_l4_core__uart1, |
1055 | &omap2_l4_core__uart2, | 841 | &omap2_l4_core__uart2, |
1056 | &omap2_l4_core__uart3, | 842 | &omap2_l4_core__uart3, |
1057 | &omap2430_l4_core__usbhsotg, | 843 | &omap2430_l4_core__usbhsotg, |
1058 | &omap2430_l4_core__mmc1, | 844 | &omap2430_l4_core__mmc1, |
1059 | &omap2430_l4_core__mmc2, | 845 | &omap2430_l4_core__mmc2, |
1060 | &omap2430_l4_core__mcspi1, | 846 | &omap2xxx_l4_core__mcspi1, |
1061 | &omap2430_l4_core__mcspi2, | 847 | &omap2xxx_l4_core__mcspi2, |
1062 | &omap2430_l4_core__mcspi3, | 848 | &omap2430_l4_core__mcspi3, |
1063 | &omap2430_l3__iva, | 849 | &omap2430_l3__iva, |
1064 | &omap2430_l4_wkup__timer1, | 850 | &omap2430_l4_wkup__timer1, |
1065 | &omap2430_l4_core__timer2, | 851 | &omap2xxx_l4_core__timer2, |
1066 | &omap2430_l4_core__timer3, | 852 | &omap2xxx_l4_core__timer3, |
1067 | &omap2430_l4_core__timer4, | 853 | &omap2xxx_l4_core__timer4, |
1068 | &omap2430_l4_core__timer5, | 854 | &omap2xxx_l4_core__timer5, |
1069 | &omap2430_l4_core__timer6, | 855 | &omap2xxx_l4_core__timer6, |
1070 | &omap2430_l4_core__timer7, | 856 | &omap2xxx_l4_core__timer7, |
1071 | &omap2430_l4_core__timer8, | 857 | &omap2xxx_l4_core__timer8, |
1072 | &omap2430_l4_core__timer9, | 858 | &omap2xxx_l4_core__timer9, |
1073 | &omap2430_l4_core__timer10, | 859 | &omap2xxx_l4_core__timer10, |
1074 | &omap2430_l4_core__timer11, | 860 | &omap2xxx_l4_core__timer11, |
1075 | &omap2430_l4_core__timer12, | 861 | &omap2xxx_l4_core__timer12, |
1076 | &omap2430_l4_wkup__wd_timer2, | 862 | &omap2430_l4_wkup__wd_timer2, |
1077 | &omap2430_l4_core__dss, | 863 | &omap2xxx_l4_core__dss, |
1078 | &omap2430_l4_core__dss_dispc, | 864 | &omap2xxx_l4_core__dss_dispc, |
1079 | &omap2430_l4_core__dss_rfbi, | 865 | &omap2xxx_l4_core__dss_rfbi, |
1080 | &omap2430_l4_core__dss_venc, | 866 | &omap2xxx_l4_core__dss_venc, |
1081 | &omap2430_l4_wkup__gpio1, | 867 | &omap2430_l4_wkup__gpio1, |
1082 | &omap2430_l4_wkup__gpio2, | 868 | &omap2430_l4_wkup__gpio2, |
1083 | &omap2430_l4_wkup__gpio3, | 869 | &omap2430_l4_wkup__gpio3, |