aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/88pm860x-core.c68
-rw-r--r--drivers/mfd/ab8500-core.c34
-rw-r--r--drivers/mfd/cs5535-mfd.c4
-rw-r--r--drivers/mfd/da9052-core.c2
-rw-r--r--drivers/mfd/lpc_ich.c2
-rw-r--r--drivers/mfd/max77686.c2
-rw-r--r--drivers/mfd/max8925-core.c52
-rw-r--r--drivers/mfd/palmas.c2
-rw-r--r--drivers/mfd/sm501.c2
-rw-r--r--drivers/mfd/sta2x11-mfd.c4
-rw-r--r--drivers/mfd/tc6393xb.c6
-rw-r--r--drivers/mfd/timberdale.c34
12 files changed, 106 insertions, 106 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index ad36ad70a0c2..20dd0d41aee4 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -28,111 +28,111 @@
28 28
29#define INT_STATUS_NUM 3 29#define INT_STATUS_NUM 3
30 30
31static struct resource bk0_resources[] __devinitdata = { 31static struct resource bk0_resources[] = {
32 {2, 2, "duty cycle", IORESOURCE_REG, }, 32 {2, 2, "duty cycle", IORESOURCE_REG, },
33 {3, 3, "always on", IORESOURCE_REG, }, 33 {3, 3, "always on", IORESOURCE_REG, },
34 {3, 3, "current", IORESOURCE_REG, }, 34 {3, 3, "current", IORESOURCE_REG, },
35}; 35};
36static struct resource bk1_resources[] __devinitdata = { 36static struct resource bk1_resources[] = {
37 {4, 4, "duty cycle", IORESOURCE_REG, }, 37 {4, 4, "duty cycle", IORESOURCE_REG, },
38 {5, 5, "always on", IORESOURCE_REG, }, 38 {5, 5, "always on", IORESOURCE_REG, },
39 {5, 5, "current", IORESOURCE_REG, }, 39 {5, 5, "current", IORESOURCE_REG, },
40}; 40};
41static struct resource bk2_resources[] __devinitdata = { 41static struct resource bk2_resources[] = {
42 {6, 6, "duty cycle", IORESOURCE_REG, }, 42 {6, 6, "duty cycle", IORESOURCE_REG, },
43 {7, 7, "always on", IORESOURCE_REG, }, 43 {7, 7, "always on", IORESOURCE_REG, },
44 {5, 5, "current", IORESOURCE_REG, }, 44 {5, 5, "current", IORESOURCE_REG, },
45}; 45};
46 46
47static struct resource led0_resources[] __devinitdata = { 47static struct resource led0_resources[] = {
48 /* RGB1 Red LED */ 48 /* RGB1 Red LED */
49 {0xd, 0xd, "control", IORESOURCE_REG, }, 49 {0xd, 0xd, "control", IORESOURCE_REG, },
50 {0xc, 0xc, "blink", IORESOURCE_REG, }, 50 {0xc, 0xc, "blink", IORESOURCE_REG, },
51}; 51};
52static struct resource led1_resources[] __devinitdata = { 52static struct resource led1_resources[] = {
53 /* RGB1 Green LED */ 53 /* RGB1 Green LED */
54 {0xe, 0xe, "control", IORESOURCE_REG, }, 54 {0xe, 0xe, "control", IORESOURCE_REG, },
55 {0xc, 0xc, "blink", IORESOURCE_REG, }, 55 {0xc, 0xc, "blink", IORESOURCE_REG, },
56}; 56};
57static struct resource led2_resources[] __devinitdata = { 57static struct resource led2_resources[] = {
58 /* RGB1 Blue LED */ 58 /* RGB1 Blue LED */
59 {0xf, 0xf, "control", IORESOURCE_REG, }, 59 {0xf, 0xf, "control", IORESOURCE_REG, },
60 {0xc, 0xc, "blink", IORESOURCE_REG, }, 60 {0xc, 0xc, "blink", IORESOURCE_REG, },
61}; 61};
62static struct resource led3_resources[] __devinitdata = { 62static struct resource led3_resources[] = {
63 /* RGB2 Red LED */ 63 /* RGB2 Red LED */
64 {0x9, 0x9, "control", IORESOURCE_REG, }, 64 {0x9, 0x9, "control", IORESOURCE_REG, },
65 {0x8, 0x8, "blink", IORESOURCE_REG, }, 65 {0x8, 0x8, "blink", IORESOURCE_REG, },
66}; 66};
67static struct resource led4_resources[] __devinitdata = { 67static struct resource led4_resources[] = {
68 /* RGB2 Green LED */ 68 /* RGB2 Green LED */
69 {0xa, 0xa, "control", IORESOURCE_REG, }, 69 {0xa, 0xa, "control", IORESOURCE_REG, },
70 {0x8, 0x8, "blink", IORESOURCE_REG, }, 70 {0x8, 0x8, "blink", IORESOURCE_REG, },
71}; 71};
72static struct resource led5_resources[] __devinitdata = { 72static struct resource led5_resources[] = {
73 /* RGB2 Blue LED */ 73 /* RGB2 Blue LED */
74 {0xb, 0xb, "control", IORESOURCE_REG, }, 74 {0xb, 0xb, "control", IORESOURCE_REG, },
75 {0x8, 0x8, "blink", IORESOURCE_REG, }, 75 {0x8, 0x8, "blink", IORESOURCE_REG, },
76}; 76};
77 77
78static struct resource buck1_resources[] __devinitdata = { 78static struct resource buck1_resources[] = {
79 {0x24, 0x24, "buck set", IORESOURCE_REG, }, 79 {0x24, 0x24, "buck set", IORESOURCE_REG, },
80}; 80};
81static struct resource buck2_resources[] __devinitdata = { 81static struct resource buck2_resources[] = {
82 {0x25, 0x25, "buck set", IORESOURCE_REG, }, 82 {0x25, 0x25, "buck set", IORESOURCE_REG, },
83}; 83};
84static struct resource buck3_resources[] __devinitdata = { 84static struct resource buck3_resources[] = {
85 {0x26, 0x26, "buck set", IORESOURCE_REG, }, 85 {0x26, 0x26, "buck set", IORESOURCE_REG, },
86}; 86};
87static struct resource ldo1_resources[] __devinitdata = { 87static struct resource ldo1_resources[] = {
88 {0x10, 0x10, "ldo set", IORESOURCE_REG, }, 88 {0x10, 0x10, "ldo set", IORESOURCE_REG, },
89}; 89};
90static struct resource ldo2_resources[] __devinitdata = { 90static struct resource ldo2_resources[] = {
91 {0x11, 0x11, "ldo set", IORESOURCE_REG, }, 91 {0x11, 0x11, "ldo set", IORESOURCE_REG, },
92}; 92};
93static struct resource ldo3_resources[] __devinitdata = { 93static struct resource ldo3_resources[] = {
94 {0x12, 0x12, "ldo set", IORESOURCE_REG, }, 94 {0x12, 0x12, "ldo set", IORESOURCE_REG, },
95}; 95};
96static struct resource ldo4_resources[] __devinitdata = { 96static struct resource ldo4_resources[] = {
97 {0x13, 0x13, "ldo set", IORESOURCE_REG, }, 97 {0x13, 0x13, "ldo set", IORESOURCE_REG, },
98}; 98};
99static struct resource ldo5_resources[] __devinitdata = { 99static struct resource ldo5_resources[] = {
100 {0x14, 0x14, "ldo set", IORESOURCE_REG, }, 100 {0x14, 0x14, "ldo set", IORESOURCE_REG, },
101}; 101};
102static struct resource ldo6_resources[] __devinitdata = { 102static struct resource ldo6_resources[] = {
103 {0x15, 0x15, "ldo set", IORESOURCE_REG, }, 103 {0x15, 0x15, "ldo set", IORESOURCE_REG, },
104}; 104};
105static struct resource ldo7_resources[] __devinitdata = { 105static struct resource ldo7_resources[] = {
106 {0x16, 0x16, "ldo set", IORESOURCE_REG, }, 106 {0x16, 0x16, "ldo set", IORESOURCE_REG, },
107}; 107};
108static struct resource ldo8_resources[] __devinitdata = { 108static struct resource ldo8_resources[] = {
109 {0x17, 0x17, "ldo set", IORESOURCE_REG, }, 109 {0x17, 0x17, "ldo set", IORESOURCE_REG, },
110}; 110};
111static struct resource ldo9_resources[] __devinitdata = { 111static struct resource ldo9_resources[] = {
112 {0x18, 0x18, "ldo set", IORESOURCE_REG, }, 112 {0x18, 0x18, "ldo set", IORESOURCE_REG, },
113}; 113};
114static struct resource ldo10_resources[] __devinitdata = { 114static struct resource ldo10_resources[] = {
115 {0x19, 0x19, "ldo set", IORESOURCE_REG, }, 115 {0x19, 0x19, "ldo set", IORESOURCE_REG, },
116}; 116};
117static struct resource ldo12_resources[] __devinitdata = { 117static struct resource ldo12_resources[] = {
118 {0x1a, 0x1a, "ldo set", IORESOURCE_REG, }, 118 {0x1a, 0x1a, "ldo set", IORESOURCE_REG, },
119}; 119};
120static struct resource ldo_vibrator_resources[] __devinitdata = { 120static struct resource ldo_vibrator_resources[] = {
121 {0x28, 0x28, "ldo set", IORESOURCE_REG, }, 121 {0x28, 0x28, "ldo set", IORESOURCE_REG, },
122}; 122};
123static struct resource ldo14_resources[] __devinitdata = { 123static struct resource ldo14_resources[] = {
124 {0x1b, 0x1b, "ldo set", IORESOURCE_REG, }, 124 {0x1b, 0x1b, "ldo set", IORESOURCE_REG, },
125}; 125};
126 126
127static struct resource touch_resources[] __devinitdata = { 127static struct resource touch_resources[] = {
128 {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,}, 128 {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,},
129}; 129};
130 130
131static struct resource onkey_resources[] __devinitdata = { 131static struct resource onkey_resources[] = {
132 {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,}, 132 {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,},
133}; 133};
134 134
135static struct resource codec_resources[] __devinitdata = { 135static struct resource codec_resources[] = {
136 /* Headset microphone insertion or removal */ 136 /* Headset microphone insertion or removal */
137 {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,}, 137 {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,},
138 /* Hook-switch press or release */ 138 /* Hook-switch press or release */
@@ -143,12 +143,12 @@ static struct resource codec_resources[] __devinitdata = {
143 {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,}, 143 {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,},
144}; 144};
145 145
146static struct resource battery_resources[] __devinitdata = { 146static struct resource battery_resources[] = {
147 {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,}, 147 {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,},
148 {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,}, 148 {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,},
149}; 149};
150 150
151static struct resource charger_resources[] __devinitdata = { 151static struct resource charger_resources[] = {
152 {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,}, 152 {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,},
153 {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,}, 153 {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,},
154 {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,}, 154 {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,},
@@ -158,11 +158,11 @@ static struct resource charger_resources[] __devinitdata = {
158 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,}, 158 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,},
159}; 159};
160 160
161static struct resource rtc_resources[] __devinitdata = { 161static struct resource rtc_resources[] = {
162 {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,}, 162 {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},
163}; 163};
164 164
165static struct mfd_cell bk_devs[] __devinitdata = { 165static struct mfd_cell bk_devs[] = {
166 { 166 {
167 .name = "88pm860x-backlight", 167 .name = "88pm860x-backlight",
168 .id = 0, 168 .id = 0,
@@ -181,7 +181,7 @@ static struct mfd_cell bk_devs[] __devinitdata = {
181 }, 181 },
182}; 182};
183 183
184static struct mfd_cell led_devs[] __devinitdata = { 184static struct mfd_cell led_devs[] = {
185 { 185 {
186 .name = "88pm860x-led", 186 .name = "88pm860x-led",
187 .id = 0, 187 .id = 0,
@@ -215,7 +215,7 @@ static struct mfd_cell led_devs[] __devinitdata = {
215 }, 215 },
216}; 216};
217 217
218static struct mfd_cell reg_devs[] __devinitdata = { 218static struct mfd_cell reg_devs[] = {
219 { 219 {
220 .name = "88pm860x-regulator", 220 .name = "88pm860x-regulator",
221 .id = 0, 221 .id = 0,
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 43245f2ce758..7335a9c8ffae 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -623,7 +623,7 @@ static struct resource __devinitdata ab9540_gpio_resources[] = {
623 } 623 }
624}; 624};
625 625
626static struct resource __devinitdata ab8500_gpadc_resources[] = { 626static struct resource ab8500_gpadc_resources[] = {
627 { 627 {
628 .name = "HW_CONV_END", 628 .name = "HW_CONV_END",
629 .start = AB8500_INT_GP_HW_ADC_CONV_END, 629 .start = AB8500_INT_GP_HW_ADC_CONV_END,
@@ -638,7 +638,7 @@ static struct resource __devinitdata ab8500_gpadc_resources[] = {
638 }, 638 },
639}; 639};
640 640
641static struct resource __devinitdata ab8500_rtc_resources[] = { 641static struct resource ab8500_rtc_resources[] = {
642 { 642 {
643 .name = "60S", 643 .name = "60S",
644 .start = AB8500_INT_RTC_60S, 644 .start = AB8500_INT_RTC_60S,
@@ -653,7 +653,7 @@ static struct resource __devinitdata ab8500_rtc_resources[] = {
653 }, 653 },
654}; 654};
655 655
656static struct resource __devinitdata ab8500_poweronkey_db_resources[] = { 656static struct resource ab8500_poweronkey_db_resources[] = {
657 { 657 {
658 .name = "ONKEY_DBF", 658 .name = "ONKEY_DBF",
659 .start = AB8500_INT_PON_KEY1DB_F, 659 .start = AB8500_INT_PON_KEY1DB_F,
@@ -668,7 +668,7 @@ static struct resource __devinitdata ab8500_poweronkey_db_resources[] = {
668 }, 668 },
669}; 669};
670 670
671static struct resource __devinitdata ab8500_av_acc_detect_resources[] = { 671static struct resource ab8500_av_acc_detect_resources[] = {
672 { 672 {
673 .name = "ACC_DETECT_1DB_F", 673 .name = "ACC_DETECT_1DB_F",
674 .start = AB8500_INT_ACC_DETECT_1DB_F, 674 .start = AB8500_INT_ACC_DETECT_1DB_F,
@@ -707,7 +707,7 @@ static struct resource __devinitdata ab8500_av_acc_detect_resources[] = {
707 }, 707 },
708}; 708};
709 709
710static struct resource __devinitdata ab8500_charger_resources[] = { 710static struct resource ab8500_charger_resources[] = {
711 { 711 {
712 .name = "MAIN_CH_UNPLUG_DET", 712 .name = "MAIN_CH_UNPLUG_DET",
713 .start = AB8500_INT_MAIN_CH_UNPLUG_DET, 713 .start = AB8500_INT_MAIN_CH_UNPLUG_DET,
@@ -788,7 +788,7 @@ static struct resource __devinitdata ab8500_charger_resources[] = {
788 }, 788 },
789}; 789};
790 790
791static struct resource __devinitdata ab8500_btemp_resources[] = { 791static struct resource ab8500_btemp_resources[] = {
792 { 792 {
793 .name = "BAT_CTRL_INDB", 793 .name = "BAT_CTRL_INDB",
794 .start = AB8500_INT_BAT_CTRL_INDB, 794 .start = AB8500_INT_BAT_CTRL_INDB,
@@ -821,7 +821,7 @@ static struct resource __devinitdata ab8500_btemp_resources[] = {
821 }, 821 },
822}; 822};
823 823
824static struct resource __devinitdata ab8500_fg_resources[] = { 824static struct resource ab8500_fg_resources[] = {
825 { 825 {
826 .name = "NCONV_ACCU", 826 .name = "NCONV_ACCU",
827 .start = AB8500_INT_CCN_CONV_ACC, 827 .start = AB8500_INT_CCN_CONV_ACC,
@@ -860,10 +860,10 @@ static struct resource __devinitdata ab8500_fg_resources[] = {
860 }, 860 },
861}; 861};
862 862
863static struct resource __devinitdata ab8500_chargalg_resources[] = {}; 863static struct resource ab8500_chargalg_resources[] = {};
864 864
865#ifdef CONFIG_DEBUG_FS 865#ifdef CONFIG_DEBUG_FS
866static struct resource __devinitdata ab8500_debug_resources[] = { 866static struct resource ab8500_debug_resources[] = {
867 { 867 {
868 .name = "IRQ_FIRST", 868 .name = "IRQ_FIRST",
869 .start = AB8500_INT_MAIN_EXT_CH_NOT_OK, 869 .start = AB8500_INT_MAIN_EXT_CH_NOT_OK,
@@ -879,7 +879,7 @@ static struct resource __devinitdata ab8500_debug_resources[] = {
879}; 879};
880#endif 880#endif
881 881
882static struct resource __devinitdata ab8500_usb_resources[] = { 882static struct resource ab8500_usb_resources[] = {
883 { 883 {
884 .name = "ID_WAKEUP_R", 884 .name = "ID_WAKEUP_R",
885 .start = AB8500_INT_ID_WAKEUP_R, 885 .start = AB8500_INT_ID_WAKEUP_R,
@@ -924,7 +924,7 @@ static struct resource __devinitdata ab8500_usb_resources[] = {
924 }, 924 },
925}; 925};
926 926
927static struct resource __devinitdata ab8505_iddet_resources[] = { 927static struct resource ab8505_iddet_resources[] = {
928 { 928 {
929 .name = "KeyDeglitch", 929 .name = "KeyDeglitch",
930 .start = AB8505_INT_KEYDEGLITCH, 930 .start = AB8505_INT_KEYDEGLITCH,
@@ -957,7 +957,7 @@ static struct resource __devinitdata ab8505_iddet_resources[] = {
957 }, 957 },
958}; 958};
959 959
960static struct resource __devinitdata ab8500_temp_resources[] = { 960static struct resource ab8500_temp_resources[] = {
961 { 961 {
962 .name = "AB8500_TEMP_WARM", 962 .name = "AB8500_TEMP_WARM",
963 .start = AB8500_INT_TEMP_WARM, 963 .start = AB8500_INT_TEMP_WARM,
@@ -966,7 +966,7 @@ static struct resource __devinitdata ab8500_temp_resources[] = {
966 }, 966 },
967}; 967};
968 968
969static struct mfd_cell __devinitdata abx500_common_devs[] = { 969static struct mfd_cell abx500_common_devs[] = {
970#ifdef CONFIG_DEBUG_FS 970#ifdef CONFIG_DEBUG_FS
971 { 971 {
972 .name = "ab8500-debug", 972 .name = "ab8500-debug",
@@ -1038,7 +1038,7 @@ static struct mfd_cell __devinitdata abx500_common_devs[] = {
1038 }, 1038 },
1039}; 1039};
1040 1040
1041static struct mfd_cell __devinitdata ab8500_bm_devs[] = { 1041static struct mfd_cell ab8500_bm_devs[] = {
1042 { 1042 {
1043 .name = "ab8500-charger", 1043 .name = "ab8500-charger",
1044 .num_resources = ARRAY_SIZE(ab8500_charger_resources), 1044 .num_resources = ARRAY_SIZE(ab8500_charger_resources),
@@ -1061,7 +1061,7 @@ static struct mfd_cell __devinitdata ab8500_bm_devs[] = {
1061 }, 1061 },
1062}; 1062};
1063 1063
1064static struct mfd_cell __devinitdata ab8500_devs[] = { 1064static struct mfd_cell ab8500_devs[] = {
1065 { 1065 {
1066 .name = "ab8500-gpio", 1066 .name = "ab8500-gpio",
1067 .of_compatible = "stericsson,ab8500-gpio", 1067 .of_compatible = "stericsson,ab8500-gpio",
@@ -1080,7 +1080,7 @@ static struct mfd_cell __devinitdata ab8500_devs[] = {
1080 }, 1080 },
1081}; 1081};
1082 1082
1083static struct mfd_cell __devinitdata ab9540_devs[] = { 1083static struct mfd_cell ab9540_devs[] = {
1084 { 1084 {
1085 .name = "ab8500-gpio", 1085 .name = "ab8500-gpio",
1086 .num_resources = ARRAY_SIZE(ab9540_gpio_resources), 1086 .num_resources = ARRAY_SIZE(ab9540_gpio_resources),
@@ -1097,7 +1097,7 @@ static struct mfd_cell __devinitdata ab9540_devs[] = {
1097}; 1097};
1098 1098
1099/* Device list common to ab9540 and ab8505 */ 1099/* Device list common to ab9540 and ab8505 */
1100static struct mfd_cell __devinitdata ab9540_ab8505_devs[] = { 1100static struct mfd_cell ab9540_ab8505_devs[] = {
1101 { 1101 {
1102 .name = "ab-iddet", 1102 .name = "ab-iddet",
1103 .num_resources = ARRAY_SIZE(ab8505_iddet_resources), 1103 .num_resources = ARRAY_SIZE(ab8505_iddet_resources),
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index 0779b13a7dd1..d9dc87f067d8 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -71,9 +71,9 @@ static int cs5535_mfd_res_disable(struct platform_device *pdev)
71 return 0; 71 return 0;
72} 72}
73 73
74static __devinitdata struct resource cs5535_mfd_resources[NR_BARS]; 74static struct resource cs5535_mfd_resources[NR_BARS];
75 75
76static __devinitdata struct mfd_cell cs5535_mfd_cells[] = { 76static struct mfd_cell cs5535_mfd_cells[] = {
77 { 77 {
78 .id = SMB_BAR, 78 .id = SMB_BAR,
79 .name = "cs5535-smb", 79 .name = "cs5535-smb",
diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c
index c71c4a247186..689b747416af 100644
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@ -515,7 +515,7 @@ static struct resource da9052_tsi_resources[] = {
515 }, 515 },
516}; 516};
517 517
518static struct mfd_cell __devinitdata da9052_subdev_info[] = { 518static struct mfd_cell da9052_subdev_info[] = {
519 { 519 {
520 .name = "da9052-regulator", 520 .name = "da9052-regulator",
521 .id = 1, 521 .id = 1,
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index 99891752c338..7c83e1b56588 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -196,7 +196,7 @@ enum lpc_chipsets {
196 LPC_LPT_LP, /* Lynx Point-LP */ 196 LPC_LPT_LP, /* Lynx Point-LP */
197}; 197};
198 198
199struct lpc_ich_info lpc_chipset_info[] __devinitdata = { 199struct lpc_ich_info lpc_chipset_info[] = {
200 [LPC_ICH] = { 200 [LPC_ICH] = {
201 .name = "ICH", 201 .name = "ICH",
202 .iTCO_version = 1, 202 .iTCO_version = 1,
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index d9e24c849a00..f6878f8db57d 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -45,7 +45,7 @@ static struct regmap_config max77686_regmap_config = {
45}; 45};
46 46
47#ifdef CONFIG_OF 47#ifdef CONFIG_OF
48static struct of_device_id __devinitdata max77686_pmic_dt_match[] = { 48static struct of_device_id max77686_pmic_dt_match[] = {
49 {.compatible = "maxim,max77686", .data = 0}, 49 {.compatible = "maxim,max77686", .data = 0},
50 {}, 50 {},
51}; 51};
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index 20daa16b83c9..60325c49afda 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -19,12 +19,12 @@
19#include <linux/mfd/core.h> 19#include <linux/mfd/core.h>
20#include <linux/mfd/max8925.h> 20#include <linux/mfd/max8925.h>
21 21
22static struct resource bk_resources[] __devinitdata = { 22static struct resource bk_resources[] = {
23 { 0x84, 0x84, "mode control", IORESOURCE_REG, }, 23 { 0x84, 0x84, "mode control", IORESOURCE_REG, },
24 { 0x85, 0x85, "control", IORESOURCE_REG, }, 24 { 0x85, 0x85, "control", IORESOURCE_REG, },
25}; 25};
26 26
27static struct mfd_cell bk_devs[] __devinitdata = { 27static struct mfd_cell bk_devs[] = {
28 { 28 {
29 .name = "max8925-backlight", 29 .name = "max8925-backlight",
30 .num_resources = ARRAY_SIZE(bk_resources), 30 .num_resources = ARRAY_SIZE(bk_resources),
@@ -110,99 +110,99 @@ static struct mfd_cell onkey_devs[] = {
110 }, 110 },
111}; 111};
112 112
113static struct resource sd1_resources[] __devinitdata = { 113static struct resource sd1_resources[] = {
114 {0x06, 0x06, "sdv", IORESOURCE_REG, }, 114 {0x06, 0x06, "sdv", IORESOURCE_REG, },
115}; 115};
116 116
117static struct resource sd2_resources[] __devinitdata = { 117static struct resource sd2_resources[] = {
118 {0x09, 0x09, "sdv", IORESOURCE_REG, }, 118 {0x09, 0x09, "sdv", IORESOURCE_REG, },
119}; 119};
120 120
121static struct resource sd3_resources[] __devinitdata = { 121static struct resource sd3_resources[] = {
122 {0x0c, 0x0c, "sdv", IORESOURCE_REG, }, 122 {0x0c, 0x0c, "sdv", IORESOURCE_REG, },
123}; 123};
124 124
125static struct resource ldo1_resources[] __devinitdata = { 125static struct resource ldo1_resources[] = {
126 {0x1a, 0x1a, "ldov", IORESOURCE_REG, }, 126 {0x1a, 0x1a, "ldov", IORESOURCE_REG, },
127}; 127};
128 128
129static struct resource ldo2_resources[] __devinitdata = { 129static struct resource ldo2_resources[] = {
130 {0x1e, 0x1e, "ldov", IORESOURCE_REG, }, 130 {0x1e, 0x1e, "ldov", IORESOURCE_REG, },
131}; 131};
132 132
133static struct resource ldo3_resources[] __devinitdata = { 133static struct resource ldo3_resources[] = {
134 {0x22, 0x22, "ldov", IORESOURCE_REG, }, 134 {0x22, 0x22, "ldov", IORESOURCE_REG, },
135}; 135};
136 136
137static struct resource ldo4_resources[] __devinitdata = { 137static struct resource ldo4_resources[] = {
138 {0x26, 0x26, "ldov", IORESOURCE_REG, }, 138 {0x26, 0x26, "ldov", IORESOURCE_REG, },
139}; 139};
140 140
141static struct resource ldo5_resources[] __devinitdata = { 141static struct resource ldo5_resources[] = {
142 {0x2a, 0x2a, "ldov", IORESOURCE_REG, }, 142 {0x2a, 0x2a, "ldov", IORESOURCE_REG, },
143}; 143};
144 144
145static struct resource ldo6_resources[] __devinitdata = { 145static struct resource ldo6_resources[] = {
146 {0x2e, 0x2e, "ldov", IORESOURCE_REG, }, 146 {0x2e, 0x2e, "ldov", IORESOURCE_REG, },
147}; 147};
148 148
149static struct resource ldo7_resources[] __devinitdata = { 149static struct resource ldo7_resources[] = {
150 {0x32, 0x32, "ldov", IORESOURCE_REG, }, 150 {0x32, 0x32, "ldov", IORESOURCE_REG, },
151}; 151};
152 152
153static struct resource ldo8_resources[] __devinitdata = { 153static struct resource ldo8_resources[] = {
154 {0x36, 0x36, "ldov", IORESOURCE_REG, }, 154 {0x36, 0x36, "ldov", IORESOURCE_REG, },
155}; 155};
156 156
157static struct resource ldo9_resources[] __devinitdata = { 157static struct resource ldo9_resources[] = {
158 {0x3a, 0x3a, "ldov", IORESOURCE_REG, }, 158 {0x3a, 0x3a, "ldov", IORESOURCE_REG, },
159}; 159};
160 160
161static struct resource ldo10_resources[] __devinitdata = { 161static struct resource ldo10_resources[] = {
162 {0x3e, 0x3e, "ldov", IORESOURCE_REG, }, 162 {0x3e, 0x3e, "ldov", IORESOURCE_REG, },
163}; 163};
164 164
165static struct resource ldo11_resources[] __devinitdata = { 165static struct resource ldo11_resources[] = {
166 {0x42, 0x42, "ldov", IORESOURCE_REG, }, 166 {0x42, 0x42, "ldov", IORESOURCE_REG, },
167}; 167};
168 168
169static struct resource ldo12_resources[] __devinitdata = { 169static struct resource ldo12_resources[] = {
170 {0x46, 0x46, "ldov", IORESOURCE_REG, }, 170 {0x46, 0x46, "ldov", IORESOURCE_REG, },
171}; 171};
172 172
173static struct resource ldo13_resources[] __devinitdata = { 173static struct resource ldo13_resources[] = {
174 {0x4a, 0x4a, "ldov", IORESOURCE_REG, }, 174 {0x4a, 0x4a, "ldov", IORESOURCE_REG, },
175}; 175};
176 176
177static struct resource ldo14_resources[] __devinitdata = { 177static struct resource ldo14_resources[] = {
178 {0x4e, 0x4e, "ldov", IORESOURCE_REG, }, 178 {0x4e, 0x4e, "ldov", IORESOURCE_REG, },
179}; 179};
180 180
181static struct resource ldo15_resources[] __devinitdata = { 181static struct resource ldo15_resources[] = {
182 {0x52, 0x52, "ldov", IORESOURCE_REG, }, 182 {0x52, 0x52, "ldov", IORESOURCE_REG, },
183}; 183};
184 184
185static struct resource ldo16_resources[] __devinitdata = { 185static struct resource ldo16_resources[] = {
186 {0x12, 0x12, "ldov", IORESOURCE_REG, }, 186 {0x12, 0x12, "ldov", IORESOURCE_REG, },
187}; 187};
188 188
189static struct resource ldo17_resources[] __devinitdata = { 189static struct resource ldo17_resources[] = {
190 {0x16, 0x16, "ldov", IORESOURCE_REG, }, 190 {0x16, 0x16, "ldov", IORESOURCE_REG, },
191}; 191};
192 192
193static struct resource ldo18_resources[] __devinitdata = { 193static struct resource ldo18_resources[] = {
194 {0x74, 0x74, "ldov", IORESOURCE_REG, }, 194 {0x74, 0x74, "ldov", IORESOURCE_REG, },
195}; 195};
196 196
197static struct resource ldo19_resources[] __devinitdata = { 197static struct resource ldo19_resources[] = {
198 {0x5e, 0x5e, "ldov", IORESOURCE_REG, }, 198 {0x5e, 0x5e, "ldov", IORESOURCE_REG, },
199}; 199};
200 200
201static struct resource ldo20_resources[] __devinitdata = { 201static struct resource ldo20_resources[] = {
202 {0x9e, 0x9e, "ldov", IORESOURCE_REG, }, 202 {0x9e, 0x9e, "ldov", IORESOURCE_REG, },
203}; 203};
204 204
205static struct mfd_cell reg_devs[] __devinitdata = { 205static struct mfd_cell reg_devs[] = {
206 { 206 {
207 .name = "max8925-regulator", 207 .name = "max8925-regulator",
208 .id = 0, 208 .id = 0,
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index cb52783390c1..6ffd7a2affdc 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -492,7 +492,7 @@ static const struct i2c_device_id palmas_i2c_id[] = {
492}; 492};
493MODULE_DEVICE_TABLE(i2c, palmas_i2c_id); 493MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);
494 494
495static struct of_device_id __devinitdata of_palmas_match_tbl[] = { 495static struct of_device_id of_palmas_match_tbl[] = {
496 { .compatible = "ti,palmas", }, 496 { .compatible = "ti,palmas", },
497 { /* end */ } 497 { /* end */ }
498}; 498};
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index c9c102c49028..9b53733cb297 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1728,7 +1728,7 @@ static struct pci_driver sm501_pci_driver = {
1728 1728
1729MODULE_ALIAS("platform:sm501"); 1729MODULE_ALIAS("platform:sm501");
1730 1730
1731static struct of_device_id __devinitdata of_sm501_match_tbl[] = { 1731static struct of_device_id of_sm501_match_tbl[] = {
1732 { .compatible = "smi,sm501", }, 1732 { .compatible = "smi,sm501", },
1733 { /* end */ } 1733 { /* end */ }
1734}; 1734};
diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
index 2cfd55f343c2..1438be54170c 100644
--- a/drivers/mfd/sta2x11-mfd.c
+++ b/drivers/mfd/sta2x11-mfd.c
@@ -330,14 +330,14 @@ static const __devinitconst struct resource apbreg_resources[] = {
330#define DEV(_name, _r) \ 330#define DEV(_name, _r) \
331 { .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, } 331 { .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, }
332 332
333static __devinitdata struct mfd_cell sta2x11_mfd_bar0[] = { 333static struct mfd_cell sta2x11_mfd_bar0[] = {
334 DEV("sta2x11-gpio", gpio_resources), /* offset 0: we add pdata later */ 334 DEV("sta2x11-gpio", gpio_resources), /* offset 0: we add pdata later */
335 DEV("sta2x11-sctl", sctl_resources), 335 DEV("sta2x11-sctl", sctl_resources),
336 DEV("sta2x11-scr", scr_resources), 336 DEV("sta2x11-scr", scr_resources),
337 DEV("sta2x11-time", time_resources), 337 DEV("sta2x11-time", time_resources),
338}; 338};
339 339
340static __devinitdata struct mfd_cell sta2x11_mfd_bar1[] = { 340static struct mfd_cell sta2x11_mfd_bar1[] = {
341 DEV("sta2x11-apbreg", apbreg_resources), 341 DEV("sta2x11-apbreg", apbreg_resources),
342}; 342};
343 343
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 256723231a4e..1ff8ed6390d1 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -137,7 +137,7 @@ static int tc6393xb_nand_enable(struct platform_device *nand)
137 return 0; 137 return 0;
138} 138}
139 139
140static struct resource __devinitdata tc6393xb_nand_resources[] = { 140static struct resource tc6393xb_nand_resources[] = {
141 { 141 {
142 .start = 0x1000, 142 .start = 0x1000,
143 .end = 0x1007, 143 .end = 0x1007,
@@ -196,7 +196,7 @@ static const struct resource tc6393xb_ohci_resources[] = {
196 }, 196 },
197}; 197};
198 198
199static struct resource __devinitdata tc6393xb_fb_resources[] = { 199static struct resource tc6393xb_fb_resources[] = {
200 { 200 {
201 .start = 0x5000, 201 .start = 0x5000,
202 .end = 0x51ff, 202 .end = 0x51ff,
@@ -382,7 +382,7 @@ static struct tmio_mmc_data tc6393xb_mmc_data = {
382 .set_clk_div = tc6393xb_mmc_clk_div, 382 .set_clk_div = tc6393xb_mmc_clk_div,
383}; 383};
384 384
385static struct mfd_cell __devinitdata tc6393xb_cells[] = { 385static struct mfd_cell tc6393xb_cells[] = {
386 [TC6393XB_CELL_NAND] = { 386 [TC6393XB_CELL_NAND] = {
387 .name = "tmio-nand", 387 .name = "tmio-nand",
388 .enable = tc6393xb_nand_enable, 388 .enable = tc6393xb_nand_enable,
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index dddf1df57838..294e14dcd907 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -75,13 +75,13 @@ static struct i2c_board_info timberdale_i2c_board_info[] = {
75 }, 75 },
76}; 76};
77 77
78static __devinitdata struct xiic_i2c_platform_data 78static struct xiic_i2c_platform_data
79timberdale_xiic_platform_data = { 79timberdale_xiic_platform_data = {
80 .devices = timberdale_i2c_board_info, 80 .devices = timberdale_i2c_board_info,
81 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info) 81 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
82}; 82};
83 83
84static __devinitdata struct ocores_i2c_platform_data 84static struct ocores_i2c_platform_data
85timberdale_ocores_platform_data = { 85timberdale_ocores_platform_data = {
86 .reg_shift = 2, 86 .reg_shift = 2,
87 .clock_khz = 62500, 87 .clock_khz = 62500,
@@ -143,7 +143,7 @@ static struct spi_board_info timberdale_spi_8bit_board_info[] = {
143 }, 143 },
144}; 144};
145 145
146static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = { 146static struct xspi_platform_data timberdale_xspi_platform_data = {
147 .num_chipselect = 3, 147 .num_chipselect = 3,
148 .little_endian = true, 148 .little_endian = true,
149 /* bits per word and devices will be filled in runtime depending 149 /* bits per word and devices will be filled in runtime depending
@@ -164,7 +164,7 @@ static const __devinitconst struct resource timberdale_spi_resources[] = {
164 }, 164 },
165}; 165};
166 166
167static __devinitdata struct ks8842_platform_data 167static struct ks8842_platform_data
168 timberdale_ks8842_platform_data = { 168 timberdale_ks8842_platform_data = {
169 .rx_dma_channel = DMA_ETH_RX, 169 .rx_dma_channel = DMA_ETH_RX,
170 .tx_dma_channel = DMA_ETH_TX 170 .tx_dma_channel = DMA_ETH_TX
@@ -183,7 +183,7 @@ static const __devinitconst struct resource timberdale_eth_resources[] = {
183 }, 183 },
184}; 184};
185 185
186static __devinitdata struct timbgpio_platform_data 186static struct timbgpio_platform_data
187 timberdale_gpio_platform_data = { 187 timberdale_gpio_platform_data = {
188 .gpio_base = 0, 188 .gpio_base = 0,
189 .nr_pins = GPIO_NR_PINS, 189 .nr_pins = GPIO_NR_PINS,
@@ -247,13 +247,13 @@ static const __devinitconst struct resource timberdale_uartlite_resources[] = {
247 }, 247 },
248}; 248};
249 249
250static __devinitdata struct i2c_board_info timberdale_adv7180_i2c_board_info = { 250static struct i2c_board_info timberdale_adv7180_i2c_board_info = {
251 /* Requires jumper JP9 to be off */ 251 /* Requires jumper JP9 to be off */
252 I2C_BOARD_INFO("adv7180", 0x42 >> 1), 252 I2C_BOARD_INFO("adv7180", 0x42 >> 1),
253 .irq = IRQ_TIMBERDALE_ADV7180 253 .irq = IRQ_TIMBERDALE_ADV7180
254}; 254};
255 255
256static __devinitdata struct timb_video_platform_data 256static struct timb_video_platform_data
257 timberdale_video_platform_data = { 257 timberdale_video_platform_data = {
258 .dma_channel = DMA_VIDEO_RX, 258 .dma_channel = DMA_VIDEO_RX,
259 .i2c_adapter = 0, 259 .i2c_adapter = 0,
@@ -276,15 +276,15 @@ timberdale_radio_resources[] = {
276 }, 276 },
277}; 277};
278 278
279static __devinitdata struct i2c_board_info timberdale_tef6868_i2c_board_info = { 279static struct i2c_board_info timberdale_tef6868_i2c_board_info = {
280 I2C_BOARD_INFO("tef6862", 0x60) 280 I2C_BOARD_INFO("tef6862", 0x60)
281}; 281};
282 282
283static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = { 283static struct i2c_board_info timberdale_saa7706_i2c_board_info = {
284 I2C_BOARD_INFO("saa7706h", 0x1C) 284 I2C_BOARD_INFO("saa7706h", 0x1C)
285}; 285};
286 286
287static __devinitdata struct timb_radio_platform_data 287static struct timb_radio_platform_data
288 timberdale_radio_platform_data = { 288 timberdale_radio_platform_data = {
289 .i2c_adapter = 0, 289 .i2c_adapter = 0,
290 .tuner = &timberdale_tef6868_i2c_board_info, 290 .tuner = &timberdale_tef6868_i2c_board_info,
@@ -303,7 +303,7 @@ static const __devinitconst struct resource timberdale_video_resources[] = {
303 */ 303 */
304}; 304};
305 305
306static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = { 306static struct timb_dma_platform_data timb_dma_platform_data = {
307 .nr_channels = 10, 307 .nr_channels = 10,
308 .channels = { 308 .channels = {
309 { 309 {
@@ -375,7 +375,7 @@ static const __devinitconst struct resource timberdale_dma_resources[] = {
375 }, 375 },
376}; 376};
377 377
378static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { 378static struct mfd_cell timberdale_cells_bar0_cfg0[] = {
379 { 379 {
380 .name = "timb-dma", 380 .name = "timb-dma",
381 .num_resources = ARRAY_SIZE(timberdale_dma_resources), 381 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -432,7 +432,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
432 }, 432 },
433}; 433};
434 434
435static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { 435static struct mfd_cell timberdale_cells_bar0_cfg1[] = {
436 { 436 {
437 .name = "timb-dma", 437 .name = "timb-dma",
438 .num_resources = ARRAY_SIZE(timberdale_dma_resources), 438 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -499,7 +499,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
499 }, 499 },
500}; 500};
501 501
502static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { 502static struct mfd_cell timberdale_cells_bar0_cfg2[] = {
503 { 503 {
504 .name = "timb-dma", 504 .name = "timb-dma",
505 .num_resources = ARRAY_SIZE(timberdale_dma_resources), 505 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -549,7 +549,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
549 }, 549 },
550}; 550};
551 551
552static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { 552static struct mfd_cell timberdale_cells_bar0_cfg3[] = {
553 { 553 {
554 .name = "timb-dma", 554 .name = "timb-dma",
555 .num_resources = ARRAY_SIZE(timberdale_dma_resources), 555 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -620,7 +620,7 @@ static const __devinitconst struct resource timberdale_sdhc_resources[] = {
620 }, 620 },
621}; 621};
622 622
623static __devinitdata struct mfd_cell timberdale_cells_bar1[] = { 623static struct mfd_cell timberdale_cells_bar1[] = {
624 { 624 {
625 .name = "sdhci", 625 .name = "sdhci",
626 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources), 626 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources),
@@ -628,7 +628,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar1[] = {
628 }, 628 },
629}; 629};
630 630
631static __devinitdata struct mfd_cell timberdale_cells_bar2[] = { 631static struct mfd_cell timberdale_cells_bar2[] = {
632 { 632 {
633 .name = "sdhci", 633 .name = "sdhci",
634 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources), 634 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources),
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 06:38:59 -0500