diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2007-11-12 11:16:19 -0500 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-11-12 11:16:19 -0500 |
commit | 0954f70ab1ffd9ad945c88c11877a08baed311c7 (patch) | |
tree | 8aa26734becebbeeb3382b05b99d0aef586a70c4 /arch/blackfin | |
parent | 5d448dd50712ae42f8176b5bb8db4703bef6f0f5 (diff) |
Blackfin arch: fix AD7877 bus_num and add support for WM8731 SPI control interface
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 88b41b71bffc..299b1704796d 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -451,6 +451,13 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { | |||
451 | }; | 451 | }; |
452 | #endif | 452 | #endif |
453 | 453 | ||
454 | #if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) \ | ||
455 | && defined(CONFIG_SND_SOC_WM8731_SPI) | ||
456 | static struct bfin5xx_spi_chip spi_wm8731_chip_info = { | ||
457 | .enable_dma = 0, | ||
458 | .bits_per_word = 16, | ||
459 | }; | ||
460 | #endif | ||
454 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 461 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
455 | #if defined(CONFIG_MTD_M25P80) \ | 462 | #if defined(CONFIG_MTD_M25P80) \ |
456 | || defined(CONFIG_MTD_M25P80_MODULE) | 463 | || defined(CONFIG_MTD_M25P80_MODULE) |
@@ -552,11 +559,22 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
552 | .platform_data = &bfin_ad7877_ts_info, | 559 | .platform_data = &bfin_ad7877_ts_info, |
553 | .irq = IRQ_PF6, | 560 | .irq = IRQ_PF6, |
554 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 561 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
555 | .bus_num = 1, | 562 | .bus_num = 0, |
556 | .chip_select = 1, | 563 | .chip_select = 1, |
557 | .controller_data = &spi_ad7877_chip_info, | 564 | .controller_data = &spi_ad7877_chip_info, |
558 | }, | 565 | }, |
559 | #endif | 566 | #endif |
567 | #if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) \ | ||
568 | && defined(CONFIG_SND_SOC_WM8731_SPI) | ||
569 | { | ||
570 | .modalias = "wm8731", | ||
571 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | ||
572 | .bus_num = 0, | ||
573 | .chip_select = 5, | ||
574 | .controller_data = &spi_wm8731_chip_info, | ||
575 | .mode = SPI_MODE_0, | ||
576 | }, | ||
577 | #endif | ||
560 | }; | 578 | }; |
561 | 579 | ||
562 | /* SPI controller data */ | 580 | /* SPI controller data */ |