leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blackfin: bf537: rename ad2s120x ->ad2s1200

Browse Source 
In v3.2 the Analog Devices ad2s1200/ad2s1205 driver was renamed from
ad2s120x to ad2s1200. But it apparently forgot to rename the references
to this driver in the BF537-STAMP code. Rename these now, and use the
IS_ENABLED() macro, while we're at it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
This commit is contained in:
Paul Bolle 2013-04-04 13:02:10 +02:00 committed by Steven Miao
parent cb8f05f74f
commit 6ffe34638e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/blackfin/mach-bf537/boards/stamp.c
View File

@ -655,13 +655,13 @@ static struct bfin5xx_spi_chip ad2s90_spi_chip_info = {
};
#endif
#if defined(CONFIG_AD2S120X) || defined(CONFIG_AD2S120X_MODULE)
static unsigned short ad2s120x_platform_data[] = {
#if IS_ENABLED(CONFIG_AD2S1200)
static unsigned short ad2s1200_platform_data[] = {
/* used as SAMPLE and RDVEL */
GPIO_PF5, GPIO_PF6, 0
};
static struct bfin5xx_spi_chip ad2s120x_spi_chip_info = {
static struct bfin5xx_spi_chip ad2s1200_spi_chip_info = {
.enable_dma = 0,
};
#endif
@ -1019,13 +1019,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
},
#endif
#if defined(CONFIG_AD2S120X) || defined(CONFIG_AD2S120X_MODULE)
#if IS_ENABLED(CONFIG_AD2S1200)
{
.modalias = "ad2s120x",
.modalias = "ad2s1200",
.bus_num = 0,
.chip_select = 4, /* CS, change it for your board */
.platform_data = ad2s120x_platform_data,
.controller_data = &ad2s120x_spi_chip_info,
.platform_data = ad2s1200_platform_data,
.controller_data = &ad2s1200_spi_chip_info,
},
#endif