diff options
Diffstat (limited to 'arch/blackfin/mach-bf533/boards/cm_bf533.c')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/cm_bf533.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index fe47e048c4e6..4ef2fb0e48d5 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/spi/spi.h> | 15 | #include <linux/spi/spi.h> |
16 | #include <linux/spi/flash.h> | 16 | #include <linux/spi/flash.h> |
17 | #include <linux/spi/mmc_spi.h> | 17 | #include <linux/spi/mmc_spi.h> |
18 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 18 | #if IS_ENABLED(CONFIG_USB_ISP1362_HCD) |
19 | #include <linux/usb/isp1362.h> | 19 | #include <linux/usb/isp1362.h> |
20 | #endif | 20 | #endif |
21 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
@@ -29,9 +29,9 @@ | |||
29 | */ | 29 | */ |
30 | const char bfin_board_name[] = "Bluetechnix CM BF533"; | 30 | const char bfin_board_name[] = "Bluetechnix CM BF533"; |
31 | 31 | ||
32 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) | 32 | #if IS_ENABLED(CONFIG_SPI_BFIN5XX) |
33 | /* all SPI peripherals info goes here */ | 33 | /* all SPI peripherals info goes here */ |
34 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 34 | #if IS_ENABLED(CONFIG_MTD_M25P80) |
35 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 35 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
36 | { | 36 | { |
37 | .name = "bootloader(spi)", | 37 | .name = "bootloader(spi)", |
@@ -62,14 +62,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { | |||
62 | }; | 62 | }; |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 65 | #if IS_ENABLED(CONFIG_MMC_SPI) |
66 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { | 66 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { |
67 | .enable_dma = 0, | 67 | .enable_dma = 0, |
68 | }; | 68 | }; |
69 | #endif | 69 | #endif |
70 | 70 | ||
71 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 71 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
72 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 72 | #if IS_ENABLED(CONFIG_MTD_M25P80) |
73 | { | 73 | { |
74 | /* the modalias must be the same as spi device driver name */ | 74 | /* the modalias must be the same as spi device driver name */ |
75 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 75 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
@@ -82,7 +82,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
82 | }, | 82 | }, |
83 | #endif | 83 | #endif |
84 | 84 | ||
85 | #if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) | 85 | #if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X) |
86 | { | 86 | { |
87 | .modalias = "ad183x", | 87 | .modalias = "ad183x", |
88 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 88 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
@@ -91,7 +91,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
91 | }, | 91 | }, |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 94 | #if IS_ENABLED(CONFIG_MMC_SPI) |
95 | { | 95 | { |
96 | .modalias = "mmc_spi", | 96 | .modalias = "mmc_spi", |
97 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ | 97 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ |
@@ -140,14 +140,14 @@ static struct platform_device bfin_spi0_device = { | |||
140 | }; | 140 | }; |
141 | #endif /* spi master and devices */ | 141 | #endif /* spi master and devices */ |
142 | 142 | ||
143 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 143 | #if IS_ENABLED(CONFIG_RTC_DRV_BFIN) |
144 | static struct platform_device rtc_device = { | 144 | static struct platform_device rtc_device = { |
145 | .name = "rtc-bfin", | 145 | .name = "rtc-bfin", |
146 | .id = -1, | 146 | .id = -1, |
147 | }; | 147 | }; |
148 | #endif | 148 | #endif |
149 | 149 | ||
150 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 150 | #if IS_ENABLED(CONFIG_SMC91X) |
151 | #include <linux/smc91x.h> | 151 | #include <linux/smc91x.h> |
152 | 152 | ||
153 | static struct smc91x_platdata smc91x_info = { | 153 | static struct smc91x_platdata smc91x_info = { |
@@ -178,7 +178,7 @@ static struct platform_device smc91x_device = { | |||
178 | }; | 178 | }; |
179 | #endif | 179 | #endif |
180 | 180 | ||
181 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) | 181 | #if IS_ENABLED(CONFIG_SMSC911X) |
182 | #include <linux/smsc911x.h> | 182 | #include <linux/smsc911x.h> |
183 | 183 | ||
184 | static struct resource smsc911x_resources[] = { | 184 | static struct resource smsc911x_resources[] = { |
@@ -212,7 +212,7 @@ static struct platform_device smsc911x_device = { | |||
212 | }; | 212 | }; |
213 | #endif | 213 | #endif |
214 | 214 | ||
215 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 215 | #if IS_ENABLED(CONFIG_SERIAL_BFIN) |
216 | #ifdef CONFIG_SERIAL_BFIN_UART0 | 216 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
217 | static struct resource bfin_uart0_resources[] = { | 217 | static struct resource bfin_uart0_resources[] = { |
218 | { | 218 | { |
@@ -263,7 +263,7 @@ static struct platform_device bfin_uart0_device = { | |||
263 | #endif | 263 | #endif |
264 | #endif | 264 | #endif |
265 | 265 | ||
266 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 266 | #if IS_ENABLED(CONFIG_BFIN_SIR) |
267 | #ifdef CONFIG_BFIN_SIR0 | 267 | #ifdef CONFIG_BFIN_SIR0 |
268 | static struct resource bfin_sir0_resources[] = { | 268 | static struct resource bfin_sir0_resources[] = { |
269 | { | 269 | { |
@@ -292,7 +292,7 @@ static struct platform_device bfin_sir0_device = { | |||
292 | #endif | 292 | #endif |
293 | #endif | 293 | #endif |
294 | 294 | ||
295 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 295 | #if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT) |
296 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART | 296 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART |
297 | static struct resource bfin_sport0_uart_resources[] = { | 297 | static struct resource bfin_sport0_uart_resources[] = { |
298 | { | 298 | { |
@@ -363,7 +363,7 @@ static struct platform_device bfin_sport1_uart_device = { | |||
363 | #endif | 363 | #endif |
364 | #endif | 364 | #endif |
365 | 365 | ||
366 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 366 | #if IS_ENABLED(CONFIG_USB_ISP1362_HCD) |
367 | static struct resource isp1362_hcd_resources[] = { | 367 | static struct resource isp1362_hcd_resources[] = { |
368 | { | 368 | { |
369 | .start = 0x20308000, | 369 | .start = 0x20308000, |
@@ -403,7 +403,7 @@ static struct platform_device isp1362_hcd_device = { | |||
403 | #endif | 403 | #endif |
404 | 404 | ||
405 | 405 | ||
406 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) | 406 | #if IS_ENABLED(CONFIG_USB_NET2272) |
407 | static struct resource net2272_bfin_resources[] = { | 407 | static struct resource net2272_bfin_resources[] = { |
408 | { | 408 | { |
409 | .start = 0x20300000, | 409 | .start = 0x20300000, |
@@ -426,7 +426,7 @@ static struct platform_device net2272_bfin_device = { | |||
426 | 426 | ||
427 | 427 | ||
428 | 428 | ||
429 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 429 | #if IS_ENABLED(CONFIG_MTD_PHYSMAP) |
430 | static struct mtd_partition para_partitions[] = { | 430 | static struct mtd_partition para_partitions[] = { |
431 | { | 431 | { |
432 | .name = "bootloader(nor)", | 432 | .name = "bootloader(nor)", |
@@ -495,19 +495,19 @@ static struct platform_device *cm_bf533_devices[] __initdata = { | |||
495 | 495 | ||
496 | &bfin_dpmc, | 496 | &bfin_dpmc, |
497 | 497 | ||
498 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 498 | #if IS_ENABLED(CONFIG_SERIAL_BFIN) |
499 | #ifdef CONFIG_SERIAL_BFIN_UART0 | 499 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
500 | &bfin_uart0_device, | 500 | &bfin_uart0_device, |
501 | #endif | 501 | #endif |
502 | #endif | 502 | #endif |
503 | 503 | ||
504 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 504 | #if IS_ENABLED(CONFIG_BFIN_SIR) |
505 | #ifdef CONFIG_BFIN_SIR0 | 505 | #ifdef CONFIG_BFIN_SIR0 |
506 | &bfin_sir0_device, | 506 | &bfin_sir0_device, |
507 | #endif | 507 | #endif |
508 | #endif | 508 | #endif |
509 | 509 | ||
510 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 510 | #if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT) |
511 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART | 511 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART |
512 | &bfin_sport0_uart_device, | 512 | &bfin_sport0_uart_device, |
513 | #endif | 513 | #endif |
@@ -516,31 +516,31 @@ static struct platform_device *cm_bf533_devices[] __initdata = { | |||
516 | #endif | 516 | #endif |
517 | #endif | 517 | #endif |
518 | 518 | ||
519 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 519 | #if IS_ENABLED(CONFIG_RTC_DRV_BFIN) |
520 | &rtc_device, | 520 | &rtc_device, |
521 | #endif | 521 | #endif |
522 | 522 | ||
523 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 523 | #if IS_ENABLED(CONFIG_USB_ISP1362_HCD) |
524 | &isp1362_hcd_device, | 524 | &isp1362_hcd_device, |
525 | #endif | 525 | #endif |
526 | 526 | ||
527 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 527 | #if IS_ENABLED(CONFIG_SMC91X) |
528 | &smc91x_device, | 528 | &smc91x_device, |
529 | #endif | 529 | #endif |
530 | 530 | ||
531 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) | 531 | #if IS_ENABLED(CONFIG_SMSC911X) |
532 | &smsc911x_device, | 532 | &smsc911x_device, |
533 | #endif | 533 | #endif |
534 | 534 | ||
535 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) | 535 | #if IS_ENABLED(CONFIG_USB_NET2272) |
536 | &net2272_bfin_device, | 536 | &net2272_bfin_device, |
537 | #endif | 537 | #endif |
538 | 538 | ||
539 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) | 539 | #if IS_ENABLED(CONFIG_SPI_BFIN5XX) |
540 | &bfin_spi0_device, | 540 | &bfin_spi0_device, |
541 | #endif | 541 | #endif |
542 | 542 | ||
543 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 543 | #if IS_ENABLED(CONFIG_MTD_PHYSMAP) |
544 | ¶_flash_device, | 544 | ¶_flash_device, |
545 | #endif | 545 | #endif |
546 | }; | 546 | }; |
@@ -549,7 +549,7 @@ static int __init cm_bf533_init(void) | |||
549 | { | 549 | { |
550 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 550 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
551 | platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices)); | 551 | platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices)); |
552 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) | 552 | #if IS_ENABLED(CONFIG_SPI_BFIN5XX) |
553 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 553 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
554 | #endif | 554 | #endif |
555 | return 0; | 555 | return 0; |