aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-08-13 00:27:31 -0400
committerMike Frysinger <vapier@gentoo.org>2009-09-16 22:10:24 -0400
commit0198b3bcaed1374f454e56e46f0e1ca1fc24e0a1 (patch)
tree883a78de3ff7c1b560ebf18cc6c78e9a7065431f
parentc4baebf2683d16f24a84a99268ef5f7318905337 (diff)
Blackfin: drop board resources for dead devices (pbx/ad9960)
These hardware devices are dead and the drivers never cleaned up/merged, so punt the useless board resource info. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat
-rw-r--r--arch/blackfin/mach-bf518/boards/ezbrd.c27
-rw-r--r--arch/blackfin/mach-bf527/boards/cm_bf527.c43
-rw-r--r--arch/blackfin/mach-bf527/boards/ezbrd.c27
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c43
-rw-r--r--arch/blackfin/mach-bf533/boards/H8606.c26
-rw-r--r--arch/blackfin/mach-bf533/boards/stamp.c28
-rw-r--r--arch/blackfin/mach-bf537/boards/cm_bf537.c17
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c16
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c44
-rw-r--r--arch/blackfin/mach-bf537/boards/tcm_bf537.c17
-rw-r--r--arch/blackfin/mach-bf561/boards/cm_bf561.c16
11 files changed, 0 insertions, 304 deletions
diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c
index 4c594e647eb4..03e4a9941f01 100644
--- a/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -199,15 +199,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
199}; 199};
200#endif 200#endif
201 201
202#if defined(CONFIG_PBX)
203static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
204 .ctl_reg = 0x4, /* send zero */
205 .enable_dma = 0,
206 .bits_per_word = 8,
207 .cs_change_per_word = 1,
208};
209#endif
210
211#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 202#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
212static struct bfin5xx_spi_chip spi_ad7877_chip_info = { 203static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
213 .enable_dma = 0, 204 .enable_dma = 0,
@@ -296,24 +287,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
296 .mode = SPI_MODE_3, 287 .mode = SPI_MODE_3,
297 }, 288 },
298#endif 289#endif
299#if defined(CONFIG_PBX)
300 {
301 .modalias = "fxs-spi",
302 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
303 .bus_num = 0,
304 .chip_select = 8 - CONFIG_J11_JUMPER,
305 .controller_data = &spi_si3xxx_chip_info,
306 .mode = SPI_MODE_3,
307 },
308 {
309 .modalias = "fxo-spi",
310 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
311 .bus_num = 0,
312 .chip_select = 8 - CONFIG_J19_JUMPER,
313 .controller_data = &spi_si3xxx_chip_info,
314 .mode = SPI_MODE_3,
315 },
316#endif
317#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 290#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
318 { 291 {
319 .modalias = "ad7877", 292 .modalias = "ad7877",
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 18b9bd7d7d64..fdd518c1b87b 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -495,13 +495,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
495}; 495};
496#endif 496#endif
497 497
498#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
499static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
500 .enable_dma = 0,
501 .bits_per_word = 16,
502};
503#endif
504
505#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 498#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
506static struct bfin5xx_spi_chip mmc_spi_chip_info = { 499static struct bfin5xx_spi_chip mmc_spi_chip_info = {
507 .enable_dma = 0, 500 .enable_dma = 0,
@@ -509,15 +502,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
509}; 502};
510#endif 503#endif
511 504
512#if defined(CONFIG_PBX)
513static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
514 .ctl_reg = 0x4, /* send zero */
515 .enable_dma = 0,
516 .bits_per_word = 8,
517 .cs_change_per_word = 1,
518};
519#endif
520
521#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 505#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
522static struct bfin5xx_spi_chip spi_ad7877_chip_info = { 506static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
523 .enable_dma = 0, 507 .enable_dma = 0,
@@ -591,15 +575,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
591 .controller_data = &ad1836_spi_chip_info, 575 .controller_data = &ad1836_spi_chip_info,
592 }, 576 },
593#endif 577#endif
594#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
595 {
596 .modalias = "ad9960-spi",
597 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
598 .bus_num = 0,
599 .chip_select = 1,
600 .controller_data = &ad9960_spi_chip_info,
601 },
602#endif
603#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 578#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
604 { 579 {
605 .modalias = "mmc_spi", 580 .modalias = "mmc_spi",
@@ -610,24 +585,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
610 .mode = SPI_MODE_3, 585 .mode = SPI_MODE_3,
611 }, 586 },
612#endif 587#endif
613#if defined(CONFIG_PBX)
614 {
615 .modalias = "fxs-spi",
616 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
617 .bus_num = 0,
618 .chip_select = 8 - CONFIG_J11_JUMPER,
619 .controller_data = &spi_si3xxx_chip_info,
620 .mode = SPI_MODE_3,
621 },
622 {
623 .modalias = "fxo-spi",
624 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
625 .bus_num = 0,
626 .chip_select = 8 - CONFIG_J19_JUMPER,
627 .controller_data = &spi_si3xxx_chip_info,
628 .mode = SPI_MODE_3,
629 },
630#endif
631#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 588#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
632 { 589 {
633 .modalias = "ad7877", 590 .modalias = "ad7877",
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index 809c7907b6e3..68b4c804364c 100644
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -263,15 +263,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
263}; 263};
264#endif 264#endif
265 265
266#if defined(CONFIG_PBX)
267static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
268 .ctl_reg = 0x4, /* send zero */
269 .enable_dma = 0,
270 .bits_per_word = 8,
271 .cs_change_per_word = 1,
272};
273#endif
274
275#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 266#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
276static struct bfin5xx_spi_chip spi_ad7877_chip_info = { 267static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
277 .enable_dma = 0, 268 .enable_dma = 0,
@@ -376,24 +367,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
376 .mode = SPI_MODE_3, 367 .mode = SPI_MODE_3,
377 }, 368 },
378#endif 369#endif
379#if defined(CONFIG_PBX)
380 {
381 .modalias = "fxs-spi",
382 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
383 .bus_num = 0,
384 .chip_select = 8 - CONFIG_J11_JUMPER,
385 .controller_data = &spi_si3xxx_chip_info,
386 .mode = SPI_MODE_3,
387 },
388 {
389 .modalias = "fxo-spi",
390 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
391 .bus_num = 0,
392 .chip_select = 8 - CONFIG_J19_JUMPER,
393 .controller_data = &spi_si3xxx_chip_info,
394 .mode = SPI_MODE_3,
395 },
396#endif
397#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 370#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
398 { 371 {
399 .modalias = "ad7877", 372 .modalias = "ad7877",
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 617a28738438..4ab9cfa74fdd 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -512,13 +512,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
512}; 512};
513#endif 513#endif
514 514
515#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
516static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
517 .enable_dma = 0,
518 .bits_per_word = 16,
519};
520#endif
521
522#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 515#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
523static struct bfin5xx_spi_chip mmc_spi_chip_info = { 516static struct bfin5xx_spi_chip mmc_spi_chip_info = {
524 .enable_dma = 0, 517 .enable_dma = 0,
@@ -526,15 +519,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
526}; 519};
527#endif 520#endif
528 521
529#if defined(CONFIG_PBX)
530static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
531 .ctl_reg = 0x4, /* send zero */
532 .enable_dma = 0,
533 .bits_per_word = 8,
534 .cs_change_per_word = 1,
535};
536#endif
537
538#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 522#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
539static struct bfin5xx_spi_chip spi_ad7877_chip_info = { 523static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
540 .enable_dma = 0, 524 .enable_dma = 0,
@@ -632,15 +616,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
632 .controller_data = &ad1836_spi_chip_info, 616 .controller_data = &ad1836_spi_chip_info,
633 }, 617 },
634#endif 618#endif
635#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
636 {
637 .modalias = "ad9960-spi",
638 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
639 .bus_num = 0,
640 .chip_select = 1,
641 .controller_data = &ad9960_spi_chip_info,
642 },
643#endif
644#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 619#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
645 { 620 {
646 .modalias = "mmc_spi", 621 .modalias = "mmc_spi",
@@ -652,24 +627,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
652 }, 627 },
653#endif 628#endif
654 629
655#if defined(CONFIG_PBX)
656 {
657 .modalias = "fxs-spi",
658 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
659 .bus_num = 0,
660 .chip_select = 8 - CONFIG_J11_JUMPER,
661 .controller_data = &spi_si3xxx_chip_info,
662 .mode = SPI_MODE_3,
663 },
664 {
665 .modalias = "fxo-spi",
666 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
667 .bus_num = 0,
668 .chip_select = 8 - CONFIG_J19_JUMPER,
669 .controller_data = &spi_si3xxx_chip_info,
670 .mode = SPI_MODE_3,
671 },
672#endif
673#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 630#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
674 { 631 {
675 .modalias = "ad7877", 632 .modalias = "ad7877",
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c
index 1bd8b61e6888..30ff3c4a3abe 100644
--- a/arch/blackfin/mach-bf533/boards/H8606.c
+++ b/arch/blackfin/mach-bf533/boards/H8606.c
@@ -201,15 +201,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
201}; 201};
202#endif 202#endif
203 203
204#if defined(CONFIG_PBX)
205static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
206 .ctl_reg = 0x1c04,
207 .enable_dma = 0,
208 .bits_per_word = 8,
209 .cs_change_per_word = 1,
210};
211#endif
212
213/* Notice: for blackfin, the speed_hz is the value of register 204/* Notice: for blackfin, the speed_hz is the value of register
214 * SPI_BAUD, not the real baudrate */ 205 * SPI_BAUD, not the real baudrate */
215static struct spi_board_info bfin_spi_board_info[] __initdata = { 206static struct spi_board_info bfin_spi_board_info[] __initdata = {
@@ -248,23 +239,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
248 }, 239 },
249#endif 240#endif
250 241
251#if defined(CONFIG_PBX)
252 {
253 .modalias = "fxs-spi",
254 .max_speed_hz = 4,
255 .bus_num = 1,
256 .chip_select = 3,
257 .controller_data = &spi_si3xxx_chip_info,
258 },
259
260 {
261 .modalias = "fxo-spi",
262 .max_speed_hz = 4,
263 .bus_num = 1,
264 .chip_select = 2,
265 .controller_data = &spi_si3xxx_chip_info,
266 },
267#endif
268}; 242};
269 243
270/* SPI (0) */ 244/* SPI (0) */
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index f3dc2830631c..3954baa00c64 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -219,15 +219,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
219}; 219};
220#endif 220#endif
221 221
222#if defined(CONFIG_PBX)
223static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
224 .ctl_reg = 0x4, /* send zero */
225 .enable_dma = 0,
226 .bits_per_word = 8,
227 .cs_change_per_word = 1,
228};
229#endif
230
231#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) 222#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
232static struct bfin5xx_spi_chip spidev_chip_info = { 223static struct bfin5xx_spi_chip spidev_chip_info = {
233 .enable_dma = 0, 224 .enable_dma = 0,
@@ -298,25 +289,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
298 }, 289 },
299#endif 290#endif
300 291
301#if defined(CONFIG_PBX)
302 {
303 .modalias = "fxs-spi",
304 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
305 .bus_num = 0,
306 .chip_select = 8 - CONFIG_J11_JUMPER,
307 .controller_data = &spi_si3xxx_chip_info,
308 .mode = SPI_MODE_3,
309 },
310 {
311 .modalias = "fxo-spi",
312 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
313 .bus_num = 0,
314 .chip_select = 8 - CONFIG_J19_JUMPER,
315 .controller_data = &spi_si3xxx_chip_info,
316 .mode = SPI_MODE_3,
317 },
318#endif
319
320#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) 292#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
321 { 293 {
322 .modalias = "spidev", 294 .modalias = "spidev",
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 3681d2cb40b3..159e5b2f9e6b 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -101,13 +101,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
101}; 101};
102#endif 102#endif
103 103
104#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
105static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
106 .enable_dma = 0,
107 .bits_per_word = 16,
108};
109#endif
110
111#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 104#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
112static struct bfin5xx_spi_chip mmc_spi_chip_info = { 105static struct bfin5xx_spi_chip mmc_spi_chip_info = {
113 .enable_dma = 0, 106 .enable_dma = 0,
@@ -150,16 +143,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
150 }, 143 },
151#endif 144#endif
152 145
153#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
154 {
155 .modalias = "ad9960-spi",
156 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
157 .bus_num = 0,
158 .chip_select = 1,
159 .controller_data = &ad9960_spi_chip_info,
160 },
161#endif
162
163#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 146#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
164 { 147 {
165 .modalias = "mmc_spi", 148 .modalias = "mmc_spi",
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 3bbe10227bfb..0d93bbe6d275 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -293,13 +293,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
293}; 293};
294#endif 294#endif
295 295
296#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
297static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
298 .enable_dma = 0,
299 .bits_per_word = 16,
300};
301#endif
302
303#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 296#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
304static struct bfin5xx_spi_chip mmc_spi_chip_info = { 297static struct bfin5xx_spi_chip mmc_spi_chip_info = {
305 .enable_dma = 0, 298 .enable_dma = 0,
@@ -366,15 +359,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
366 .controller_data = &ad1836_spi_chip_info, 359 .controller_data = &ad1836_spi_chip_info,
367 }, 360 },
368#endif 361#endif
369#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
370 {
371 .modalias = "ad9960-spi",
372 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
373 .bus_num = 0,
374 .chip_select = 1,
375 .controller_data = &ad9960_spi_chip_info,
376 },
377#endif
378#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 362#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
379 { 363 {
380 .modalias = "mmc_spi", 364 .modalias = "mmc_spi",
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index d438ca40bc12..d5aabeeb81ee 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -549,13 +549,6 @@ static struct bfin5xx_spi_chip ad1938_spi_chip_info = {
549}; 549};
550#endif 550#endif
551 551
552#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
553static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
554 .enable_dma = 0,
555 .bits_per_word = 16,
556};
557#endif
558
559#if defined(CONFIG_INPUT_EVAL_AD7147EBZ) 552#if defined(CONFIG_INPUT_EVAL_AD7147EBZ)
560#include <linux/input.h> 553#include <linux/input.h>
561#include <linux/input/ad714x.h> 554#include <linux/input/ad714x.h>
@@ -698,15 +691,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
698}; 691};
699#endif 692#endif
700 693
701#if defined(CONFIG_PBX)
702static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
703 .ctl_reg = 0x4, /* send zero */
704 .enable_dma = 0,
705 .bits_per_word = 8,
706 .cs_change_per_word = 1,
707};
708#endif
709
710#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 694#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
711#include <linux/spi/ad7877.h> 695#include <linux/spi/ad7877.h>
712static struct bfin5xx_spi_chip spi_ad7877_chip_info = { 696static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
@@ -906,16 +890,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
906 }, 890 },
907#endif 891#endif
908 892
909#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
910 {
911 .modalias = "ad9960-spi",
912 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
913 .bus_num = 0,
914 .chip_select = 1,
915 .controller_data = &ad9960_spi_chip_info,
916 },
917#endif
918
919#if defined(CONFIG_INPUT_EVAL_AD7147EBZ) 893#if defined(CONFIG_INPUT_EVAL_AD7147EBZ)
920 { 894 {
921 .modalias = "ad714x_captouch", 895 .modalias = "ad714x_captouch",
@@ -940,24 +914,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
940 .mode = SPI_MODE_3, 914 .mode = SPI_MODE_3,
941 }, 915 },
942#endif 916#endif
943#if defined(CONFIG_PBX)
944 {
945 .modalias = "fxs-spi",
946 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
947 .bus_num = 0,
948 .chip_select = 8 - CONFIG_J11_JUMPER,
949 .controller_data = &spi_si3xxx_chip_info,
950 .mode = SPI_MODE_3,
951 },
952 {
953 .modalias = "fxo-spi",
954 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
955 .bus_num = 0,
956 .chip_select = 8 - CONFIG_J19_JUMPER,
957 .controller_data = &spi_si3xxx_chip_info,
958 .mode = SPI_MODE_3,
959 },
960#endif
961#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 917#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
962 { 918 {
963 .modalias = "ad7877", 919 .modalias = "ad7877",
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index 97a86b4ce96d..88eade89842e 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -101,13 +101,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
101}; 101};
102#endif 102#endif
103 103
104#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
105static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
106 .enable_dma = 0,
107 .bits_per_word = 16,
108};
109#endif
110
111#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 104#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
112static struct bfin5xx_spi_chip mmc_spi_chip_info = { 105static struct bfin5xx_spi_chip mmc_spi_chip_info = {
113 .enable_dma = 0, 106 .enable_dma = 0,
@@ -150,16 +143,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
150 }, 143 },
151#endif 144#endif
152 145
153#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
154 {
155 .modalias = "ad9960-spi",
156 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
157 .bus_num = 0,
158 .chip_select = 1,
159 .controller_data = &ad9960_spi_chip_info,
160 },
161#endif
162
163#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 146#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
164 { 147 {
165 .modalias = "mmc_spi", 148 .modalias = "mmc_spi",
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index ebb07554fb09..cedcc3c6b235 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -98,13 +98,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
98}; 98};
99#endif 99#endif
100 100
101#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
102static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
103 .enable_dma = 0,
104 .bits_per_word = 16,
105};
106#endif
107
108#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 101#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
109static struct bfin5xx_spi_chip mmc_spi_chip_info = { 102static struct bfin5xx_spi_chip mmc_spi_chip_info = {
110 .enable_dma = 0, 103 .enable_dma = 0,
@@ -146,15 +139,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
146 .controller_data = &ad1836_spi_chip_info, 139 .controller_data = &ad1836_spi_chip_info,
147 }, 140 },
148#endif 141#endif
149#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
150 {
151 .modalias = "ad9960-spi",
152 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
153 .bus_num = 0,
154 .chip_select = 1,
155 .controller_data = &ad9960_spi_chip_info,
156 },
157#endif
158#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 142#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
159 { 143 {
160 .modalias = "mmc_spi", 144 .modalias = "mmc_spi",
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-23 19:20:50 -0500