diff options
author | Paul Walmsley <paul@pwsan.com> | 2011-09-14 19:23:19 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2011-09-14 19:23:19 -0400 |
commit | d6504acd2125984c61dce24727dd3842d0144015 (patch) | |
tree | 8775088801266bebf063a707eaf987051306cdf3 /arch/arm/mach-omap2/omap_hwmod_2420_data.c | |
parent | 8179488a36985d4929cf89be5d9171145a769511 (diff) |
OMAP2+: hwmod: remove OMAP_CHIP*
At Tony's request, remove the OMAP_CHIP* flags from the hwmod data, and
replace it instead with chip family, variant, and ES level-specific lists
of hwmods to register.
Thanks to Gražvydas Ignotas <notasas@gmail.com> for finding a bug in the
AM3517/3505 support, and for other review comments.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Gražvydas Ignotas <notasas@gmail.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2420_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2420_data.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index a015c69068f..b6ea69a5c2f 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c | |||
@@ -100,7 +100,6 @@ static struct omap_hwmod omap2420_l3_main_hwmod = { | |||
100 | .masters_cnt = ARRAY_SIZE(omap2420_l3_main_masters), | 100 | .masters_cnt = ARRAY_SIZE(omap2420_l3_main_masters), |
101 | .slaves = omap2420_l3_main_slaves, | 101 | .slaves = omap2420_l3_main_slaves, |
102 | .slaves_cnt = ARRAY_SIZE(omap2420_l3_main_slaves), | 102 | .slaves_cnt = ARRAY_SIZE(omap2420_l3_main_slaves), |
103 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
104 | .flags = HWMOD_NO_IDLEST, | 103 | .flags = HWMOD_NO_IDLEST, |
105 | }; | 104 | }; |
106 | 105 | ||
@@ -206,7 +205,6 @@ static struct omap_hwmod omap2420_l4_core_hwmod = { | |||
206 | .masters_cnt = ARRAY_SIZE(omap2420_l4_core_masters), | 205 | .masters_cnt = ARRAY_SIZE(omap2420_l4_core_masters), |
207 | .slaves = omap2420_l4_core_slaves, | 206 | .slaves = omap2420_l4_core_slaves, |
208 | .slaves_cnt = ARRAY_SIZE(omap2420_l4_core_slaves), | 207 | .slaves_cnt = ARRAY_SIZE(omap2420_l4_core_slaves), |
209 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
210 | .flags = HWMOD_NO_IDLEST, | 208 | .flags = HWMOD_NO_IDLEST, |
211 | }; | 209 | }; |
212 | 210 | ||
@@ -227,7 +225,6 @@ static struct omap_hwmod omap2420_l4_wkup_hwmod = { | |||
227 | .masters_cnt = ARRAY_SIZE(omap2420_l4_wkup_masters), | 225 | .masters_cnt = ARRAY_SIZE(omap2420_l4_wkup_masters), |
228 | .slaves = omap2420_l4_wkup_slaves, | 226 | .slaves = omap2420_l4_wkup_slaves, |
229 | .slaves_cnt = ARRAY_SIZE(omap2420_l4_wkup_slaves), | 227 | .slaves_cnt = ARRAY_SIZE(omap2420_l4_wkup_slaves), |
230 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
231 | .flags = HWMOD_NO_IDLEST, | 228 | .flags = HWMOD_NO_IDLEST, |
232 | }; | 229 | }; |
233 | 230 | ||
@@ -243,7 +240,6 @@ static struct omap_hwmod omap2420_mpu_hwmod = { | |||
243 | .main_clk = "mpu_ck", | 240 | .main_clk = "mpu_ck", |
244 | .masters = omap2420_mpu_masters, | 241 | .masters = omap2420_mpu_masters, |
245 | .masters_cnt = ARRAY_SIZE(omap2420_mpu_masters), | 242 | .masters_cnt = ARRAY_SIZE(omap2420_mpu_masters), |
246 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
247 | }; | 243 | }; |
248 | 244 | ||
249 | /* | 245 | /* |
@@ -271,7 +267,6 @@ static struct omap_hwmod omap2420_iva_hwmod = { | |||
271 | .class = &iva_hwmod_class, | 267 | .class = &iva_hwmod_class, |
272 | .masters = omap2420_iva_masters, | 268 | .masters = omap2420_iva_masters, |
273 | .masters_cnt = ARRAY_SIZE(omap2420_iva_masters), | 269 | .masters_cnt = ARRAY_SIZE(omap2420_iva_masters), |
274 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
275 | }; | 270 | }; |
276 | 271 | ||
277 | /* timer1 */ | 272 | /* timer1 */ |
@@ -317,7 +312,6 @@ static struct omap_hwmod omap2420_timer1_hwmod = { | |||
317 | .slaves = omap2420_timer1_slaves, | 312 | .slaves = omap2420_timer1_slaves, |
318 | .slaves_cnt = ARRAY_SIZE(omap2420_timer1_slaves), | 313 | .slaves_cnt = ARRAY_SIZE(omap2420_timer1_slaves), |
319 | .class = &omap2xxx_timer_hwmod_class, | 314 | .class = &omap2xxx_timer_hwmod_class, |
320 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
321 | }; | 315 | }; |
322 | 316 | ||
323 | /* timer2 */ | 317 | /* timer2 */ |
@@ -354,7 +348,6 @@ static struct omap_hwmod omap2420_timer2_hwmod = { | |||
354 | .slaves = omap2420_timer2_slaves, | 348 | .slaves = omap2420_timer2_slaves, |
355 | .slaves_cnt = ARRAY_SIZE(omap2420_timer2_slaves), | 349 | .slaves_cnt = ARRAY_SIZE(omap2420_timer2_slaves), |
356 | .class = &omap2xxx_timer_hwmod_class, | 350 | .class = &omap2xxx_timer_hwmod_class, |
357 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
358 | }; | 351 | }; |
359 | 352 | ||
360 | /* timer3 */ | 353 | /* timer3 */ |
@@ -391,7 +384,6 @@ static struct omap_hwmod omap2420_timer3_hwmod = { | |||
391 | .slaves = omap2420_timer3_slaves, | 384 | .slaves = omap2420_timer3_slaves, |
392 | .slaves_cnt = ARRAY_SIZE(omap2420_timer3_slaves), | 385 | .slaves_cnt = ARRAY_SIZE(omap2420_timer3_slaves), |
393 | .class = &omap2xxx_timer_hwmod_class, | 386 | .class = &omap2xxx_timer_hwmod_class, |
394 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
395 | }; | 387 | }; |
396 | 388 | ||
397 | /* timer4 */ | 389 | /* timer4 */ |
@@ -428,7 +420,6 @@ static struct omap_hwmod omap2420_timer4_hwmod = { | |||
428 | .slaves = omap2420_timer4_slaves, | 420 | .slaves = omap2420_timer4_slaves, |
429 | .slaves_cnt = ARRAY_SIZE(omap2420_timer4_slaves), | 421 | .slaves_cnt = ARRAY_SIZE(omap2420_timer4_slaves), |
430 | .class = &omap2xxx_timer_hwmod_class, | 422 | .class = &omap2xxx_timer_hwmod_class, |
431 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
432 | }; | 423 | }; |
433 | 424 | ||
434 | /* timer5 */ | 425 | /* timer5 */ |
@@ -465,7 +456,6 @@ static struct omap_hwmod omap2420_timer5_hwmod = { | |||
465 | .slaves = omap2420_timer5_slaves, | 456 | .slaves = omap2420_timer5_slaves, |
466 | .slaves_cnt = ARRAY_SIZE(omap2420_timer5_slaves), | 457 | .slaves_cnt = ARRAY_SIZE(omap2420_timer5_slaves), |
467 | .class = &omap2xxx_timer_hwmod_class, | 458 | .class = &omap2xxx_timer_hwmod_class, |
468 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
469 | }; | 459 | }; |
470 | 460 | ||
471 | 461 | ||
@@ -503,7 +493,6 @@ static struct omap_hwmod omap2420_timer6_hwmod = { | |||
503 | .slaves = omap2420_timer6_slaves, | 493 | .slaves = omap2420_timer6_slaves, |
504 | .slaves_cnt = ARRAY_SIZE(omap2420_timer6_slaves), | 494 | .slaves_cnt = ARRAY_SIZE(omap2420_timer6_slaves), |
505 | .class = &omap2xxx_timer_hwmod_class, | 495 | .class = &omap2xxx_timer_hwmod_class, |
506 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
507 | }; | 496 | }; |
508 | 497 | ||
509 | /* timer7 */ | 498 | /* timer7 */ |
@@ -540,7 +529,6 @@ static struct omap_hwmod omap2420_timer7_hwmod = { | |||
540 | .slaves = omap2420_timer7_slaves, | 529 | .slaves = omap2420_timer7_slaves, |
541 | .slaves_cnt = ARRAY_SIZE(omap2420_timer7_slaves), | 530 | .slaves_cnt = ARRAY_SIZE(omap2420_timer7_slaves), |
542 | .class = &omap2xxx_timer_hwmod_class, | 531 | .class = &omap2xxx_timer_hwmod_class, |
543 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
544 | }; | 532 | }; |
545 | 533 | ||
546 | /* timer8 */ | 534 | /* timer8 */ |
@@ -577,7 +565,6 @@ static struct omap_hwmod omap2420_timer8_hwmod = { | |||
577 | .slaves = omap2420_timer8_slaves, | 565 | .slaves = omap2420_timer8_slaves, |
578 | .slaves_cnt = ARRAY_SIZE(omap2420_timer8_slaves), | 566 | .slaves_cnt = ARRAY_SIZE(omap2420_timer8_slaves), |
579 | .class = &omap2xxx_timer_hwmod_class, | 567 | .class = &omap2xxx_timer_hwmod_class, |
580 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
581 | }; | 568 | }; |
582 | 569 | ||
583 | /* timer9 */ | 570 | /* timer9 */ |
@@ -614,7 +601,6 @@ static struct omap_hwmod omap2420_timer9_hwmod = { | |||
614 | .slaves = omap2420_timer9_slaves, | 601 | .slaves = omap2420_timer9_slaves, |
615 | .slaves_cnt = ARRAY_SIZE(omap2420_timer9_slaves), | 602 | .slaves_cnt = ARRAY_SIZE(omap2420_timer9_slaves), |
616 | .class = &omap2xxx_timer_hwmod_class, | 603 | .class = &omap2xxx_timer_hwmod_class, |
617 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
618 | }; | 604 | }; |
619 | 605 | ||
620 | /* timer10 */ | 606 | /* timer10 */ |
@@ -651,7 +637,6 @@ static struct omap_hwmod omap2420_timer10_hwmod = { | |||
651 | .slaves = omap2420_timer10_slaves, | 637 | .slaves = omap2420_timer10_slaves, |
652 | .slaves_cnt = ARRAY_SIZE(omap2420_timer10_slaves), | 638 | .slaves_cnt = ARRAY_SIZE(omap2420_timer10_slaves), |
653 | .class = &omap2xxx_timer_hwmod_class, | 639 | .class = &omap2xxx_timer_hwmod_class, |
654 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
655 | }; | 640 | }; |
656 | 641 | ||
657 | /* timer11 */ | 642 | /* timer11 */ |
@@ -688,7 +673,6 @@ static struct omap_hwmod omap2420_timer11_hwmod = { | |||
688 | .slaves = omap2420_timer11_slaves, | 673 | .slaves = omap2420_timer11_slaves, |
689 | .slaves_cnt = ARRAY_SIZE(omap2420_timer11_slaves), | 674 | .slaves_cnt = ARRAY_SIZE(omap2420_timer11_slaves), |
690 | .class = &omap2xxx_timer_hwmod_class, | 675 | .class = &omap2xxx_timer_hwmod_class, |
691 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
692 | }; | 676 | }; |
693 | 677 | ||
694 | /* timer12 */ | 678 | /* timer12 */ |
@@ -725,7 +709,6 @@ static struct omap_hwmod omap2420_timer12_hwmod = { | |||
725 | .slaves = omap2420_timer12_slaves, | 709 | .slaves = omap2420_timer12_slaves, |
726 | .slaves_cnt = ARRAY_SIZE(omap2420_timer12_slaves), | 710 | .slaves_cnt = ARRAY_SIZE(omap2420_timer12_slaves), |
727 | .class = &omap2xxx_timer_hwmod_class, | 711 | .class = &omap2xxx_timer_hwmod_class, |
728 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
729 | }; | 712 | }; |
730 | 713 | ||
731 | /* l4_wkup -> wd_timer2 */ | 714 | /* l4_wkup -> wd_timer2 */ |
@@ -766,7 +749,6 @@ static struct omap_hwmod omap2420_wd_timer2_hwmod = { | |||
766 | }, | 749 | }, |
767 | .slaves = omap2420_wd_timer2_slaves, | 750 | .slaves = omap2420_wd_timer2_slaves, |
768 | .slaves_cnt = ARRAY_SIZE(omap2420_wd_timer2_slaves), | 751 | .slaves_cnt = ARRAY_SIZE(omap2420_wd_timer2_slaves), |
769 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
770 | }; | 752 | }; |
771 | 753 | ||
772 | /* UART1 */ | 754 | /* UART1 */ |
@@ -792,7 +774,6 @@ static struct omap_hwmod omap2420_uart1_hwmod = { | |||
792 | .slaves = omap2420_uart1_slaves, | 774 | .slaves = omap2420_uart1_slaves, |
793 | .slaves_cnt = ARRAY_SIZE(omap2420_uart1_slaves), | 775 | .slaves_cnt = ARRAY_SIZE(omap2420_uart1_slaves), |
794 | .class = &omap2_uart_class, | 776 | .class = &omap2_uart_class, |
795 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
796 | }; | 777 | }; |
797 | 778 | ||
798 | /* UART2 */ | 779 | /* UART2 */ |
@@ -818,7 +799,6 @@ static struct omap_hwmod omap2420_uart2_hwmod = { | |||
818 | .slaves = omap2420_uart2_slaves, | 799 | .slaves = omap2420_uart2_slaves, |
819 | .slaves_cnt = ARRAY_SIZE(omap2420_uart2_slaves), | 800 | .slaves_cnt = ARRAY_SIZE(omap2420_uart2_slaves), |
820 | .class = &omap2_uart_class, | 801 | .class = &omap2_uart_class, |
821 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
822 | }; | 802 | }; |
823 | 803 | ||
824 | /* UART3 */ | 804 | /* UART3 */ |
@@ -844,7 +824,6 @@ static struct omap_hwmod omap2420_uart3_hwmod = { | |||
844 | .slaves = omap2420_uart3_slaves, | 824 | .slaves = omap2420_uart3_slaves, |
845 | .slaves_cnt = ARRAY_SIZE(omap2420_uart3_slaves), | 825 | .slaves_cnt = ARRAY_SIZE(omap2420_uart3_slaves), |
846 | .class = &omap2_uart_class, | 826 | .class = &omap2_uart_class, |
847 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
848 | }; | 827 | }; |
849 | 828 | ||
850 | /* dss */ | 829 | /* dss */ |
@@ -898,7 +877,6 @@ static struct omap_hwmod omap2420_dss_core_hwmod = { | |||
898 | .slaves_cnt = ARRAY_SIZE(omap2420_dss_slaves), | 877 | .slaves_cnt = ARRAY_SIZE(omap2420_dss_slaves), |
899 | .masters = omap2420_dss_masters, | 878 | .masters = omap2420_dss_masters, |
900 | .masters_cnt = ARRAY_SIZE(omap2420_dss_masters), | 879 | .masters_cnt = ARRAY_SIZE(omap2420_dss_masters), |
901 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
902 | .flags = HWMOD_NO_IDLEST, | 880 | .flags = HWMOD_NO_IDLEST, |
903 | }; | 881 | }; |
904 | 882 | ||
@@ -938,7 +916,6 @@ static struct omap_hwmod omap2420_dss_dispc_hwmod = { | |||
938 | }, | 916 | }, |
939 | .slaves = omap2420_dss_dispc_slaves, | 917 | .slaves = omap2420_dss_dispc_slaves, |
940 | .slaves_cnt = ARRAY_SIZE(omap2420_dss_dispc_slaves), | 918 | .slaves_cnt = ARRAY_SIZE(omap2420_dss_dispc_slaves), |
941 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
942 | .flags = HWMOD_NO_IDLEST, | 919 | .flags = HWMOD_NO_IDLEST, |
943 | }; | 920 | }; |
944 | 921 | ||
@@ -975,7 +952,6 @@ static struct omap_hwmod omap2420_dss_rfbi_hwmod = { | |||
975 | }, | 952 | }, |
976 | .slaves = omap2420_dss_rfbi_slaves, | 953 | .slaves = omap2420_dss_rfbi_slaves, |
977 | .slaves_cnt = ARRAY_SIZE(omap2420_dss_rfbi_slaves), | 954 | .slaves_cnt = ARRAY_SIZE(omap2420_dss_rfbi_slaves), |
978 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
979 | .flags = HWMOD_NO_IDLEST, | 955 | .flags = HWMOD_NO_IDLEST, |
980 | }; | 956 | }; |
981 | 957 | ||
@@ -1013,7 +989,6 @@ static struct omap_hwmod omap2420_dss_venc_hwmod = { | |||
1013 | }, | 989 | }, |
1014 | .slaves = omap2420_dss_venc_slaves, | 990 | .slaves = omap2420_dss_venc_slaves, |
1015 | .slaves_cnt = ARRAY_SIZE(omap2420_dss_venc_slaves), | 991 | .slaves_cnt = ARRAY_SIZE(omap2420_dss_venc_slaves), |
1016 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1017 | .flags = HWMOD_NO_IDLEST, | 992 | .flags = HWMOD_NO_IDLEST, |
1018 | }; | 993 | }; |
1019 | 994 | ||
@@ -1064,7 +1039,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = { | |||
1064 | .slaves_cnt = ARRAY_SIZE(omap2420_i2c1_slaves), | 1039 | .slaves_cnt = ARRAY_SIZE(omap2420_i2c1_slaves), |
1065 | .class = &i2c_class, | 1040 | .class = &i2c_class, |
1066 | .dev_attr = &i2c_dev_attr, | 1041 | .dev_attr = &i2c_dev_attr, |
1067 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1068 | .flags = HWMOD_16BIT_REG, | 1042 | .flags = HWMOD_16BIT_REG, |
1069 | }; | 1043 | }; |
1070 | 1044 | ||
@@ -1092,7 +1066,6 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { | |||
1092 | .slaves_cnt = ARRAY_SIZE(omap2420_i2c2_slaves), | 1066 | .slaves_cnt = ARRAY_SIZE(omap2420_i2c2_slaves), |
1093 | .class = &i2c_class, | 1067 | .class = &i2c_class, |
1094 | .dev_attr = &i2c_dev_attr, | 1068 | .dev_attr = &i2c_dev_attr, |
1095 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1096 | .flags = HWMOD_16BIT_REG, | 1069 | .flags = HWMOD_16BIT_REG, |
1097 | }; | 1070 | }; |
1098 | 1071 | ||
@@ -1197,7 +1170,6 @@ static struct omap_hwmod omap2420_gpio1_hwmod = { | |||
1197 | .slaves_cnt = ARRAY_SIZE(omap2420_gpio1_slaves), | 1170 | .slaves_cnt = ARRAY_SIZE(omap2420_gpio1_slaves), |
1198 | .class = &omap2xxx_gpio_hwmod_class, | 1171 | .class = &omap2xxx_gpio_hwmod_class, |
1199 | .dev_attr = &gpio_dev_attr, | 1172 | .dev_attr = &gpio_dev_attr, |
1200 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1201 | }; | 1173 | }; |
1202 | 1174 | ||
1203 | /* gpio2 */ | 1175 | /* gpio2 */ |
@@ -1223,7 +1195,6 @@ static struct omap_hwmod omap2420_gpio2_hwmod = { | |||
1223 | .slaves_cnt = ARRAY_SIZE(omap2420_gpio2_slaves), | 1195 | .slaves_cnt = ARRAY_SIZE(omap2420_gpio2_slaves), |
1224 | .class = &omap2xxx_gpio_hwmod_class, | 1196 | .class = &omap2xxx_gpio_hwmod_class, |
1225 | .dev_attr = &gpio_dev_attr, | 1197 | .dev_attr = &gpio_dev_attr, |
1226 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1227 | }; | 1198 | }; |
1228 | 1199 | ||
1229 | /* gpio3 */ | 1200 | /* gpio3 */ |
@@ -1249,7 +1220,6 @@ static struct omap_hwmod omap2420_gpio3_hwmod = { | |||
1249 | .slaves_cnt = ARRAY_SIZE(omap2420_gpio3_slaves), | 1220 | .slaves_cnt = ARRAY_SIZE(omap2420_gpio3_slaves), |
1250 | .class = &omap2xxx_gpio_hwmod_class, | 1221 | .class = &omap2xxx_gpio_hwmod_class, |
1251 | .dev_attr = &gpio_dev_attr, | 1222 | .dev_attr = &gpio_dev_attr, |
1252 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1253 | }; | 1223 | }; |
1254 | 1224 | ||
1255 | /* gpio4 */ | 1225 | /* gpio4 */ |
@@ -1275,7 +1245,6 @@ static struct omap_hwmod omap2420_gpio4_hwmod = { | |||
1275 | .slaves_cnt = ARRAY_SIZE(omap2420_gpio4_slaves), | 1245 | .slaves_cnt = ARRAY_SIZE(omap2420_gpio4_slaves), |
1276 | .class = &omap2xxx_gpio_hwmod_class, | 1246 | .class = &omap2xxx_gpio_hwmod_class, |
1277 | .dev_attr = &gpio_dev_attr, | 1247 | .dev_attr = &gpio_dev_attr, |
1278 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1279 | }; | 1248 | }; |
1280 | 1249 | ||
1281 | /* dma attributes */ | 1250 | /* dma attributes */ |
@@ -1322,7 +1291,6 @@ static struct omap_hwmod omap2420_dma_system_hwmod = { | |||
1322 | .masters = omap2420_dma_system_masters, | 1291 | .masters = omap2420_dma_system_masters, |
1323 | .masters_cnt = ARRAY_SIZE(omap2420_dma_system_masters), | 1292 | .masters_cnt = ARRAY_SIZE(omap2420_dma_system_masters), |
1324 | .dev_attr = &dma_dev_attr, | 1293 | .dev_attr = &dma_dev_attr, |
1325 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1326 | .flags = HWMOD_NO_IDLEST, | 1294 | .flags = HWMOD_NO_IDLEST, |
1327 | }; | 1295 | }; |
1328 | 1296 | ||
@@ -1363,7 +1331,6 @@ static struct omap_hwmod omap2420_mailbox_hwmod = { | |||
1363 | }, | 1331 | }, |
1364 | .slaves = omap2420_mailbox_slaves, | 1332 | .slaves = omap2420_mailbox_slaves, |
1365 | .slaves_cnt = ARRAY_SIZE(omap2420_mailbox_slaves), | 1333 | .slaves_cnt = ARRAY_SIZE(omap2420_mailbox_slaves), |
1366 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1367 | }; | 1334 | }; |
1368 | 1335 | ||
1369 | /* mcspi1 */ | 1336 | /* mcspi1 */ |
@@ -1393,7 +1360,6 @@ static struct omap_hwmod omap2420_mcspi1_hwmod = { | |||
1393 | .slaves_cnt = ARRAY_SIZE(omap2420_mcspi1_slaves), | 1360 | .slaves_cnt = ARRAY_SIZE(omap2420_mcspi1_slaves), |
1394 | .class = &omap2xxx_mcspi_class, | 1361 | .class = &omap2xxx_mcspi_class, |
1395 | .dev_attr = &omap_mcspi1_dev_attr, | 1362 | .dev_attr = &omap_mcspi1_dev_attr, |
1396 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1397 | }; | 1363 | }; |
1398 | 1364 | ||
1399 | /* mcspi2 */ | 1365 | /* mcspi2 */ |
@@ -1423,7 +1389,6 @@ static struct omap_hwmod omap2420_mcspi2_hwmod = { | |||
1423 | .slaves_cnt = ARRAY_SIZE(omap2420_mcspi2_slaves), | 1389 | .slaves_cnt = ARRAY_SIZE(omap2420_mcspi2_slaves), |
1424 | .class = &omap2xxx_mcspi_class, | 1390 | .class = &omap2xxx_mcspi_class, |
1425 | .dev_attr = &omap_mcspi2_dev_attr, | 1391 | .dev_attr = &omap_mcspi2_dev_attr, |
1426 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1427 | }; | 1392 | }; |
1428 | 1393 | ||
1429 | /* | 1394 | /* |
@@ -1473,7 +1438,6 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = { | |||
1473 | }, | 1438 | }, |
1474 | .slaves = omap2420_mcbsp1_slaves, | 1439 | .slaves = omap2420_mcbsp1_slaves, |
1475 | .slaves_cnt = ARRAY_SIZE(omap2420_mcbsp1_slaves), | 1440 | .slaves_cnt = ARRAY_SIZE(omap2420_mcbsp1_slaves), |
1476 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1477 | }; | 1441 | }; |
1478 | 1442 | ||
1479 | /* mcbsp2 */ | 1443 | /* mcbsp2 */ |
@@ -1514,7 +1478,6 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = { | |||
1514 | }, | 1478 | }, |
1515 | .slaves = omap2420_mcbsp2_slaves, | 1479 | .slaves = omap2420_mcbsp2_slaves, |
1516 | .slaves_cnt = ARRAY_SIZE(omap2420_mcbsp2_slaves), | 1480 | .slaves_cnt = ARRAY_SIZE(omap2420_mcbsp2_slaves), |
1517 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | ||
1518 | }; | 1481 | }; |
1519 | 1482 | ||
1520 | static __initdata struct omap_hwmod *omap2420_hwmods[] = { | 1483 | static __initdata struct omap_hwmod *omap2420_hwmods[] = { |