diff options
author | Barry Song <barry.song@analog.com> | 2010-01-28 04:37:21 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-22 03:48:43 -0400 |
commit | 7ba80063e90302287625a105c546c2fc318fcfbf (patch) | |
tree | 49bf493e91254c69b5cf8b5e3c87146ea5806884 /arch/blackfin/mach-bf527 | |
parent | f9f0e3b1f7ac4e9fa822e87dd4bbb38f8c389487 (diff) |
Blackfin: boards: update AD183x resources
Make sure we use the right Kconfig names and platform strings.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf527')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 12 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 645ba5c8077b..38037c7e125a 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -342,8 +342,8 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
342 | }; | 342 | }; |
343 | #endif | 343 | #endif |
344 | 344 | ||
345 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ | 345 | #if defined(CONFIG_SND_BF5XX_SOC_AD183X) \ |
346 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) | 346 | || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) |
347 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 347 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
348 | .enable_dma = 0, | 348 | .enable_dma = 0, |
349 | .bits_per_word = 16, | 349 | .bits_per_word = 16, |
@@ -420,13 +420,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
420 | }, | 420 | }, |
421 | #endif | 421 | #endif |
422 | 422 | ||
423 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ | 423 | #if defined(CONFIG_SND_BF5XX_SOC_AD183X) \ |
424 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) | 424 | || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) |
425 | { | 425 | { |
426 | .modalias = "ad1836", | 426 | .modalias = "ad183x", |
427 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 427 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
428 | .bus_num = 0, | 428 | .bus_num = 0, |
429 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 429 | .chip_select = 4, |
430 | .controller_data = &ad1836_spi_chip_info, | 430 | .controller_data = &ad1836_spi_chip_info, |
431 | }, | 431 | }, |
432 | #endif | 432 | #endif |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 87b41e994ba3..7ea87009fb83 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -431,8 +431,8 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
431 | }; | 431 | }; |
432 | #endif | 432 | #endif |
433 | 433 | ||
434 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ | 434 | #if defined(CONFIG_SND_BF5XX_SOC_AD183X) \ |
435 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) | 435 | || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) |
436 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 436 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
437 | .enable_dma = 0, | 437 | .enable_dma = 0, |
438 | .bits_per_word = 16, | 438 | .bits_per_word = 16, |
@@ -547,13 +547,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
547 | }, | 547 | }, |
548 | #endif | 548 | #endif |
549 | 549 | ||
550 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ | 550 | #if defined(CONFIG_SND_BF5XX_SOC_AD183X) \ |
551 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) | 551 | || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) |
552 | { | 552 | { |
553 | .modalias = "ad1836", | 553 | .modalias = "ad183x", |
554 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 554 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
555 | .bus_num = 0, | 555 | .bus_num = 0, |
556 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 556 | .chip_select = 4, |
557 | .controller_data = &ad1836_spi_chip_info, | 557 | .controller_data = &ad1836_spi_chip_info, |
558 | }, | 558 | }, |
559 | #endif | 559 | #endif |