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-bf518 | |
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-bf518')
-rw-r--r-- | arch/blackfin/mach-bf518/boards/ezbrd.c | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-bf518/boards/tcm-bf518.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c index d1c0c0cff3ef..c4de8f93bbe4 100644 --- a/arch/blackfin/mach-bf518/boards/ezbrd.c +++ b/arch/blackfin/mach-bf518/boards/ezbrd.c | |||
@@ -61,7 +61,7 @@ static struct physmap_flash_data ezbrd_flash_data = { | |||
61 | 61 | ||
62 | static struct resource ezbrd_flash_resource = { | 62 | static struct resource ezbrd_flash_resource = { |
63 | .start = 0x20000000, | 63 | .start = 0x20000000, |
64 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 64 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
65 | .end = 0x202fffff, | 65 | .end = 0x202fffff, |
66 | #else | 66 | #else |
67 | .end = 0x203fffff, | 67 | .end = 0x203fffff, |
@@ -292,7 +292,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
292 | }; | 292 | }; |
293 | 293 | ||
294 | /* SPI controller data */ | 294 | /* SPI controller data */ |
295 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 295 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
296 | /* SPI (0) */ | 296 | /* SPI (0) */ |
297 | static struct bfin5xx_spi_master bfin_spi0_info = { | 297 | static struct bfin5xx_spi_master bfin_spi0_info = { |
298 | .num_chipselect = 6, | 298 | .num_chipselect = 6, |
@@ -715,7 +715,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
715 | #endif | 715 | #endif |
716 | #endif | 716 | #endif |
717 | 717 | ||
718 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 718 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
719 | &bfin_spi0_device, | 719 | &bfin_spi0_device, |
720 | &bfin_spi1_device, | 720 | &bfin_spi1_device, |
721 | #endif | 721 | #endif |
@@ -777,7 +777,7 @@ static int __init ezbrd_init(void) | |||
777 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 777 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
778 | /* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */ | 778 | /* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */ |
779 | peripheral_request(P_AMS2, "ParaFlash"); | 779 | peripheral_request(P_AMS2, "ParaFlash"); |
780 | #if !defined(CONFIG_SPI_BFIN) && !defined(CONFIG_SPI_BFIN_MODULE) | 780 | #if !defined(CONFIG_SPI_BFIN5XX) && !defined(CONFIG_SPI_BFIN5XX_MODULE) |
781 | peripheral_request(P_AMS3, "ParaFlash"); | 781 | peripheral_request(P_AMS3, "ParaFlash"); |
782 | #endif | 782 | #endif |
783 | return 0; | 783 | return 0; |
diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/arch/blackfin/mach-bf518/boards/tcm-bf518.c index 5470bf89e52e..f271310f739d 100644 --- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c +++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c | |||
@@ -228,7 +228,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
228 | }; | 228 | }; |
229 | 229 | ||
230 | /* SPI controller data */ | 230 | /* SPI controller data */ |
231 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 231 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
232 | /* SPI (0) */ | 232 | /* SPI (0) */ |
233 | static struct bfin5xx_spi_master bfin_spi0_info = { | 233 | static struct bfin5xx_spi_master bfin_spi0_info = { |
234 | .num_chipselect = 6, | 234 | .num_chipselect = 6, |
@@ -635,7 +635,7 @@ static struct platform_device *tcm_devices[] __initdata = { | |||
635 | &bfin_mac_device, | 635 | &bfin_mac_device, |
636 | #endif | 636 | #endif |
637 | 637 | ||
638 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 638 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
639 | &bfin_spi0_device, | 639 | &bfin_spi0_device, |
640 | &bfin_spi1_device, | 640 | &bfin_spi1_device, |
641 | #endif | 641 | #endif |