diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pinctrl/samsung/pinctrl-exynos.c | 22 | ||||
| -rw-r--r-- | drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 4 | ||||
| -rw-r--r-- | drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/samsung/pinctrl-samsung.h | 3 |
4 files changed, 0 insertions, 30 deletions
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index d7154ed0b0eb..7e6463f970ff 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c | |||
| @@ -682,7 +682,6 @@ struct samsung_pin_ctrl s5pv210_pin_ctrl[] = { | |||
| 682 | .eint_wkup_init = exynos_eint_wkup_init, | 682 | .eint_wkup_init = exynos_eint_wkup_init, |
| 683 | .suspend = exynos_pinctrl_suspend, | 683 | .suspend = exynos_pinctrl_suspend, |
| 684 | .resume = exynos_pinctrl_resume, | 684 | .resume = exynos_pinctrl_resume, |
| 685 | .label = "s5pv210-gpio-ctrl0", | ||
| 686 | }, | 685 | }, |
| 687 | }; | 686 | }; |
| 688 | 687 | ||
| @@ -729,7 +728,6 @@ struct samsung_pin_ctrl exynos3250_pin_ctrl[] = { | |||
| 729 | .eint_gpio_init = exynos_eint_gpio_init, | 728 | .eint_gpio_init = exynos_eint_gpio_init, |
| 730 | .suspend = exynos_pinctrl_suspend, | 729 | .suspend = exynos_pinctrl_suspend, |
| 731 | .resume = exynos_pinctrl_resume, | 730 | .resume = exynos_pinctrl_resume, |
| 732 | .label = "exynos3250-gpio-ctrl0", | ||
| 733 | }, { | 731 | }, { |
| 734 | /* pin-controller instance 1 data */ | 732 | /* pin-controller instance 1 data */ |
| 735 | .pin_banks = exynos3250_pin_banks1, | 733 | .pin_banks = exynos3250_pin_banks1, |
| @@ -738,7 +736,6 @@ struct samsung_pin_ctrl exynos3250_pin_ctrl[] = { | |||
| 738 | .eint_wkup_init = exynos_eint_wkup_init, | 736 | .eint_wkup_init = exynos_eint_wkup_init, |
| 739 | .suspend = exynos_pinctrl_suspend, | 737 | .suspend = exynos_pinctrl_suspend, |
| 740 | .resume = exynos_pinctrl_resume, | 738 | .resume = exynos_pinctrl_resume, |
| 741 | .label = "exynos3250-gpio-ctrl1", | ||
| 742 | }, | 739 | }, |
| 743 | }; | 740 | }; |
| 744 | 741 | ||
| @@ -803,7 +800,6 @@ struct samsung_pin_ctrl exynos4210_pin_ctrl[] = { | |||
| 803 | .eint_gpio_init = exynos_eint_gpio_init, | 800 | .eint_gpio_init = exynos_eint_gpio_init, |
| 804 | .suspend = exynos_pinctrl_suspend, | 801 | .suspend = exynos_pinctrl_suspend, |
| 805 | .resume = exynos_pinctrl_resume, | 802 | .resume = exynos_pinctrl_resume, |
| 806 | .label = "exynos4210-gpio-ctrl0", | ||
| 807 | }, { | 803 | }, { |
| 808 | /* pin-controller instance 1 data */ | 804 | /* pin-controller instance 1 data */ |
| 809 | .pin_banks = exynos4210_pin_banks1, | 805 | .pin_banks = exynos4210_pin_banks1, |
| @@ -812,12 +808,10 @@ struct samsung_pin_ctrl exynos4210_pin_ctrl[] = { | |||
| 812 | .eint_wkup_init = exynos_eint_wkup_init, | 808 | .eint_wkup_init = exynos_eint_wkup_init, |
| 813 | .suspend = exynos_pinctrl_suspend, | 809 | .suspend = exynos_pinctrl_suspend, |
| 814 | .resume = exynos_pinctrl_resume, | 810 | .resume = exynos_pinctrl_resume, |
| 815 | .label = "exynos4210-gpio-ctrl1", | ||
| 816 | }, { | 811 | }, { |
| 817 | /* pin-controller instance 2 data */ | 812 | /* pin-controller instance 2 data */ |
| 818 | .pin_banks = exynos4210_pin_banks2, | 813 | .pin_banks = exynos4210_pin_banks2, |
| 819 | .nr_banks = ARRAY_SIZE(exynos4210_pin_banks2), | 814 | .nr_banks = ARRAY_SIZE(exynos4210_pin_banks2), |
| 820 | .label = "exynos4210-gpio-ctrl2", | ||
| 821 | }, | 815 | }, |
| 822 | }; | 816 | }; |
| 823 | 817 | ||
| @@ -891,7 +885,6 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { | |||
| 891 | .eint_gpio_init = exynos_eint_gpio_init, | 885 | .eint_gpio_init = exynos_eint_gpio_init, |
| 892 | .suspend = exynos_pinctrl_suspend, | 886 | .suspend = exynos_pinctrl_suspend, |
| 893 | .resume = exynos_pinctrl_resume, | 887 | .resume = exynos_pinctrl_resume, |
| 894 | .label = "exynos4x12-gpio-ctrl0", | ||
| 895 | }, { | 888 | }, { |
| 896 | /* pin-controller instance 1 data */ | 889 | /* pin-controller instance 1 data */ |
| 897 | .pin_banks = exynos4x12_pin_banks1, | 890 | .pin_banks = exynos4x12_pin_banks1, |
| @@ -900,7 +893,6 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { | |||
| 900 | .eint_wkup_init = exynos_eint_wkup_init, | 893 | .eint_wkup_init = exynos_eint_wkup_init, |
| 901 | .suspend = exynos_pinctrl_suspend, | 894 | .suspend = exynos_pinctrl_suspend, |
| 902 | .resume = exynos_pinctrl_resume, | 895 | .resume = exynos_pinctrl_resume, |
| 903 | .label = "exynos4x12-gpio-ctrl1", | ||
| 904 | }, { | 896 | }, { |
| 905 | /* pin-controller instance 2 data */ | 897 | /* pin-controller instance 2 data */ |
| 906 | .pin_banks = exynos4x12_pin_banks2, | 898 | .pin_banks = exynos4x12_pin_banks2, |
| @@ -908,7 +900,6 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { | |||
| 908 | .eint_gpio_init = exynos_eint_gpio_init, | 900 | .eint_gpio_init = exynos_eint_gpio_init, |
| 909 | .suspend = exynos_pinctrl_suspend, | 901 | .suspend = exynos_pinctrl_suspend, |
| 910 | .resume = exynos_pinctrl_resume, | 902 | .resume = exynos_pinctrl_resume, |
| 911 | .label = "exynos4x12-gpio-ctrl2", | ||
| 912 | }, { | 903 | }, { |
| 913 | /* pin-controller instance 3 data */ | 904 | /* pin-controller instance 3 data */ |
| 914 | .pin_banks = exynos4x12_pin_banks3, | 905 | .pin_banks = exynos4x12_pin_banks3, |
| @@ -916,7 +907,6 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { | |||
| 916 | .eint_gpio_init = exynos_eint_gpio_init, | 907 | .eint_gpio_init = exynos_eint_gpio_init, |
| 917 | .suspend = exynos_pinctrl_suspend, | 908 | .suspend = exynos_pinctrl_suspend, |
| 918 | .resume = exynos_pinctrl_resume, | 909 | .resume = exynos_pinctrl_resume, |
| 919 | .label = "exynos4x12-gpio-ctrl3", | ||
| 920 | }, | 910 | }, |
| 921 | }; | 911 | }; |
| 922 | 912 | ||
| @@ -989,7 +979,6 @@ struct samsung_pin_ctrl exynos5250_pin_ctrl[] = { | |||
| 989 | .eint_wkup_init = exynos_eint_wkup_init, | 979 | .eint_wkup_init = exynos_eint_wkup_init, |
| 990 | .suspend = exynos_pinctrl_suspend, | 980 | .suspend = exynos_pinctrl_suspend, |
| 991 | .resume = exynos_pinctrl_resume, | 981 | .resume = exynos_pinctrl_resume, |
| 992 | .label = "exynos5250-gpio-ctrl0", | ||
| 993 | }, { | 982 | }, { |
| 994 | /* pin-controller instance 1 data */ | 983 | /* pin-controller instance 1 data */ |
| 995 | .pin_banks = exynos5250_pin_banks1, | 984 | .pin_banks = exynos5250_pin_banks1, |
| @@ -997,7 +986,6 @@ struct samsung_pin_ctrl exynos5250_pin_ctrl[] = { | |||
| 997 | .eint_gpio_init = exynos_eint_gpio_init, | 986 | .eint_gpio_init = exynos_eint_gpio_init, |
| 998 | .suspend = exynos_pinctrl_suspend, | 987 | .suspend = exynos_pinctrl_suspend, |
| 999 | .resume = exynos_pinctrl_resume, | 988 | .resume = exynos_pinctrl_resume, |
| 1000 | .label = "exynos5250-gpio-ctrl1", | ||
| 1001 | }, { | 989 | }, { |
| 1002 | /* pin-controller instance 2 data */ | 990 | /* pin-controller instance 2 data */ |
| 1003 | .pin_banks = exynos5250_pin_banks2, | 991 | .pin_banks = exynos5250_pin_banks2, |
| @@ -1005,7 +993,6 @@ struct samsung_pin_ctrl exynos5250_pin_ctrl[] = { | |||
| 1005 | .eint_gpio_init = exynos_eint_gpio_init, | 993 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1006 | .suspend = exynos_pinctrl_suspend, | 994 | .suspend = exynos_pinctrl_suspend, |
| 1007 | .resume = exynos_pinctrl_resume, | 995 | .resume = exynos_pinctrl_resume, |
| 1008 | .label = "exynos5250-gpio-ctrl2", | ||
| 1009 | }, { | 996 | }, { |
| 1010 | /* pin-controller instance 3 data */ | 997 | /* pin-controller instance 3 data */ |
| 1011 | .pin_banks = exynos5250_pin_banks3, | 998 | .pin_banks = exynos5250_pin_banks3, |
| @@ -1013,7 +1000,6 @@ struct samsung_pin_ctrl exynos5250_pin_ctrl[] = { | |||
| 1013 | .eint_gpio_init = exynos_eint_gpio_init, | 1000 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1014 | .suspend = exynos_pinctrl_suspend, | 1001 | .suspend = exynos_pinctrl_suspend, |
| 1015 | .resume = exynos_pinctrl_resume, | 1002 | .resume = exynos_pinctrl_resume, |
| 1016 | .label = "exynos5250-gpio-ctrl3", | ||
| 1017 | }, | 1003 | }, |
| 1018 | }; | 1004 | }; |
| 1019 | 1005 | ||
| @@ -1068,19 +1054,16 @@ struct samsung_pin_ctrl exynos5260_pin_ctrl[] = { | |||
| 1068 | .nr_banks = ARRAY_SIZE(exynos5260_pin_banks0), | 1054 | .nr_banks = ARRAY_SIZE(exynos5260_pin_banks0), |
| 1069 | .eint_gpio_init = exynos_eint_gpio_init, | 1055 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1070 | .eint_wkup_init = exynos_eint_wkup_init, | 1056 | .eint_wkup_init = exynos_eint_wkup_init, |
| 1071 | .label = "exynos5260-gpio-ctrl0", | ||
| 1072 | }, { | 1057 | }, { |
| 1073 | /* pin-controller instance 1 data */ | 1058 | /* pin-controller instance 1 data */ |
| 1074 | .pin_banks = exynos5260_pin_banks1, | 1059 | .pin_banks = exynos5260_pin_banks1, |
| 1075 | .nr_banks = ARRAY_SIZE(exynos5260_pin_banks1), | 1060 | .nr_banks = ARRAY_SIZE(exynos5260_pin_banks1), |
| 1076 | .eint_gpio_init = exynos_eint_gpio_init, | 1061 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1077 | .label = "exynos5260-gpio-ctrl1", | ||
| 1078 | }, { | 1062 | }, { |
| 1079 | /* pin-controller instance 2 data */ | 1063 | /* pin-controller instance 2 data */ |
| 1080 | .pin_banks = exynos5260_pin_banks2, | 1064 | .pin_banks = exynos5260_pin_banks2, |
| 1081 | .nr_banks = ARRAY_SIZE(exynos5260_pin_banks2), | 1065 | .nr_banks = ARRAY_SIZE(exynos5260_pin_banks2), |
| 1082 | .eint_gpio_init = exynos_eint_gpio_init, | 1066 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1083 | .label = "exynos5260-gpio-ctrl2", | ||
| 1084 | }, | 1067 | }, |
| 1085 | }; | 1068 | }; |
| 1086 | 1069 | ||
| @@ -1151,30 +1134,25 @@ struct samsung_pin_ctrl exynos5420_pin_ctrl[] = { | |||
| 1151 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks0), | 1134 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks0), |
| 1152 | .eint_gpio_init = exynos_eint_gpio_init, | 1135 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1153 | .eint_wkup_init = exynos_eint_wkup_init, | 1136 | .eint_wkup_init = exynos_eint_wkup_init, |
| 1154 | .label = "exynos5420-gpio-ctrl0", | ||
| 1155 | }, { | 1137 | }, { |
| 1156 | /* pin-controller instance 1 data */ | 1138 | /* pin-controller instance 1 data */ |
| 1157 | .pin_banks = exynos5420_pin_banks1, | 1139 | .pin_banks = exynos5420_pin_banks1, |
| 1158 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks1), | 1140 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks1), |
| 1159 | .eint_gpio_init = exynos_eint_gpio_init, | 1141 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1160 | .label = "exynos5420-gpio-ctrl1", | ||
| 1161 | }, { | 1142 | }, { |
| 1162 | /* pin-controller instance 2 data */ | 1143 | /* pin-controller instance 2 data */ |
| 1163 | .pin_banks = exynos5420_pin_banks2, | 1144 | .pin_banks = exynos5420_pin_banks2, |
| 1164 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks2), | 1145 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks2), |
| 1165 | .eint_gpio_init = exynos_eint_gpio_init, | 1146 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1166 | .label = "exynos5420-gpio-ctrl2", | ||
| 1167 | }, { | 1147 | }, { |
| 1168 | /* pin-controller instance 3 data */ | 1148 | /* pin-controller instance 3 data */ |
| 1169 | .pin_banks = exynos5420_pin_banks3, | 1149 | .pin_banks = exynos5420_pin_banks3, |
| 1170 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks3), | 1150 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks3), |
| 1171 | .eint_gpio_init = exynos_eint_gpio_init, | 1151 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1172 | .label = "exynos5420-gpio-ctrl3", | ||
| 1173 | }, { | 1152 | }, { |
| 1174 | /* pin-controller instance 4 data */ | 1153 | /* pin-controller instance 4 data */ |
| 1175 | .pin_banks = exynos5420_pin_banks4, | 1154 | .pin_banks = exynos5420_pin_banks4, |
| 1176 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks4), | 1155 | .nr_banks = ARRAY_SIZE(exynos5420_pin_banks4), |
| 1177 | .eint_gpio_init = exynos_eint_gpio_init, | 1156 | .eint_gpio_init = exynos_eint_gpio_init, |
| 1178 | .label = "exynos5420-gpio-ctrl4", | ||
| 1179 | }, | 1157 | }, |
| 1180 | }; | 1158 | }; |
diff --git a/drivers/pinctrl/samsung/pinctrl-s3c24xx.c b/drivers/pinctrl/samsung/pinctrl-s3c24xx.c index ad3eaad17001..e38925906bd3 100644 --- a/drivers/pinctrl/samsung/pinctrl-s3c24xx.c +++ b/drivers/pinctrl/samsung/pinctrl-s3c24xx.c | |||
| @@ -578,7 +578,6 @@ struct samsung_pin_ctrl s3c2412_pin_ctrl[] = { | |||
| 578 | .pin_banks = s3c2412_pin_banks, | 578 | .pin_banks = s3c2412_pin_banks, |
| 579 | .nr_banks = ARRAY_SIZE(s3c2412_pin_banks), | 579 | .nr_banks = ARRAY_SIZE(s3c2412_pin_banks), |
| 580 | .eint_wkup_init = s3c24xx_eint_init, | 580 | .eint_wkup_init = s3c24xx_eint_init, |
| 581 | .label = "S3C2412-GPIO", | ||
| 582 | }, | 581 | }, |
| 583 | }; | 582 | }; |
| 584 | 583 | ||
| @@ -601,7 +600,6 @@ struct samsung_pin_ctrl s3c2416_pin_ctrl[] = { | |||
| 601 | .pin_banks = s3c2416_pin_banks, | 600 | .pin_banks = s3c2416_pin_banks, |
| 602 | .nr_banks = ARRAY_SIZE(s3c2416_pin_banks), | 601 | .nr_banks = ARRAY_SIZE(s3c2416_pin_banks), |
| 603 | .eint_wkup_init = s3c24xx_eint_init, | 602 | .eint_wkup_init = s3c24xx_eint_init, |
| 604 | .label = "S3C2416-GPIO", | ||
| 605 | }, | 603 | }, |
| 606 | }; | 604 | }; |
| 607 | 605 | ||
| @@ -622,7 +620,6 @@ struct samsung_pin_ctrl s3c2440_pin_ctrl[] = { | |||
| 622 | .pin_banks = s3c2440_pin_banks, | 620 | .pin_banks = s3c2440_pin_banks, |
| 623 | .nr_banks = ARRAY_SIZE(s3c2440_pin_banks), | 621 | .nr_banks = ARRAY_SIZE(s3c2440_pin_banks), |
| 624 | .eint_wkup_init = s3c24xx_eint_init, | 622 | .eint_wkup_init = s3c24xx_eint_init, |
| 625 | .label = "S3C2440-GPIO", | ||
| 626 | }, | 623 | }, |
| 627 | }; | 624 | }; |
| 628 | 625 | ||
| @@ -646,6 +643,5 @@ struct samsung_pin_ctrl s3c2450_pin_ctrl[] = { | |||
| 646 | .pin_banks = s3c2450_pin_banks, | 643 | .pin_banks = s3c2450_pin_banks, |
| 647 | .nr_banks = ARRAY_SIZE(s3c2450_pin_banks), | 644 | .nr_banks = ARRAY_SIZE(s3c2450_pin_banks), |
| 648 | .eint_wkup_init = s3c24xx_eint_init, | 645 | .eint_wkup_init = s3c24xx_eint_init, |
| 649 | .label = "S3C2450-GPIO", | ||
| 650 | }, | 646 | }, |
| 651 | }; | 647 | }; |
diff --git a/drivers/pinctrl/samsung/pinctrl-s3c64xx.c b/drivers/pinctrl/samsung/pinctrl-s3c64xx.c index 89143c903000..fcf8c36e727e 100644 --- a/drivers/pinctrl/samsung/pinctrl-s3c64xx.c +++ b/drivers/pinctrl/samsung/pinctrl-s3c64xx.c | |||
| @@ -811,6 +811,5 @@ struct samsung_pin_ctrl s3c64xx_pin_ctrl[] = { | |||
| 811 | .nr_banks = ARRAY_SIZE(s3c64xx_pin_banks0), | 811 | .nr_banks = ARRAY_SIZE(s3c64xx_pin_banks0), |
| 812 | .eint_gpio_init = s3c64xx_eint_gpio_init, | 812 | .eint_gpio_init = s3c64xx_eint_gpio_init, |
| 813 | .eint_wkup_init = s3c64xx_eint_eint0_init, | 813 | .eint_wkup_init = s3c64xx_eint_eint0_init, |
| 814 | .label = "S3C64xx-GPIO", | ||
| 815 | }, | 814 | }, |
| 816 | }; | 815 | }; |
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.h b/drivers/pinctrl/samsung/pinctrl-samsung.h index 5cedc9d26390..da527b390513 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.h +++ b/drivers/pinctrl/samsung/pinctrl-samsung.h | |||
| @@ -161,7 +161,6 @@ struct samsung_pin_bank { | |||
| 161 | * interrupts for the controller. | 161 | * interrupts for the controller. |
| 162 | * @eint_wkup_init: platform specific callback to setup the external wakeup | 162 | * @eint_wkup_init: platform specific callback to setup the external wakeup |
| 163 | * interrupts for the controller. | 163 | * interrupts for the controller. |
| 164 | * @label: for debug information. | ||
| 165 | */ | 164 | */ |
| 166 | struct samsung_pin_ctrl { | 165 | struct samsung_pin_ctrl { |
| 167 | struct samsung_pin_bank *pin_banks; | 166 | struct samsung_pin_bank *pin_banks; |
| @@ -174,8 +173,6 @@ struct samsung_pin_ctrl { | |||
| 174 | int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *); | 173 | int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *); |
| 175 | void (*suspend)(struct samsung_pinctrl_drv_data *); | 174 | void (*suspend)(struct samsung_pinctrl_drv_data *); |
| 176 | void (*resume)(struct samsung_pinctrl_drv_data *); | 175 | void (*resume)(struct samsung_pinctrl_drv_data *); |
| 177 | |||
| 178 | char *label; | ||
| 179 | }; | 176 | }; |
| 180 | 177 | ||
| 181 | /** | 178 | /** |
