diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2011-11-07 05:40:10 -0500 |
---|---|---|
committer | Bob Liu <lliubbo@gmail.com> | 2012-01-08 21:26:15 -0500 |
commit | 7d157fb02bc3f4dc74e6830725864ba501d92da7 (patch) | |
tree | 6955dbcf4ecd6684e193e872918fa9bd6f89228e /arch/blackfin/mach-bf561 | |
parent | 5ef835ebf9672cc594af0d13accd8fb239926a0f (diff) |
blackfin: config: update macro SPI_BFIN in board file
Macro name for spi controller driver has been modified, so update default
board file accordingly.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin/mach-bf561')
-rw-r--r-- | arch/blackfin/mach-bf561/boards/acvilon.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/ezkit.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c index b1b7339b6ba7..f6ffd6f054c3 100644 --- a/arch/blackfin/mach-bf561/boards/acvilon.c +++ b/arch/blackfin/mach-bf561/boards/acvilon.c | |||
@@ -372,7 +372,7 @@ static struct bfin5xx_spi_chip data_flash_chip_info = { | |||
372 | }; | 372 | }; |
373 | #endif | 373 | #endif |
374 | 374 | ||
375 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 375 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
376 | /* SPI (0) */ | 376 | /* SPI (0) */ |
377 | static struct resource bfin_spi0_resource[] = { | 377 | static struct resource bfin_spi0_resource[] = { |
378 | [0] = { | 378 | [0] = { |
@@ -475,7 +475,7 @@ static struct platform_device bfin_dpmc = { | |||
475 | static struct platform_device *acvilon_devices[] __initdata = { | 475 | static struct platform_device *acvilon_devices[] __initdata = { |
476 | &bfin_dpmc, | 476 | &bfin_dpmc, |
477 | 477 | ||
478 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 478 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
479 | &bfin_spi0_device, | 479 | &bfin_spi0_device, |
480 | #endif | 480 | #endif |
481 | 481 | ||
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index c017cf07ed4e..d81450f635df 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | const char bfin_board_name[] = "Bluetechnix CM BF561"; | 30 | const char bfin_board_name[] = "Bluetechnix CM BF561"; |
31 | 31 | ||
32 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 32 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
33 | /* all SPI peripherals info goes here */ | 33 | /* all SPI peripherals info goes here */ |
34 | 34 | ||
35 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 35 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
@@ -488,7 +488,7 @@ static struct platform_device *cm_bf561_devices[] __initdata = { | |||
488 | &net2272_bfin_device, | 488 | &net2272_bfin_device, |
489 | #endif | 489 | #endif |
490 | 490 | ||
491 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 491 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
492 | &bfin_spi0_device, | 492 | &bfin_spi0_device, |
493 | #endif | 493 | #endif |
494 | 494 | ||
@@ -523,7 +523,7 @@ static int __init cm_bf561_init(void) | |||
523 | { | 523 | { |
524 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 524 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
525 | platform_add_devices(cm_bf561_devices, ARRAY_SIZE(cm_bf561_devices)); | 525 | platform_add_devices(cm_bf561_devices, ARRAY_SIZE(cm_bf561_devices)); |
526 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 526 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
527 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 527 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
528 | #endif | 528 | #endif |
529 | 529 | ||
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index 27f22ed381d9..5ade37d04483 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -291,7 +291,7 @@ static struct platform_device ezkit_flash_device = { | |||
291 | }; | 291 | }; |
292 | #endif | 292 | #endif |
293 | 293 | ||
294 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 294 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
295 | /* SPI (0) */ | 295 | /* SPI (0) */ |
296 | static struct resource bfin_spi0_resource[] = { | 296 | static struct resource bfin_spi0_resource[] = { |
297 | [0] = { | 297 | [0] = { |
@@ -462,7 +462,7 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
462 | &bfin_isp1760_device, | 462 | &bfin_isp1760_device, |
463 | #endif | 463 | #endif |
464 | 464 | ||
465 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 465 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
466 | &bfin_spi0_device, | 466 | &bfin_spi0_device, |
467 | #endif | 467 | #endif |
468 | 468 | ||