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-bf533 | |
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-bf533')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/H8606.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/blackstamp.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/cm_bf533.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ip0x.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c index 47cadd316e76..6cb7b3ed9b3d 100644 --- a/arch/blackfin/mach-bf533/boards/H8606.c +++ b/arch/blackfin/mach-bf533/boards/H8606.c | |||
@@ -125,7 +125,7 @@ static struct platform_device net2272_bfin_device = { | |||
125 | }; | 125 | }; |
126 | #endif | 126 | #endif |
127 | 127 | ||
128 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 128 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
129 | /* all SPI peripherals info goes here */ | 129 | /* all SPI peripherals info goes here */ |
130 | 130 | ||
131 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 131 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
@@ -398,7 +398,7 @@ static struct platform_device *h8606_devices[] __initdata = { | |||
398 | &net2272_bfin_device, | 398 | &net2272_bfin_device, |
399 | #endif | 399 | #endif |
400 | 400 | ||
401 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 401 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
402 | &bfin_spi0_device, | 402 | &bfin_spi0_device, |
403 | #endif | 403 | #endif |
404 | 404 | ||
@@ -428,7 +428,7 @@ static int __init H8606_init(void) | |||
428 | printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n"); | 428 | printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n"); |
429 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 429 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
430 | platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices)); | 430 | platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices)); |
431 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 431 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
432 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 432 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
433 | #endif | 433 | #endif |
434 | return 0; | 434 | return 0; |
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c index 18817d57c7a1..de44a3765e59 100644 --- a/arch/blackfin/mach-bf533/boards/blackstamp.c +++ b/arch/blackfin/mach-bf533/boards/blackstamp.c | |||
@@ -146,7 +146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
146 | #endif | 146 | #endif |
147 | }; | 147 | }; |
148 | 148 | ||
149 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 149 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
150 | /* SPI (0) */ | 150 | /* SPI (0) */ |
151 | static struct resource bfin_spi0_resource[] = { | 151 | static struct resource bfin_spi0_resource[] = { |
152 | [0] = { | 152 | [0] = { |
@@ -422,7 +422,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
422 | #endif | 422 | #endif |
423 | 423 | ||
424 | 424 | ||
425 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 425 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
426 | &bfin_spi0_device, | 426 | &bfin_spi0_device, |
427 | #endif | 427 | #endif |
428 | 428 | ||
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index 2c8f30ef6a7b..fe47e048c4e6 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
@@ -29,7 +29,7 @@ | |||
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_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 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 34 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
35 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 35 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
@@ -536,7 +536,7 @@ static struct platform_device *cm_bf533_devices[] __initdata = { | |||
536 | &net2272_bfin_device, | 536 | &net2272_bfin_device, |
537 | #endif | 537 | #endif |
538 | 538 | ||
539 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 539 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
540 | &bfin_spi0_device, | 540 | &bfin_spi0_device, |
541 | #endif | 541 | #endif |
542 | 542 | ||
@@ -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_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 552 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
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; |
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 144556e14499..07811c209b9d 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -245,7 +245,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
245 | #endif | 245 | #endif |
246 | }; | 246 | }; |
247 | 247 | ||
248 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 248 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
249 | /* SPI (0) */ | 249 | /* SPI (0) */ |
250 | static struct resource bfin_spi0_resource[] = { | 250 | static struct resource bfin_spi0_resource[] = { |
251 | [0] = { | 251 | [0] = { |
@@ -484,7 +484,7 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
484 | &smc91x_device, | 484 | &smc91x_device, |
485 | #endif | 485 | #endif |
486 | 486 | ||
487 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 487 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
488 | &bfin_spi0_device, | 488 | &bfin_spi0_device, |
489 | #endif | 489 | #endif |
490 | 490 | ||
diff --git a/arch/blackfin/mach-bf533/boards/ip0x.c b/arch/blackfin/mach-bf533/boards/ip0x.c index b597d4e50d58..e303dae4e2d9 100644 --- a/arch/blackfin/mach-bf533/boards/ip0x.c +++ b/arch/blackfin/mach-bf533/boards/ip0x.c | |||
@@ -104,7 +104,7 @@ static struct platform_device dm9000_device2 = { | |||
104 | #endif | 104 | #endif |
105 | 105 | ||
106 | 106 | ||
107 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 107 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
108 | /* all SPI peripherals info goes here */ | 108 | /* all SPI peripherals info goes here */ |
109 | 109 | ||
110 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 110 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) |
@@ -270,7 +270,7 @@ static struct platform_device *ip0x_devices[] __initdata = { | |||
270 | #endif | 270 | #endif |
271 | #endif | 271 | #endif |
272 | 272 | ||
273 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 273 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
274 | &spi_bfin_master_device, | 274 | &spi_bfin_master_device, |
275 | #endif | 275 | #endif |
276 | 276 | ||
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index 2ba4d0b4e252..edd057d25e22 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -252,7 +252,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
252 | #endif | 252 | #endif |
253 | }; | 253 | }; |
254 | 254 | ||
255 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 255 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
256 | /* SPI (0) */ | 256 | /* SPI (0) */ |
257 | static struct resource bfin_spi0_resource[] = { | 257 | static struct resource bfin_spi0_resource[] = { |
258 | [0] = { | 258 | [0] = { |
@@ -704,7 +704,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
704 | &net2272_bfin_device, | 704 | &net2272_bfin_device, |
705 | #endif | 705 | #endif |
706 | 706 | ||
707 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 707 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
708 | &bfin_spi0_device, | 708 | &bfin_spi0_device, |
709 | #endif | 709 | #endif |
710 | 710 | ||