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-bf548 | |
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-bf548')
-rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 0350eacec21b..68af594db48e 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
@@ -854,7 +854,7 @@ static struct platform_device para_flash_device = { | |||
854 | }; | 854 | }; |
855 | #endif | 855 | #endif |
856 | 856 | ||
857 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 857 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
858 | /* all SPI peripherals info goes here */ | 858 | /* all SPI peripherals info goes here */ |
859 | #if defined(CONFIG_MTD_M25P80) \ | 859 | #if defined(CONFIG_MTD_M25P80) \ |
860 | || defined(CONFIG_MTD_M25P80_MODULE) | 860 | || defined(CONFIG_MTD_M25P80_MODULE) |
@@ -1175,7 +1175,7 @@ static struct platform_device *cm_bf548_devices[] __initdata = { | |||
1175 | &bf54x_sdh_device, | 1175 | &bf54x_sdh_device, |
1176 | #endif | 1176 | #endif |
1177 | 1177 | ||
1178 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 1178 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
1179 | &bf54x_spi_master0, | 1179 | &bf54x_spi_master0, |
1180 | &bf54x_spi_master1, | 1180 | &bf54x_spi_master1, |
1181 | #endif | 1181 | #endif |
@@ -1210,7 +1210,7 @@ static int __init cm_bf548_init(void) | |||
1210 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 1210 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
1211 | platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices)); | 1211 | platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices)); |
1212 | 1212 | ||
1213 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 1213 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
1214 | spi_register_board_info(bf54x_spi_board_info, | 1214 | spi_register_board_info(bf54x_spi_board_info, |
1215 | ARRAY_SIZE(bf54x_spi_board_info)); | 1215 | ARRAY_SIZE(bf54x_spi_board_info)); |
1216 | #endif | 1216 | #endif |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index bb868ac0fe2d..5ea6ecac35e2 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -1110,7 +1110,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
1110 | }, | 1110 | }, |
1111 | #endif | 1111 | #endif |
1112 | }; | 1112 | }; |
1113 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 1113 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
1114 | /* SPI (0) */ | 1114 | /* SPI (0) */ |
1115 | static struct resource bfin_spi0_resource[] = { | 1115 | static struct resource bfin_spi0_resource[] = { |
1116 | [0] = { | 1116 | [0] = { |
@@ -1502,7 +1502,7 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
1502 | &bf54x_sdh_device, | 1502 | &bf54x_sdh_device, |
1503 | #endif | 1503 | #endif |
1504 | 1504 | ||
1505 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 1505 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
1506 | &bf54x_spi_master0, | 1506 | &bf54x_spi_master0, |
1507 | &bf54x_spi_master1, | 1507 | &bf54x_spi_master1, |
1508 | #endif | 1508 | #endif |