diff options
Diffstat (limited to 'drivers/mfd/timberdale.c')
-rw-r--r-- | drivers/mfd/timberdale.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index cccc626c83c8..59e0ee247e86 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 | ||
78 | static __devinitdata struct xiic_i2c_platform_data | 78 | static struct xiic_i2c_platform_data |
79 | timberdale_xiic_platform_data = { | 79 | timberdale_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 | ||
84 | static __devinitdata struct ocores_i2c_platform_data | 84 | static struct ocores_i2c_platform_data |
85 | timberdale_ocores_platform_data = { | 85 | timberdale_ocores_platform_data = { |
86 | .reg_shift = 2, | 86 | .reg_shift = 2, |
87 | .clock_khz = 62500, | 87 | .clock_khz = 62500, |
@@ -89,7 +89,7 @@ timberdale_ocores_platform_data = { | |||
89 | .num_devices = ARRAY_SIZE(timberdale_i2c_board_info) | 89 | .num_devices = ARRAY_SIZE(timberdale_i2c_board_info) |
90 | }; | 90 | }; |
91 | 91 | ||
92 | static const __devinitconst struct resource timberdale_xiic_resources[] = { | 92 | static const struct resource timberdale_xiic_resources[] = { |
93 | { | 93 | { |
94 | .start = XIICOFFSET, | 94 | .start = XIICOFFSET, |
95 | .end = XIICEND, | 95 | .end = XIICEND, |
@@ -102,7 +102,7 @@ static const __devinitconst struct resource timberdale_xiic_resources[] = { | |||
102 | }, | 102 | }, |
103 | }; | 103 | }; |
104 | 104 | ||
105 | static const __devinitconst struct resource timberdale_ocores_resources[] = { | 105 | static const struct resource timberdale_ocores_resources[] = { |
106 | { | 106 | { |
107 | .start = OCORESOFFSET, | 107 | .start = OCORESOFFSET, |
108 | .end = OCORESEND, | 108 | .end = OCORESEND, |
@@ -143,7 +143,7 @@ static struct spi_board_info timberdale_spi_8bit_board_info[] = { | |||
143 | }, | 143 | }, |
144 | }; | 144 | }; |
145 | 145 | ||
146 | static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = { | 146 | static 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 |
@@ -151,7 +151,7 @@ static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = { | |||
151 | */ | 151 | */ |
152 | }; | 152 | }; |
153 | 153 | ||
154 | static const __devinitconst struct resource timberdale_spi_resources[] = { | 154 | static const struct resource timberdale_spi_resources[] = { |
155 | { | 155 | { |
156 | .start = SPIOFFSET, | 156 | .start = SPIOFFSET, |
157 | .end = SPIEND, | 157 | .end = SPIEND, |
@@ -164,13 +164,13 @@ static const __devinitconst struct resource timberdale_spi_resources[] = { | |||
164 | }, | 164 | }, |
165 | }; | 165 | }; |
166 | 166 | ||
167 | static __devinitdata struct ks8842_platform_data | 167 | static 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 |
171 | }; | 171 | }; |
172 | 172 | ||
173 | static const __devinitconst struct resource timberdale_eth_resources[] = { | 173 | static const struct resource timberdale_eth_resources[] = { |
174 | { | 174 | { |
175 | .start = ETHOFFSET, | 175 | .start = ETHOFFSET, |
176 | .end = ETHEND, | 176 | .end = ETHEND, |
@@ -183,14 +183,14 @@ static const __devinitconst struct resource timberdale_eth_resources[] = { | |||
183 | }, | 183 | }, |
184 | }; | 184 | }; |
185 | 185 | ||
186 | static __devinitdata struct timbgpio_platform_data | 186 | static 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, |
190 | .irq_base = 200, | 190 | .irq_base = 200, |
191 | }; | 191 | }; |
192 | 192 | ||
193 | static const __devinitconst struct resource timberdale_gpio_resources[] = { | 193 | static const struct resource timberdale_gpio_resources[] = { |
194 | { | 194 | { |
195 | .start = GPIOOFFSET, | 195 | .start = GPIOOFFSET, |
196 | .end = GPIOEND, | 196 | .end = GPIOEND, |
@@ -203,7 +203,7 @@ static const __devinitconst struct resource timberdale_gpio_resources[] = { | |||
203 | }, | 203 | }, |
204 | }; | 204 | }; |
205 | 205 | ||
206 | static const __devinitconst struct resource timberdale_mlogicore_resources[] = { | 206 | static const struct resource timberdale_mlogicore_resources[] = { |
207 | { | 207 | { |
208 | .start = MLCOREOFFSET, | 208 | .start = MLCOREOFFSET, |
209 | .end = MLCOREEND, | 209 | .end = MLCOREEND, |
@@ -221,7 +221,7 @@ static const __devinitconst struct resource timberdale_mlogicore_resources[] = { | |||
221 | }, | 221 | }, |
222 | }; | 222 | }; |
223 | 223 | ||
224 | static const __devinitconst struct resource timberdale_uart_resources[] = { | 224 | static const struct resource timberdale_uart_resources[] = { |
225 | { | 225 | { |
226 | .start = UARTOFFSET, | 226 | .start = UARTOFFSET, |
227 | .end = UARTEND, | 227 | .end = UARTEND, |
@@ -234,7 +234,7 @@ static const __devinitconst struct resource timberdale_uart_resources[] = { | |||
234 | }, | 234 | }, |
235 | }; | 235 | }; |
236 | 236 | ||
237 | static const __devinitconst struct resource timberdale_uartlite_resources[] = { | 237 | static const struct resource timberdale_uartlite_resources[] = { |
238 | { | 238 | { |
239 | .start = UARTLITEOFFSET, | 239 | .start = UARTLITEOFFSET, |
240 | .end = UARTLITEEND, | 240 | .end = UARTLITEEND, |
@@ -247,13 +247,13 @@ static const __devinitconst struct resource timberdale_uartlite_resources[] = { | |||
247 | }, | 247 | }, |
248 | }; | 248 | }; |
249 | 249 | ||
250 | static __devinitdata struct i2c_board_info timberdale_adv7180_i2c_board_info = { | 250 | static 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 | ||
256 | static __devinitdata struct timb_video_platform_data | 256 | static 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, |
@@ -262,7 +262,7 @@ static __devinitdata struct timb_video_platform_data | |||
262 | } | 262 | } |
263 | }; | 263 | }; |
264 | 264 | ||
265 | static const __devinitconst struct resource | 265 | static const struct resource |
266 | timberdale_radio_resources[] = { | 266 | timberdale_radio_resources[] = { |
267 | { | 267 | { |
268 | .start = RDSOFFSET, | 268 | .start = RDSOFFSET, |
@@ -276,22 +276,22 @@ timberdale_radio_resources[] = { | |||
276 | }, | 276 | }, |
277 | }; | 277 | }; |
278 | 278 | ||
279 | static __devinitdata struct i2c_board_info timberdale_tef6868_i2c_board_info = { | 279 | static 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 | ||
283 | static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = { | 283 | static 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 | ||
287 | static __devinitdata struct timb_radio_platform_data | 287 | static 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, |
291 | .dsp = &timberdale_saa7706_i2c_board_info | 291 | .dsp = &timberdale_saa7706_i2c_board_info |
292 | }; | 292 | }; |
293 | 293 | ||
294 | static const __devinitconst struct resource timberdale_video_resources[] = { | 294 | static const struct resource timberdale_video_resources[] = { |
295 | { | 295 | { |
296 | .start = LOGIWOFFSET, | 296 | .start = LOGIWOFFSET, |
297 | .end = LOGIWEND, | 297 | .end = LOGIWEND, |
@@ -303,7 +303,7 @@ static const __devinitconst struct resource timberdale_video_resources[] = { | |||
303 | */ | 303 | */ |
304 | }; | 304 | }; |
305 | 305 | ||
306 | static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = { | 306 | static struct timb_dma_platform_data timb_dma_platform_data = { |
307 | .nr_channels = 10, | 307 | .nr_channels = 10, |
308 | .channels = { | 308 | .channels = { |
309 | { | 309 | { |
@@ -362,7 +362,7 @@ static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = { | |||
362 | } | 362 | } |
363 | }; | 363 | }; |
364 | 364 | ||
365 | static const __devinitconst struct resource timberdale_dma_resources[] = { | 365 | static const struct resource timberdale_dma_resources[] = { |
366 | { | 366 | { |
367 | .start = DMAOFFSET, | 367 | .start = DMAOFFSET, |
368 | .end = DMAEND, | 368 | .end = DMAEND, |
@@ -375,7 +375,7 @@ static const __devinitconst struct resource timberdale_dma_resources[] = { | |||
375 | }, | 375 | }, |
376 | }; | 376 | }; |
377 | 377 | ||
378 | static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { | 378 | static 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 | ||
435 | static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { | 435 | static 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 | ||
502 | static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { | 502 | static 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 | ||
552 | static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { | 552 | static 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), |
@@ -606,7 +606,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { | |||
606 | }, | 606 | }, |
607 | }; | 607 | }; |
608 | 608 | ||
609 | static const __devinitconst struct resource timberdale_sdhc_resources[] = { | 609 | static const struct resource timberdale_sdhc_resources[] = { |
610 | /* located in bar 1 and bar 2 */ | 610 | /* located in bar 1 and bar 2 */ |
611 | { | 611 | { |
612 | .start = SDHC0OFFSET, | 612 | .start = SDHC0OFFSET, |
@@ -620,7 +620,7 @@ static const __devinitconst struct resource timberdale_sdhc_resources[] = { | |||
620 | }, | 620 | }, |
621 | }; | 621 | }; |
622 | 622 | ||
623 | static __devinitdata struct mfd_cell timberdale_cells_bar1[] = { | 623 | static 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 | ||
631 | static __devinitdata struct mfd_cell timberdale_cells_bar2[] = { | 631 | static 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), |
@@ -650,7 +650,7 @@ static DEVICE_ATTR(fw_ver, S_IRUGO, show_fw_ver, NULL); | |||
650 | 650 | ||
651 | /*--------------------------------------------------------------------------*/ | 651 | /*--------------------------------------------------------------------------*/ |
652 | 652 | ||
653 | static int __devinit timb_probe(struct pci_dev *dev, | 653 | static int timb_probe(struct pci_dev *dev, |
654 | const struct pci_device_id *id) | 654 | const struct pci_device_id *id) |
655 | { | 655 | { |
656 | struct timberdale_device *priv; | 656 | struct timberdale_device *priv; |
@@ -840,7 +840,7 @@ err_enable: | |||
840 | return -ENODEV; | 840 | return -ENODEV; |
841 | } | 841 | } |
842 | 842 | ||
843 | static void __devexit timb_remove(struct pci_dev *dev) | 843 | static void timb_remove(struct pci_dev *dev) |
844 | { | 844 | { |
845 | struct timberdale_device *priv = pci_get_drvdata(dev); | 845 | struct timberdale_device *priv = pci_get_drvdata(dev); |
846 | 846 | ||
@@ -867,7 +867,7 @@ static struct pci_driver timberdale_pci_driver = { | |||
867 | .name = DRIVER_NAME, | 867 | .name = DRIVER_NAME, |
868 | .id_table = timberdale_pci_tbl, | 868 | .id_table = timberdale_pci_tbl, |
869 | .probe = timb_probe, | 869 | .probe = timb_probe, |
870 | .remove = __devexit_p(timb_remove), | 870 | .remove = timb_remove, |
871 | }; | 871 | }; |
872 | 872 | ||
873 | static int __init timberdale_init(void) | 873 | static int __init timberdale_init(void) |