diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-04-14 10:44:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-14 10:44:42 -0400 |
commit | 740c699a8d316c8bf8593f19e2ca47795e690622 (patch) | |
tree | a78886955770a477945c5d84e06b2e7678733b54 /arch/blackfin/mach-bf527/boards/cm_bf527.c | |
parent | e69af4657e7764d03ad555f0b583d9c4217bcefa (diff) | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) |
Merge tag 'v3.15-rc1' into perf/urgent
Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/cm_bf527.c')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 91 |
1 files changed, 44 insertions, 47 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 413d0132b66f..b1004b35db36 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -37,7 +37,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF527"; | |||
37 | * Driver needs to know address, irq and flag pin. | 37 | * Driver needs to know address, irq and flag pin. |
38 | */ | 38 | */ |
39 | 39 | ||
40 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) | 40 | #if IS_ENABLED(CONFIG_USB_ISP1760_HCD) |
41 | #include <linux/usb/isp1760.h> | 41 | #include <linux/usb/isp1760.h> |
42 | static struct resource bfin_isp1760_resources[] = { | 42 | static struct resource bfin_isp1760_resources[] = { |
43 | [0] = { | 43 | [0] = { |
@@ -72,7 +72,7 @@ static struct platform_device bfin_isp1760_device = { | |||
72 | }; | 72 | }; |
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | 75 | #if IS_ENABLED(CONFIG_USB_MUSB_HDRC) |
76 | static struct resource musb_resources[] = { | 76 | static struct resource musb_resources[] = { |
77 | [0] = { | 77 | [0] = { |
78 | .start = 0xffc03800, | 78 | .start = 0xffc03800, |
@@ -134,7 +134,7 @@ static struct platform_device musb_device = { | |||
134 | }; | 134 | }; |
135 | #endif | 135 | #endif |
136 | 136 | ||
137 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 137 | #if IS_ENABLED(CONFIG_MTD_NAND_BF5XX) |
138 | static struct mtd_partition partition_info[] = { | 138 | static struct mtd_partition partition_info[] = { |
139 | { | 139 | { |
140 | .name = "linux kernel(nand)", | 140 | .name = "linux kernel(nand)", |
@@ -180,7 +180,7 @@ static struct platform_device bf5xx_nand_device = { | |||
180 | }; | 180 | }; |
181 | #endif | 181 | #endif |
182 | 182 | ||
183 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) | 183 | #if IS_ENABLED(CONFIG_BFIN_CFPCMCIA) |
184 | static struct resource bfin_pcmcia_cf_resources[] = { | 184 | static struct resource bfin_pcmcia_cf_resources[] = { |
185 | { | 185 | { |
186 | .start = 0x20310000, /* IO PORT */ | 186 | .start = 0x20310000, /* IO PORT */ |
@@ -209,14 +209,14 @@ static struct platform_device bfin_pcmcia_cf_device = { | |||
209 | }; | 209 | }; |
210 | #endif | 210 | #endif |
211 | 211 | ||
212 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 212 | #if IS_ENABLED(CONFIG_RTC_DRV_BFIN) |
213 | static struct platform_device rtc_device = { | 213 | static struct platform_device rtc_device = { |
214 | .name = "rtc-bfin", | 214 | .name = "rtc-bfin", |
215 | .id = -1, | 215 | .id = -1, |
216 | }; | 216 | }; |
217 | #endif | 217 | #endif |
218 | 218 | ||
219 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 219 | #if IS_ENABLED(CONFIG_SMC91X) |
220 | #include <linux/smc91x.h> | 220 | #include <linux/smc91x.h> |
221 | 221 | ||
222 | static struct smc91x_platdata smc91x_info = { | 222 | static struct smc91x_platdata smc91x_info = { |
@@ -249,7 +249,7 @@ static struct platform_device smc91x_device = { | |||
249 | }; | 249 | }; |
250 | #endif | 250 | #endif |
251 | 251 | ||
252 | #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) | 252 | #if IS_ENABLED(CONFIG_DM9000) |
253 | static struct resource dm9000_resources[] = { | 253 | static struct resource dm9000_resources[] = { |
254 | [0] = { | 254 | [0] = { |
255 | .start = 0x203FB800, | 255 | .start = 0x203FB800, |
@@ -276,7 +276,7 @@ static struct platform_device dm9000_device = { | |||
276 | }; | 276 | }; |
277 | #endif | 277 | #endif |
278 | 278 | ||
279 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 279 | #if IS_ENABLED(CONFIG_BFIN_MAC) |
280 | #include <linux/bfin_mac.h> | 280 | #include <linux/bfin_mac.h> |
281 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; | 281 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; |
282 | 282 | ||
@@ -309,7 +309,7 @@ static struct platform_device bfin_mac_device = { | |||
309 | }; | 309 | }; |
310 | #endif | 310 | #endif |
311 | 311 | ||
312 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) | 312 | #if IS_ENABLED(CONFIG_USB_NET2272) |
313 | static struct resource net2272_bfin_resources[] = { | 313 | static struct resource net2272_bfin_resources[] = { |
314 | { | 314 | { |
315 | .start = 0x20300000, | 315 | .start = 0x20300000, |
@@ -330,8 +330,7 @@ static struct platform_device net2272_bfin_device = { | |||
330 | }; | 330 | }; |
331 | #endif | 331 | #endif |
332 | 332 | ||
333 | #if defined(CONFIG_MTD_M25P80) \ | 333 | #if IS_ENABLED(CONFIG_MTD_M25P80) |
334 | || defined(CONFIG_MTD_M25P80_MODULE) | ||
335 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 334 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
336 | { | 335 | { |
337 | .name = "bootloader(spi)", | 336 | .name = "bootloader(spi)", |
@@ -358,13 +357,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { | |||
358 | }; | 357 | }; |
359 | #endif | 358 | #endif |
360 | 359 | ||
361 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 360 | #if IS_ENABLED(CONFIG_MMC_SPI) |
362 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { | 361 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { |
363 | .enable_dma = 0, | 362 | .enable_dma = 0, |
364 | }; | 363 | }; |
365 | #endif | 364 | #endif |
366 | 365 | ||
367 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 366 | #if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877) |
368 | static const struct ad7877_platform_data bfin_ad7877_ts_info = { | 367 | static const struct ad7877_platform_data bfin_ad7877_ts_info = { |
369 | .model = 7877, | 368 | .model = 7877, |
370 | .vref_delay_usecs = 50, /* internal, no capacitor */ | 369 | .vref_delay_usecs = 50, /* internal, no capacitor */ |
@@ -381,8 +380,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { | |||
381 | #endif | 380 | #endif |
382 | 381 | ||
383 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 382 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
384 | #if defined(CONFIG_MTD_M25P80) \ | 383 | #if IS_ENABLED(CONFIG_MTD_M25P80) |
385 | || defined(CONFIG_MTD_M25P80_MODULE) | ||
386 | { | 384 | { |
387 | /* the modalias must be the same as spi device driver name */ | 385 | /* the modalias must be the same as spi device driver name */ |
388 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 386 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
@@ -395,8 +393,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
395 | }, | 393 | }, |
396 | #endif | 394 | #endif |
397 | 395 | ||
398 | #if defined(CONFIG_SND_BF5XX_SOC_AD183X) \ | 396 | #if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X) |
399 | || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) | ||
400 | { | 397 | { |
401 | .modalias = "ad183x", | 398 | .modalias = "ad183x", |
402 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 399 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
@@ -404,7 +401,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
404 | .chip_select = 4, | 401 | .chip_select = 4, |
405 | }, | 402 | }, |
406 | #endif | 403 | #endif |
407 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 404 | #if IS_ENABLED(CONFIG_MMC_SPI) |
408 | { | 405 | { |
409 | .modalias = "mmc_spi", | 406 | .modalias = "mmc_spi", |
410 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ | 407 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ |
@@ -414,7 +411,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
414 | .mode = SPI_MODE_3, | 411 | .mode = SPI_MODE_3, |
415 | }, | 412 | }, |
416 | #endif | 413 | #endif |
417 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 414 | #if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877) |
418 | { | 415 | { |
419 | .modalias = "ad7877", | 416 | .modalias = "ad7877", |
420 | .platform_data = &bfin_ad7877_ts_info, | 417 | .platform_data = &bfin_ad7877_ts_info, |
@@ -424,7 +421,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
424 | .chip_select = 2, | 421 | .chip_select = 2, |
425 | }, | 422 | }, |
426 | #endif | 423 | #endif |
427 | #if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \ | 424 | #if IS_ENABLED(CONFIG_SND_SOC_WM8731) \ |
428 | && defined(CONFIG_SND_SOC_WM8731_SPI) | 425 | && defined(CONFIG_SND_SOC_WM8731_SPI) |
429 | { | 426 | { |
430 | .modalias = "wm8731", | 427 | .modalias = "wm8731", |
@@ -434,7 +431,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
434 | .mode = SPI_MODE_0, | 431 | .mode = SPI_MODE_0, |
435 | }, | 432 | }, |
436 | #endif | 433 | #endif |
437 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | 434 | #if IS_ENABLED(CONFIG_SPI_SPIDEV) |
438 | { | 435 | { |
439 | .modalias = "spidev", | 436 | .modalias = "spidev", |
440 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 437 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
@@ -444,7 +441,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
444 | #endif | 441 | #endif |
445 | }; | 442 | }; |
446 | 443 | ||
447 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) | 444 | #if IS_ENABLED(CONFIG_SPI_BFIN5XX) |
448 | /* SPI controller data */ | 445 | /* SPI controller data */ |
449 | static struct bfin5xx_spi_master bfin_spi0_info = { | 446 | static struct bfin5xx_spi_master bfin_spi0_info = { |
450 | .num_chipselect = 8, | 447 | .num_chipselect = 8, |
@@ -482,7 +479,7 @@ static struct platform_device bfin_spi0_device = { | |||
482 | }; | 479 | }; |
483 | #endif /* spi master and devices */ | 480 | #endif /* spi master and devices */ |
484 | 481 | ||
485 | #if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) | 482 | #if IS_ENABLED(CONFIG_MTD_GPIO_ADDR) |
486 | static struct mtd_partition cm_partitions[] = { | 483 | static struct mtd_partition cm_partitions[] = { |
487 | { | 484 | { |
488 | .name = "bootloader(nor)", | 485 | .name = "bootloader(nor)", |
@@ -531,7 +528,7 @@ static struct platform_device cm_flash_device = { | |||
531 | }; | 528 | }; |
532 | #endif | 529 | #endif |
533 | 530 | ||
534 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 531 | #if IS_ENABLED(CONFIG_SERIAL_BFIN) |
535 | #ifdef CONFIG_SERIAL_BFIN_UART0 | 532 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
536 | static struct resource bfin_uart0_resources[] = { | 533 | static struct resource bfin_uart0_resources[] = { |
537 | { | 534 | { |
@@ -642,7 +639,7 @@ static struct platform_device bfin_uart1_device = { | |||
642 | #endif | 639 | #endif |
643 | #endif | 640 | #endif |
644 | 641 | ||
645 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 642 | #if IS_ENABLED(CONFIG_BFIN_SIR) |
646 | #ifdef CONFIG_BFIN_SIR0 | 643 | #ifdef CONFIG_BFIN_SIR0 |
647 | static struct resource bfin_sir0_resources[] = { | 644 | static struct resource bfin_sir0_resources[] = { |
648 | { | 645 | { |
@@ -697,7 +694,7 @@ static struct platform_device bfin_sir1_device = { | |||
697 | #endif | 694 | #endif |
698 | #endif | 695 | #endif |
699 | 696 | ||
700 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 697 | #if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI) |
701 | static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0}; | 698 | static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0}; |
702 | 699 | ||
703 | static struct resource bfin_twi0_resource[] = { | 700 | static struct resource bfin_twi0_resource[] = { |
@@ -725,25 +722,25 @@ static struct platform_device i2c_bfin_twi_device = { | |||
725 | #endif | 722 | #endif |
726 | 723 | ||
727 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 724 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
728 | #if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE) | 725 | #if IS_ENABLED(CONFIG_BFIN_TWI_LCD) |
729 | { | 726 | { |
730 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 727 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
731 | }, | 728 | }, |
732 | #endif | 729 | #endif |
733 | #if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE) | 730 | #if IS_ENABLED(CONFIG_INPUT_PCF8574) |
734 | { | 731 | { |
735 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 732 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
736 | .irq = IRQ_PF8, | 733 | .irq = IRQ_PF8, |
737 | }, | 734 | }, |
738 | #endif | 735 | #endif |
739 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | 736 | #if IS_ENABLED(CONFIG_FB_BFIN_7393) |
740 | { | 737 | { |
741 | I2C_BOARD_INFO("bfin-adv7393", 0x2B), | 738 | I2C_BOARD_INFO("bfin-adv7393", 0x2B), |
742 | }, | 739 | }, |
743 | #endif | 740 | #endif |
744 | }; | 741 | }; |
745 | 742 | ||
746 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 743 | #if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT) |
747 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART | 744 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART |
748 | static struct resource bfin_sport0_uart_resources[] = { | 745 | static struct resource bfin_sport0_uart_resources[] = { |
749 | { | 746 | { |
@@ -814,7 +811,7 @@ static struct platform_device bfin_sport1_uart_device = { | |||
814 | #endif | 811 | #endif |
815 | #endif | 812 | #endif |
816 | 813 | ||
817 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 814 | #if IS_ENABLED(CONFIG_KEYBOARD_GPIO) |
818 | #include <linux/input.h> | 815 | #include <linux/input.h> |
819 | #include <linux/gpio_keys.h> | 816 | #include <linux/gpio_keys.h> |
820 | 817 | ||
@@ -861,48 +858,48 @@ static struct platform_device *cmbf527_devices[] __initdata = { | |||
861 | 858 | ||
862 | &bfin_dpmc, | 859 | &bfin_dpmc, |
863 | 860 | ||
864 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 861 | #if IS_ENABLED(CONFIG_MTD_NAND_BF5XX) |
865 | &bf5xx_nand_device, | 862 | &bf5xx_nand_device, |
866 | #endif | 863 | #endif |
867 | 864 | ||
868 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) | 865 | #if IS_ENABLED(CONFIG_BFIN_CFPCMCIA) |
869 | &bfin_pcmcia_cf_device, | 866 | &bfin_pcmcia_cf_device, |
870 | #endif | 867 | #endif |
871 | 868 | ||
872 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 869 | #if IS_ENABLED(CONFIG_RTC_DRV_BFIN) |
873 | &rtc_device, | 870 | &rtc_device, |
874 | #endif | 871 | #endif |
875 | 872 | ||
876 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) | 873 | #if IS_ENABLED(CONFIG_USB_ISP1760_HCD) |
877 | &bfin_isp1760_device, | 874 | &bfin_isp1760_device, |
878 | #endif | 875 | #endif |
879 | 876 | ||
880 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | 877 | #if IS_ENABLED(CONFIG_USB_MUSB_HDRC) |
881 | &musb_device, | 878 | &musb_device, |
882 | #endif | 879 | #endif |
883 | 880 | ||
884 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 881 | #if IS_ENABLED(CONFIG_SMC91X) |
885 | &smc91x_device, | 882 | &smc91x_device, |
886 | #endif | 883 | #endif |
887 | 884 | ||
888 | #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) | 885 | #if IS_ENABLED(CONFIG_DM9000) |
889 | &dm9000_device, | 886 | &dm9000_device, |
890 | #endif | 887 | #endif |
891 | 888 | ||
892 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 889 | #if IS_ENABLED(CONFIG_BFIN_MAC) |
893 | &bfin_mii_bus, | 890 | &bfin_mii_bus, |
894 | &bfin_mac_device, | 891 | &bfin_mac_device, |
895 | #endif | 892 | #endif |
896 | 893 | ||
897 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) | 894 | #if IS_ENABLED(CONFIG_USB_NET2272) |
898 | &net2272_bfin_device, | 895 | &net2272_bfin_device, |
899 | #endif | 896 | #endif |
900 | 897 | ||
901 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) | 898 | #if IS_ENABLED(CONFIG_SPI_BFIN5XX) |
902 | &bfin_spi0_device, | 899 | &bfin_spi0_device, |
903 | #endif | 900 | #endif |
904 | 901 | ||
905 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 902 | #if IS_ENABLED(CONFIG_SERIAL_BFIN) |
906 | #ifdef CONFIG_SERIAL_BFIN_UART0 | 903 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
907 | &bfin_uart0_device, | 904 | &bfin_uart0_device, |
908 | #endif | 905 | #endif |
@@ -911,7 +908,7 @@ static struct platform_device *cmbf527_devices[] __initdata = { | |||
911 | #endif | 908 | #endif |
912 | #endif | 909 | #endif |
913 | 910 | ||
914 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 911 | #if IS_ENABLED(CONFIG_BFIN_SIR) |
915 | #ifdef CONFIG_BFIN_SIR0 | 912 | #ifdef CONFIG_BFIN_SIR0 |
916 | &bfin_sir0_device, | 913 | &bfin_sir0_device, |
917 | #endif | 914 | #endif |
@@ -920,11 +917,11 @@ static struct platform_device *cmbf527_devices[] __initdata = { | |||
920 | #endif | 917 | #endif |
921 | #endif | 918 | #endif |
922 | 919 | ||
923 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 920 | #if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI) |
924 | &i2c_bfin_twi_device, | 921 | &i2c_bfin_twi_device, |
925 | #endif | 922 | #endif |
926 | 923 | ||
927 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 924 | #if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT) |
928 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART | 925 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART |
929 | &bfin_sport0_uart_device, | 926 | &bfin_sport0_uart_device, |
930 | #endif | 927 | #endif |
@@ -933,11 +930,11 @@ static struct platform_device *cmbf527_devices[] __initdata = { | |||
933 | #endif | 930 | #endif |
934 | #endif | 931 | #endif |
935 | 932 | ||
936 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 933 | #if IS_ENABLED(CONFIG_KEYBOARD_GPIO) |
937 | &bfin_device_gpiokeys, | 934 | &bfin_device_gpiokeys, |
938 | #endif | 935 | #endif |
939 | 936 | ||
940 | #if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) | 937 | #if IS_ENABLED(CONFIG_MTD_GPIO_ADDR) |
941 | &cm_flash_device, | 938 | &cm_flash_device, |
942 | #endif | 939 | #endif |
943 | }; | 940 | }; |