diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2015-11-12 04:51:10 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2015-12-04 03:46:17 -0500 |
commit | bdd5dcf513847b306621a2059e2ebee910208d8a (patch) | |
tree | fbf8cbfb89e3abf0010247c65103676d9af819c4 /drivers/mfd | |
parent | f83e7d814084d9e982a8e24311a402e811d0ee90 (diff) |
mfd: ab8500: Delete static IRQ resources
The platforms that use the AB8500 define all IRQ resources in the
device tree and they are automatically populated by matching
the .of_compatible string. These static resources are just
surplus baggage these days.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/ab8500-core.c | 482 |
1 files changed, 0 insertions, 482 deletions
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index fefbe4cfa61d..582d3587f56a 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c | |||
@@ -609,442 +609,28 @@ int ab8500_suspend(struct ab8500 *ab8500) | |||
609 | return 0; | 609 | return 0; |
610 | } | 610 | } |
611 | 611 | ||
612 | static struct resource ab8500_gpadc_resources[] = { | ||
613 | { | ||
614 | .name = "HW_CONV_END", | ||
615 | .start = AB8500_INT_GP_HW_ADC_CONV_END, | ||
616 | .end = AB8500_INT_GP_HW_ADC_CONV_END, | ||
617 | .flags = IORESOURCE_IRQ, | ||
618 | }, | ||
619 | { | ||
620 | .name = "SW_CONV_END", | ||
621 | .start = AB8500_INT_GP_SW_ADC_CONV_END, | ||
622 | .end = AB8500_INT_GP_SW_ADC_CONV_END, | ||
623 | .flags = IORESOURCE_IRQ, | ||
624 | }, | ||
625 | }; | ||
626 | |||
627 | static struct resource ab8505_gpadc_resources[] = { | ||
628 | { | ||
629 | .name = "SW_CONV_END", | ||
630 | .start = AB8500_INT_GP_SW_ADC_CONV_END, | ||
631 | .end = AB8500_INT_GP_SW_ADC_CONV_END, | ||
632 | .flags = IORESOURCE_IRQ, | ||
633 | }, | ||
634 | }; | ||
635 | |||
636 | static struct resource ab8500_rtc_resources[] = { | ||
637 | { | ||
638 | .name = "60S", | ||
639 | .start = AB8500_INT_RTC_60S, | ||
640 | .end = AB8500_INT_RTC_60S, | ||
641 | .flags = IORESOURCE_IRQ, | ||
642 | }, | ||
643 | { | ||
644 | .name = "ALARM", | ||
645 | .start = AB8500_INT_RTC_ALARM, | ||
646 | .end = AB8500_INT_RTC_ALARM, | ||
647 | .flags = IORESOURCE_IRQ, | ||
648 | }, | ||
649 | }; | ||
650 | |||
651 | static struct resource ab8540_rtc_resources[] = { | ||
652 | { | ||
653 | .name = "1S", | ||
654 | .start = AB8540_INT_RTC_1S, | ||
655 | .end = AB8540_INT_RTC_1S, | ||
656 | .flags = IORESOURCE_IRQ, | ||
657 | }, | ||
658 | { | ||
659 | .name = "ALARM", | ||
660 | .start = AB8500_INT_RTC_ALARM, | ||
661 | .end = AB8500_INT_RTC_ALARM, | ||
662 | .flags = IORESOURCE_IRQ, | ||
663 | }, | ||
664 | }; | ||
665 | |||
666 | static struct resource ab8500_poweronkey_db_resources[] = { | ||
667 | { | ||
668 | .name = "ONKEY_DBF", | ||
669 | .start = AB8500_INT_PON_KEY1DB_F, | ||
670 | .end = AB8500_INT_PON_KEY1DB_F, | ||
671 | .flags = IORESOURCE_IRQ, | ||
672 | }, | ||
673 | { | ||
674 | .name = "ONKEY_DBR", | ||
675 | .start = AB8500_INT_PON_KEY1DB_R, | ||
676 | .end = AB8500_INT_PON_KEY1DB_R, | ||
677 | .flags = IORESOURCE_IRQ, | ||
678 | }, | ||
679 | }; | ||
680 | |||
681 | static struct resource ab8500_av_acc_detect_resources[] = { | ||
682 | { | ||
683 | .name = "ACC_DETECT_1DB_F", | ||
684 | .start = AB8500_INT_ACC_DETECT_1DB_F, | ||
685 | .end = AB8500_INT_ACC_DETECT_1DB_F, | ||
686 | .flags = IORESOURCE_IRQ, | ||
687 | }, | ||
688 | { | ||
689 | .name = "ACC_DETECT_1DB_R", | ||
690 | .start = AB8500_INT_ACC_DETECT_1DB_R, | ||
691 | .end = AB8500_INT_ACC_DETECT_1DB_R, | ||
692 | .flags = IORESOURCE_IRQ, | ||
693 | }, | ||
694 | { | ||
695 | .name = "ACC_DETECT_21DB_F", | ||
696 | .start = AB8500_INT_ACC_DETECT_21DB_F, | ||
697 | .end = AB8500_INT_ACC_DETECT_21DB_F, | ||
698 | .flags = IORESOURCE_IRQ, | ||
699 | }, | ||
700 | { | ||
701 | .name = "ACC_DETECT_21DB_R", | ||
702 | .start = AB8500_INT_ACC_DETECT_21DB_R, | ||
703 | .end = AB8500_INT_ACC_DETECT_21DB_R, | ||
704 | .flags = IORESOURCE_IRQ, | ||
705 | }, | ||
706 | { | ||
707 | .name = "ACC_DETECT_22DB_F", | ||
708 | .start = AB8500_INT_ACC_DETECT_22DB_F, | ||
709 | .end = AB8500_INT_ACC_DETECT_22DB_F, | ||
710 | .flags = IORESOURCE_IRQ, | ||
711 | }, | ||
712 | { | ||
713 | .name = "ACC_DETECT_22DB_R", | ||
714 | .start = AB8500_INT_ACC_DETECT_22DB_R, | ||
715 | .end = AB8500_INT_ACC_DETECT_22DB_R, | ||
716 | .flags = IORESOURCE_IRQ, | ||
717 | }, | ||
718 | }; | ||
719 | |||
720 | static struct resource ab8500_charger_resources[] = { | ||
721 | { | ||
722 | .name = "MAIN_CH_UNPLUG_DET", | ||
723 | .start = AB8500_INT_MAIN_CH_UNPLUG_DET, | ||
724 | .end = AB8500_INT_MAIN_CH_UNPLUG_DET, | ||
725 | .flags = IORESOURCE_IRQ, | ||
726 | }, | ||
727 | { | ||
728 | .name = "MAIN_CHARGE_PLUG_DET", | ||
729 | .start = AB8500_INT_MAIN_CH_PLUG_DET, | ||
730 | .end = AB8500_INT_MAIN_CH_PLUG_DET, | ||
731 | .flags = IORESOURCE_IRQ, | ||
732 | }, | ||
733 | { | ||
734 | .name = "VBUS_DET_R", | ||
735 | .start = AB8500_INT_VBUS_DET_R, | ||
736 | .end = AB8500_INT_VBUS_DET_R, | ||
737 | .flags = IORESOURCE_IRQ, | ||
738 | }, | ||
739 | { | ||
740 | .name = "VBUS_DET_F", | ||
741 | .start = AB8500_INT_VBUS_DET_F, | ||
742 | .end = AB8500_INT_VBUS_DET_F, | ||
743 | .flags = IORESOURCE_IRQ, | ||
744 | }, | ||
745 | { | ||
746 | .name = "USB_LINK_STATUS", | ||
747 | .start = AB8500_INT_USB_LINK_STATUS, | ||
748 | .end = AB8500_INT_USB_LINK_STATUS, | ||
749 | .flags = IORESOURCE_IRQ, | ||
750 | }, | ||
751 | { | ||
752 | .name = "VBUS_OVV", | ||
753 | .start = AB8500_INT_VBUS_OVV, | ||
754 | .end = AB8500_INT_VBUS_OVV, | ||
755 | .flags = IORESOURCE_IRQ, | ||
756 | }, | ||
757 | { | ||
758 | .name = "USB_CH_TH_PROT_R", | ||
759 | .start = AB8500_INT_USB_CH_TH_PROT_R, | ||
760 | .end = AB8500_INT_USB_CH_TH_PROT_R, | ||
761 | .flags = IORESOURCE_IRQ, | ||
762 | }, | ||
763 | { | ||
764 | .name = "USB_CH_TH_PROT_F", | ||
765 | .start = AB8500_INT_USB_CH_TH_PROT_F, | ||
766 | .end = AB8500_INT_USB_CH_TH_PROT_F, | ||
767 | .flags = IORESOURCE_IRQ, | ||
768 | }, | ||
769 | { | ||
770 | .name = "MAIN_EXT_CH_NOT_OK", | ||
771 | .start = AB8500_INT_MAIN_EXT_CH_NOT_OK, | ||
772 | .end = AB8500_INT_MAIN_EXT_CH_NOT_OK, | ||
773 | .flags = IORESOURCE_IRQ, | ||
774 | }, | ||
775 | { | ||
776 | .name = "MAIN_CH_TH_PROT_R", | ||
777 | .start = AB8500_INT_MAIN_CH_TH_PROT_R, | ||
778 | .end = AB8500_INT_MAIN_CH_TH_PROT_R, | ||
779 | .flags = IORESOURCE_IRQ, | ||
780 | }, | ||
781 | { | ||
782 | .name = "MAIN_CH_TH_PROT_F", | ||
783 | .start = AB8500_INT_MAIN_CH_TH_PROT_F, | ||
784 | .end = AB8500_INT_MAIN_CH_TH_PROT_F, | ||
785 | .flags = IORESOURCE_IRQ, | ||
786 | }, | ||
787 | { | ||
788 | .name = "USB_CHARGER_NOT_OKR", | ||
789 | .start = AB8500_INT_USB_CHARGER_NOT_OKR, | ||
790 | .end = AB8500_INT_USB_CHARGER_NOT_OKR, | ||
791 | .flags = IORESOURCE_IRQ, | ||
792 | }, | ||
793 | { | ||
794 | .name = "CH_WD_EXP", | ||
795 | .start = AB8500_INT_CH_WD_EXP, | ||
796 | .end = AB8500_INT_CH_WD_EXP, | ||
797 | .flags = IORESOURCE_IRQ, | ||
798 | }, | ||
799 | { | ||
800 | .name = "VBUS_CH_DROP_END", | ||
801 | .start = AB8500_INT_VBUS_CH_DROP_END, | ||
802 | .end = AB8500_INT_VBUS_CH_DROP_END, | ||
803 | .flags = IORESOURCE_IRQ, | ||
804 | }, | ||
805 | }; | ||
806 | |||
807 | static struct resource ab8500_btemp_resources[] = { | ||
808 | { | ||
809 | .name = "BAT_CTRL_INDB", | ||
810 | .start = AB8500_INT_BAT_CTRL_INDB, | ||
811 | .end = AB8500_INT_BAT_CTRL_INDB, | ||
812 | .flags = IORESOURCE_IRQ, | ||
813 | }, | ||
814 | { | ||
815 | .name = "BTEMP_LOW", | ||
816 | .start = AB8500_INT_BTEMP_LOW, | ||
817 | .end = AB8500_INT_BTEMP_LOW, | ||
818 | .flags = IORESOURCE_IRQ, | ||
819 | }, | ||
820 | { | ||
821 | .name = "BTEMP_HIGH", | ||
822 | .start = AB8500_INT_BTEMP_HIGH, | ||
823 | .end = AB8500_INT_BTEMP_HIGH, | ||
824 | .flags = IORESOURCE_IRQ, | ||
825 | }, | ||
826 | { | ||
827 | .name = "BTEMP_LOW_MEDIUM", | ||
828 | .start = AB8500_INT_BTEMP_LOW_MEDIUM, | ||
829 | .end = AB8500_INT_BTEMP_LOW_MEDIUM, | ||
830 | .flags = IORESOURCE_IRQ, | ||
831 | }, | ||
832 | { | ||
833 | .name = "BTEMP_MEDIUM_HIGH", | ||
834 | .start = AB8500_INT_BTEMP_MEDIUM_HIGH, | ||
835 | .end = AB8500_INT_BTEMP_MEDIUM_HIGH, | ||
836 | .flags = IORESOURCE_IRQ, | ||
837 | }, | ||
838 | }; | ||
839 | |||
840 | static struct resource ab8500_fg_resources[] = { | ||
841 | { | ||
842 | .name = "NCONV_ACCU", | ||
843 | .start = AB8500_INT_CCN_CONV_ACC, | ||
844 | .end = AB8500_INT_CCN_CONV_ACC, | ||
845 | .flags = IORESOURCE_IRQ, | ||
846 | }, | ||
847 | { | ||
848 | .name = "BATT_OVV", | ||
849 | .start = AB8500_INT_BATT_OVV, | ||
850 | .end = AB8500_INT_BATT_OVV, | ||
851 | .flags = IORESOURCE_IRQ, | ||
852 | }, | ||
853 | { | ||
854 | .name = "LOW_BAT_F", | ||
855 | .start = AB8500_INT_LOW_BAT_F, | ||
856 | .end = AB8500_INT_LOW_BAT_F, | ||
857 | .flags = IORESOURCE_IRQ, | ||
858 | }, | ||
859 | { | ||
860 | .name = "LOW_BAT_R", | ||
861 | .start = AB8500_INT_LOW_BAT_R, | ||
862 | .end = AB8500_INT_LOW_BAT_R, | ||
863 | .flags = IORESOURCE_IRQ, | ||
864 | }, | ||
865 | { | ||
866 | .name = "CC_INT_CALIB", | ||
867 | .start = AB8500_INT_CC_INT_CALIB, | ||
868 | .end = AB8500_INT_CC_INT_CALIB, | ||
869 | .flags = IORESOURCE_IRQ, | ||
870 | }, | ||
871 | { | ||
872 | .name = "CCEOC", | ||
873 | .start = AB8500_INT_CCEOC, | ||
874 | .end = AB8500_INT_CCEOC, | ||
875 | .flags = IORESOURCE_IRQ, | ||
876 | }, | ||
877 | }; | ||
878 | |||
879 | static struct resource ab8500_chargalg_resources[] = {}; | ||
880 | |||
881 | #ifdef CONFIG_DEBUG_FS | ||
882 | static struct resource ab8500_debug_resources[] = { | ||
883 | { | ||
884 | .name = "IRQ_AB8500", | ||
885 | /* | ||
886 | * Number will be filled in. NOTE: this is deliberately | ||
887 | * not flagged as an IRQ in ordet to avoid remapping using | ||
888 | * the irqdomain in the MFD core, so that this IRQ passes | ||
889 | * unremapped to the debug code. | ||
890 | */ | ||
891 | }, | ||
892 | { | ||
893 | .name = "IRQ_FIRST", | ||
894 | .start = AB8500_INT_MAIN_EXT_CH_NOT_OK, | ||
895 | .end = AB8500_INT_MAIN_EXT_CH_NOT_OK, | ||
896 | .flags = IORESOURCE_IRQ, | ||
897 | }, | ||
898 | { | ||
899 | .name = "IRQ_LAST", | ||
900 | .start = AB8500_INT_XTAL32K_KO, | ||
901 | .end = AB8500_INT_XTAL32K_KO, | ||
902 | .flags = IORESOURCE_IRQ, | ||
903 | }, | ||
904 | }; | ||
905 | #endif | ||
906 | |||
907 | static struct resource ab8500_usb_resources[] = { | ||
908 | { | ||
909 | .name = "ID_WAKEUP_R", | ||
910 | .start = AB8500_INT_ID_WAKEUP_R, | ||
911 | .end = AB8500_INT_ID_WAKEUP_R, | ||
912 | .flags = IORESOURCE_IRQ, | ||
913 | }, | ||
914 | { | ||
915 | .name = "ID_WAKEUP_F", | ||
916 | .start = AB8500_INT_ID_WAKEUP_F, | ||
917 | .end = AB8500_INT_ID_WAKEUP_F, | ||
918 | .flags = IORESOURCE_IRQ, | ||
919 | }, | ||
920 | { | ||
921 | .name = "VBUS_DET_F", | ||
922 | .start = AB8500_INT_VBUS_DET_F, | ||
923 | .end = AB8500_INT_VBUS_DET_F, | ||
924 | .flags = IORESOURCE_IRQ, | ||
925 | }, | ||
926 | { | ||
927 | .name = "VBUS_DET_R", | ||
928 | .start = AB8500_INT_VBUS_DET_R, | ||
929 | .end = AB8500_INT_VBUS_DET_R, | ||
930 | .flags = IORESOURCE_IRQ, | ||
931 | }, | ||
932 | { | ||
933 | .name = "USB_LINK_STATUS", | ||
934 | .start = AB8500_INT_USB_LINK_STATUS, | ||
935 | .end = AB8500_INT_USB_LINK_STATUS, | ||
936 | .flags = IORESOURCE_IRQ, | ||
937 | }, | ||
938 | { | ||
939 | .name = "USB_ADP_PROBE_PLUG", | ||
940 | .start = AB8500_INT_ADP_PROBE_PLUG, | ||
941 | .end = AB8500_INT_ADP_PROBE_PLUG, | ||
942 | .flags = IORESOURCE_IRQ, | ||
943 | }, | ||
944 | { | ||
945 | .name = "USB_ADP_PROBE_UNPLUG", | ||
946 | .start = AB8500_INT_ADP_PROBE_UNPLUG, | ||
947 | .end = AB8500_INT_ADP_PROBE_UNPLUG, | ||
948 | .flags = IORESOURCE_IRQ, | ||
949 | }, | ||
950 | }; | ||
951 | |||
952 | static struct resource ab8505_iddet_resources[] = { | ||
953 | { | ||
954 | .name = "KeyDeglitch", | ||
955 | .start = AB8505_INT_KEYDEGLITCH, | ||
956 | .end = AB8505_INT_KEYDEGLITCH, | ||
957 | .flags = IORESOURCE_IRQ, | ||
958 | }, | ||
959 | { | ||
960 | .name = "KP", | ||
961 | .start = AB8505_INT_KP, | ||
962 | .end = AB8505_INT_KP, | ||
963 | .flags = IORESOURCE_IRQ, | ||
964 | }, | ||
965 | { | ||
966 | .name = "IKP", | ||
967 | .start = AB8505_INT_IKP, | ||
968 | .end = AB8505_INT_IKP, | ||
969 | .flags = IORESOURCE_IRQ, | ||
970 | }, | ||
971 | { | ||
972 | .name = "IKR", | ||
973 | .start = AB8505_INT_IKR, | ||
974 | .end = AB8505_INT_IKR, | ||
975 | .flags = IORESOURCE_IRQ, | ||
976 | }, | ||
977 | { | ||
978 | .name = "KeyStuck", | ||
979 | .start = AB8505_INT_KEYSTUCK, | ||
980 | .end = AB8505_INT_KEYSTUCK, | ||
981 | .flags = IORESOURCE_IRQ, | ||
982 | }, | ||
983 | { | ||
984 | .name = "VBUS_DET_R", | ||
985 | .start = AB8500_INT_VBUS_DET_R, | ||
986 | .end = AB8500_INT_VBUS_DET_R, | ||
987 | .flags = IORESOURCE_IRQ, | ||
988 | }, | ||
989 | { | ||
990 | .name = "VBUS_DET_F", | ||
991 | .start = AB8500_INT_VBUS_DET_F, | ||
992 | .end = AB8500_INT_VBUS_DET_F, | ||
993 | .flags = IORESOURCE_IRQ, | ||
994 | }, | ||
995 | { | ||
996 | .name = "ID_DET_PLUGR", | ||
997 | .start = AB8500_INT_ID_DET_PLUGR, | ||
998 | .end = AB8500_INT_ID_DET_PLUGR, | ||
999 | .flags = IORESOURCE_IRQ, | ||
1000 | }, | ||
1001 | { | ||
1002 | .name = "ID_DET_PLUGF", | ||
1003 | .start = AB8500_INT_ID_DET_PLUGF, | ||
1004 | .end = AB8500_INT_ID_DET_PLUGF, | ||
1005 | .flags = IORESOURCE_IRQ, | ||
1006 | }, | ||
1007 | }; | ||
1008 | |||
1009 | static struct resource ab8500_temp_resources[] = { | ||
1010 | { | ||
1011 | .name = "ABX500_TEMP_WARM", | ||
1012 | .start = AB8500_INT_TEMP_WARM, | ||
1013 | .end = AB8500_INT_TEMP_WARM, | ||
1014 | .flags = IORESOURCE_IRQ, | ||
1015 | }, | ||
1016 | }; | ||
1017 | |||
1018 | static const struct mfd_cell ab8500_bm_devs[] = { | 612 | static const struct mfd_cell ab8500_bm_devs[] = { |
1019 | { | 613 | { |
1020 | .name = "ab8500-charger", | 614 | .name = "ab8500-charger", |
1021 | .of_compatible = "stericsson,ab8500-charger", | 615 | .of_compatible = "stericsson,ab8500-charger", |
1022 | .num_resources = ARRAY_SIZE(ab8500_charger_resources), | ||
1023 | .resources = ab8500_charger_resources, | ||
1024 | .platform_data = &ab8500_bm_data, | 616 | .platform_data = &ab8500_bm_data, |
1025 | .pdata_size = sizeof(ab8500_bm_data), | 617 | .pdata_size = sizeof(ab8500_bm_data), |
1026 | }, | 618 | }, |
1027 | { | 619 | { |
1028 | .name = "ab8500-btemp", | 620 | .name = "ab8500-btemp", |
1029 | .of_compatible = "stericsson,ab8500-btemp", | 621 | .of_compatible = "stericsson,ab8500-btemp", |
1030 | .num_resources = ARRAY_SIZE(ab8500_btemp_resources), | ||
1031 | .resources = ab8500_btemp_resources, | ||
1032 | .platform_data = &ab8500_bm_data, | 622 | .platform_data = &ab8500_bm_data, |
1033 | .pdata_size = sizeof(ab8500_bm_data), | 623 | .pdata_size = sizeof(ab8500_bm_data), |
1034 | }, | 624 | }, |
1035 | { | 625 | { |
1036 | .name = "ab8500-fg", | 626 | .name = "ab8500-fg", |
1037 | .of_compatible = "stericsson,ab8500-fg", | 627 | .of_compatible = "stericsson,ab8500-fg", |
1038 | .num_resources = ARRAY_SIZE(ab8500_fg_resources), | ||
1039 | .resources = ab8500_fg_resources, | ||
1040 | .platform_data = &ab8500_bm_data, | 628 | .platform_data = &ab8500_bm_data, |
1041 | .pdata_size = sizeof(ab8500_bm_data), | 629 | .pdata_size = sizeof(ab8500_bm_data), |
1042 | }, | 630 | }, |
1043 | { | 631 | { |
1044 | .name = "ab8500-chargalg", | 632 | .name = "ab8500-chargalg", |
1045 | .of_compatible = "stericsson,ab8500-chargalg", | 633 | .of_compatible = "stericsson,ab8500-chargalg", |
1046 | .num_resources = ARRAY_SIZE(ab8500_chargalg_resources), | ||
1047 | .resources = ab8500_chargalg_resources, | ||
1048 | .platform_data = &ab8500_bm_data, | 634 | .platform_data = &ab8500_bm_data, |
1049 | .pdata_size = sizeof(ab8500_bm_data), | 635 | .pdata_size = sizeof(ab8500_bm_data), |
1050 | }, | 636 | }, |
@@ -1055,8 +641,6 @@ static const struct mfd_cell ab8500_devs[] = { | |||
1055 | { | 641 | { |
1056 | .name = "ab8500-debug", | 642 | .name = "ab8500-debug", |
1057 | .of_compatible = "stericsson,ab8500-debug", | 643 | .of_compatible = "stericsson,ab8500-debug", |
1058 | .num_resources = ARRAY_SIZE(ab8500_debug_resources), | ||
1059 | .resources = ab8500_debug_resources, | ||
1060 | }, | 644 | }, |
1061 | #endif | 645 | #endif |
1062 | { | 646 | { |
@@ -1078,27 +662,19 @@ static const struct mfd_cell ab8500_devs[] = { | |||
1078 | { | 662 | { |
1079 | .name = "ab8500-gpadc", | 663 | .name = "ab8500-gpadc", |
1080 | .of_compatible = "stericsson,ab8500-gpadc", | 664 | .of_compatible = "stericsson,ab8500-gpadc", |
1081 | .num_resources = ARRAY_SIZE(ab8500_gpadc_resources), | ||
1082 | .resources = ab8500_gpadc_resources, | ||
1083 | }, | 665 | }, |
1084 | { | 666 | { |
1085 | .name = "ab8500-rtc", | 667 | .name = "ab8500-rtc", |
1086 | .of_compatible = "stericsson,ab8500-rtc", | 668 | .of_compatible = "stericsson,ab8500-rtc", |
1087 | .num_resources = ARRAY_SIZE(ab8500_rtc_resources), | ||
1088 | .resources = ab8500_rtc_resources, | ||
1089 | }, | 669 | }, |
1090 | { | 670 | { |
1091 | .name = "ab8500-acc-det", | 671 | .name = "ab8500-acc-det", |
1092 | .of_compatible = "stericsson,ab8500-acc-det", | 672 | .of_compatible = "stericsson,ab8500-acc-det", |
1093 | .num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources), | ||
1094 | .resources = ab8500_av_acc_detect_resources, | ||
1095 | }, | 673 | }, |
1096 | { | 674 | { |
1097 | 675 | ||
1098 | .name = "ab8500-poweron-key", | 676 | .name = "ab8500-poweron-key", |
1099 | .of_compatible = "stericsson,ab8500-poweron-key", | 677 | .of_compatible = "stericsson,ab8500-poweron-key", |
1100 | .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources), | ||
1101 | .resources = ab8500_poweronkey_db_resources, | ||
1102 | }, | 678 | }, |
1103 | { | 679 | { |
1104 | .name = "ab8500-pwm", | 680 | .name = "ab8500-pwm", |
@@ -1126,14 +702,10 @@ static const struct mfd_cell ab8500_devs[] = { | |||
1126 | { | 702 | { |
1127 | .name = "abx500-temp", | 703 | .name = "abx500-temp", |
1128 | .of_compatible = "stericsson,abx500-temp", | 704 | .of_compatible = "stericsson,abx500-temp", |
1129 | .num_resources = ARRAY_SIZE(ab8500_temp_resources), | ||
1130 | .resources = ab8500_temp_resources, | ||
1131 | }, | 705 | }, |
1132 | { | 706 | { |
1133 | .name = "ab8500-usb", | 707 | .name = "ab8500-usb", |
1134 | .of_compatible = "stericsson,ab8500-usb", | 708 | .of_compatible = "stericsson,ab8500-usb", |
1135 | .num_resources = ARRAY_SIZE(ab8500_usb_resources), | ||
1136 | .resources = ab8500_usb_resources, | ||
1137 | }, | 709 | }, |
1138 | { | 710 | { |
1139 | .name = "ab8500-codec", | 711 | .name = "ab8500-codec", |
@@ -1145,8 +717,6 @@ static const struct mfd_cell ab9540_devs[] = { | |||
1145 | #ifdef CONFIG_DEBUG_FS | 717 | #ifdef CONFIG_DEBUG_FS |
1146 | { | 718 | { |
1147 | .name = "ab8500-debug", | 719 | .name = "ab8500-debug", |
1148 | .num_resources = ARRAY_SIZE(ab8500_debug_resources), | ||
1149 | .resources = ab8500_debug_resources, | ||
1150 | }, | 720 | }, |
1151 | #endif | 721 | #endif |
1152 | { | 722 | { |
@@ -1165,23 +735,15 @@ static const struct mfd_cell ab9540_devs[] = { | |||
1165 | { | 735 | { |
1166 | .name = "ab8500-gpadc", | 736 | .name = "ab8500-gpadc", |
1167 | .of_compatible = "stericsson,ab8500-gpadc", | 737 | .of_compatible = "stericsson,ab8500-gpadc", |
1168 | .num_resources = ARRAY_SIZE(ab8500_gpadc_resources), | ||
1169 | .resources = ab8500_gpadc_resources, | ||
1170 | }, | 738 | }, |
1171 | { | 739 | { |
1172 | .name = "ab8500-rtc", | 740 | .name = "ab8500-rtc", |
1173 | .num_resources = ARRAY_SIZE(ab8500_rtc_resources), | ||
1174 | .resources = ab8500_rtc_resources, | ||
1175 | }, | 741 | }, |
1176 | { | 742 | { |
1177 | .name = "ab8500-acc-det", | 743 | .name = "ab8500-acc-det", |
1178 | .num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources), | ||
1179 | .resources = ab8500_av_acc_detect_resources, | ||
1180 | }, | 744 | }, |
1181 | { | 745 | { |
1182 | .name = "ab8500-poweron-key", | 746 | .name = "ab8500-poweron-key", |
1183 | .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources), | ||
1184 | .resources = ab8500_poweronkey_db_resources, | ||
1185 | }, | 747 | }, |
1186 | { | 748 | { |
1187 | .name = "ab8500-pwm", | 749 | .name = "ab8500-pwm", |
@@ -1189,8 +751,6 @@ static const struct mfd_cell ab9540_devs[] = { | |||
1189 | }, | 751 | }, |
1190 | { | 752 | { |
1191 | .name = "abx500-temp", | 753 | .name = "abx500-temp", |
1192 | .num_resources = ARRAY_SIZE(ab8500_temp_resources), | ||
1193 | .resources = ab8500_temp_resources, | ||
1194 | }, | 754 | }, |
1195 | { | 755 | { |
1196 | .name = "pinctrl-ab9540", | 756 | .name = "pinctrl-ab9540", |
@@ -1198,16 +758,12 @@ static const struct mfd_cell ab9540_devs[] = { | |||
1198 | }, | 758 | }, |
1199 | { | 759 | { |
1200 | .name = "ab9540-usb", | 760 | .name = "ab9540-usb", |
1201 | .num_resources = ARRAY_SIZE(ab8500_usb_resources), | ||
1202 | .resources = ab8500_usb_resources, | ||
1203 | }, | 761 | }, |
1204 | { | 762 | { |
1205 | .name = "ab9540-codec", | 763 | .name = "ab9540-codec", |
1206 | }, | 764 | }, |
1207 | { | 765 | { |
1208 | .name = "ab-iddet", | 766 | .name = "ab-iddet", |
1209 | .num_resources = ARRAY_SIZE(ab8505_iddet_resources), | ||
1210 | .resources = ab8505_iddet_resources, | ||
1211 | }, | 767 | }, |
1212 | }; | 768 | }; |
1213 | 769 | ||
@@ -1216,8 +772,6 @@ static const struct mfd_cell ab8505_devs[] = { | |||
1216 | #ifdef CONFIG_DEBUG_FS | 772 | #ifdef CONFIG_DEBUG_FS |
1217 | { | 773 | { |
1218 | .name = "ab8500-debug", | 774 | .name = "ab8500-debug", |
1219 | .num_resources = ARRAY_SIZE(ab8500_debug_resources), | ||
1220 | .resources = ab8500_debug_resources, | ||
1221 | }, | 775 | }, |
1222 | #endif | 776 | #endif |
1223 | { | 777 | { |
@@ -1233,23 +787,15 @@ static const struct mfd_cell ab8505_devs[] = { | |||
1233 | { | 787 | { |
1234 | .name = "ab8500-gpadc", | 788 | .name = "ab8500-gpadc", |
1235 | .of_compatible = "stericsson,ab8500-gpadc", | 789 | .of_compatible = "stericsson,ab8500-gpadc", |
1236 | .num_resources = ARRAY_SIZE(ab8505_gpadc_resources), | ||
1237 | .resources = ab8505_gpadc_resources, | ||
1238 | }, | 790 | }, |
1239 | { | 791 | { |
1240 | .name = "ab8500-rtc", | 792 | .name = "ab8500-rtc", |
1241 | .num_resources = ARRAY_SIZE(ab8500_rtc_resources), | ||
1242 | .resources = ab8500_rtc_resources, | ||
1243 | }, | 793 | }, |
1244 | { | 794 | { |
1245 | .name = "ab8500-acc-det", | 795 | .name = "ab8500-acc-det", |
1246 | .num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources), | ||
1247 | .resources = ab8500_av_acc_detect_resources, | ||
1248 | }, | 796 | }, |
1249 | { | 797 | { |
1250 | .name = "ab8500-poweron-key", | 798 | .name = "ab8500-poweron-key", |
1251 | .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources), | ||
1252 | .resources = ab8500_poweronkey_db_resources, | ||
1253 | }, | 799 | }, |
1254 | { | 800 | { |
1255 | .name = "ab8500-pwm", | 801 | .name = "ab8500-pwm", |
@@ -1260,16 +806,12 @@ static const struct mfd_cell ab8505_devs[] = { | |||
1260 | }, | 806 | }, |
1261 | { | 807 | { |
1262 | .name = "ab8500-usb", | 808 | .name = "ab8500-usb", |
1263 | .num_resources = ARRAY_SIZE(ab8500_usb_resources), | ||
1264 | .resources = ab8500_usb_resources, | ||
1265 | }, | 809 | }, |
1266 | { | 810 | { |
1267 | .name = "ab8500-codec", | 811 | .name = "ab8500-codec", |
1268 | }, | 812 | }, |
1269 | { | 813 | { |
1270 | .name = "ab-iddet", | 814 | .name = "ab-iddet", |
1271 | .num_resources = ARRAY_SIZE(ab8505_iddet_resources), | ||
1272 | .resources = ab8505_iddet_resources, | ||
1273 | }, | 815 | }, |
1274 | }; | 816 | }; |
1275 | 817 | ||
@@ -1277,8 +819,6 @@ static const struct mfd_cell ab8540_devs[] = { | |||
1277 | #ifdef CONFIG_DEBUG_FS | 819 | #ifdef CONFIG_DEBUG_FS |
1278 | { | 820 | { |
1279 | .name = "ab8500-debug", | 821 | .name = "ab8500-debug", |
1280 | .num_resources = ARRAY_SIZE(ab8500_debug_resources), | ||
1281 | .resources = ab8500_debug_resources, | ||
1282 | }, | 822 | }, |
1283 | #endif | 823 | #endif |
1284 | { | 824 | { |
@@ -1297,18 +837,12 @@ static const struct mfd_cell ab8540_devs[] = { | |||
1297 | { | 837 | { |
1298 | .name = "ab8500-gpadc", | 838 | .name = "ab8500-gpadc", |
1299 | .of_compatible = "stericsson,ab8500-gpadc", | 839 | .of_compatible = "stericsson,ab8500-gpadc", |
1300 | .num_resources = ARRAY_SIZE(ab8505_gpadc_resources), | ||
1301 | .resources = ab8505_gpadc_resources, | ||
1302 | }, | 840 | }, |
1303 | { | 841 | { |
1304 | .name = "ab8500-acc-det", | 842 | .name = "ab8500-acc-det", |
1305 | .num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources), | ||
1306 | .resources = ab8500_av_acc_detect_resources, | ||
1307 | }, | 843 | }, |
1308 | { | 844 | { |
1309 | .name = "ab8500-poweron-key", | 845 | .name = "ab8500-poweron-key", |
1310 | .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources), | ||
1311 | .resources = ab8500_poweronkey_db_resources, | ||
1312 | }, | 846 | }, |
1313 | { | 847 | { |
1314 | .name = "ab8500-pwm", | 848 | .name = "ab8500-pwm", |
@@ -1316,24 +850,18 @@ static const struct mfd_cell ab8540_devs[] = { | |||
1316 | }, | 850 | }, |
1317 | { | 851 | { |
1318 | .name = "abx500-temp", | 852 | .name = "abx500-temp", |
1319 | .num_resources = ARRAY_SIZE(ab8500_temp_resources), | ||
1320 | .resources = ab8500_temp_resources, | ||
1321 | }, | 853 | }, |
1322 | { | 854 | { |
1323 | .name = "pinctrl-ab8540", | 855 | .name = "pinctrl-ab8540", |
1324 | }, | 856 | }, |
1325 | { | 857 | { |
1326 | .name = "ab8540-usb", | 858 | .name = "ab8540-usb", |
1327 | .num_resources = ARRAY_SIZE(ab8500_usb_resources), | ||
1328 | .resources = ab8500_usb_resources, | ||
1329 | }, | 859 | }, |
1330 | { | 860 | { |
1331 | .name = "ab8540-codec", | 861 | .name = "ab8540-codec", |
1332 | }, | 862 | }, |
1333 | { | 863 | { |
1334 | .name = "ab-iddet", | 864 | .name = "ab-iddet", |
1335 | .num_resources = ARRAY_SIZE(ab8505_iddet_resources), | ||
1336 | .resources = ab8505_iddet_resources, | ||
1337 | }, | 865 | }, |
1338 | }; | 866 | }; |
1339 | 867 | ||
@@ -1341,8 +869,6 @@ static const struct mfd_cell ab8540_cut1_devs[] = { | |||
1341 | { | 869 | { |
1342 | .name = "ab8500-rtc", | 870 | .name = "ab8500-rtc", |
1343 | .of_compatible = "stericsson,ab8500-rtc", | 871 | .of_compatible = "stericsson,ab8500-rtc", |
1344 | .num_resources = ARRAY_SIZE(ab8500_rtc_resources), | ||
1345 | .resources = ab8500_rtc_resources, | ||
1346 | }, | 872 | }, |
1347 | }; | 873 | }; |
1348 | 874 | ||
@@ -1350,8 +876,6 @@ static const struct mfd_cell ab8540_cut2_devs[] = { | |||
1350 | { | 876 | { |
1351 | .name = "ab8540-rtc", | 877 | .name = "ab8540-rtc", |
1352 | .of_compatible = "stericsson,ab8540-rtc", | 878 | .of_compatible = "stericsson,ab8540-rtc", |
1353 | .num_resources = ARRAY_SIZE(ab8540_rtc_resources), | ||
1354 | .resources = ab8540_rtc_resources, | ||
1355 | }, | 879 | }, |
1356 | }; | 880 | }; |
1357 | 881 | ||
@@ -1750,12 +1274,6 @@ static int ab8500_probe(struct platform_device *pdev) | |||
1750 | if (ret) | 1274 | if (ret) |
1751 | return ret; | 1275 | return ret; |
1752 | 1276 | ||
1753 | #ifdef CONFIG_DEBUG_FS | ||
1754 | /* Pass to debugfs */ | ||
1755 | ab8500_debug_resources[0].start = ab8500->irq; | ||
1756 | ab8500_debug_resources[0].end = ab8500->irq; | ||
1757 | #endif | ||
1758 | |||
1759 | if (is_ab9540(ab8500)) | 1277 | if (is_ab9540(ab8500)) |
1760 | ret = mfd_add_devices(ab8500->dev, 0, ab9540_devs, | 1278 | ret = mfd_add_devices(ab8500->dev, 0, ab9540_devs, |
1761 | ARRAY_SIZE(ab9540_devs), NULL, | 1279 | ARRAY_SIZE(ab9540_devs), NULL, |