Skip to content

Commit

Permalink
Blackfin: bf537: rename ad2s120x ->ad2s1200
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Bolle authored and Steven Miao committed Apr 12, 2014
1 parent cb8f05f commit 6ffe346
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions arch/blackfin/mach-bf537/boards/stamp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 6ffe346

Please sign in to comment.