diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2007-11-12 17:16:19 +0100 |
|---|---|---|
| committer | Bryan Wu <bryan.wu@analog.com> | 2007-11-12 17:16:19 +0100 |
| commit | 0954f70ab1ffd9ad945c88c11877a08baed311c7 (patch) | |
| tree | 8aa26734becebbeeb3382b05b99d0aef586a70c4 /arch/blackfin | |
| parent | Blackfin arch: move hard coded pin_req to board file (diff) | |
| download | linux-0954f70ab1ffd9ad945c88c11877a08baed311c7.tar.xz linux-0954f70ab1ffd9ad945c88c11877a08baed311c7.zip | |
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 = { }; #endif +#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) \ + && defined(CONFIG_SND_SOC_WM8731_SPI) +static struct bfin5xx_spi_chip spi_wm8731_chip_info = { + .enable_dma = 0, + .bits_per_word = 16, +}; +#endif static struct spi_board_info bfin_spi_board_info[] __initdata = { #if defined(CONFIG_MTD_M25P80) \ || defined(CONFIG_MTD_M25P80_MODULE) @@ -552,11 +559,22 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { .platform_data = &bfin_ad7877_ts_info, .irq = IRQ_PF6, .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ - .bus_num = 1, + .bus_num = 0, .chip_select = 1, .controller_data = &spi_ad7877_chip_info, }, #endif +#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) \ + && defined(CONFIG_SND_SOC_WM8731_SPI) + { + .modalias = "wm8731", + .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ + .bus_num = 0, + .chip_select = 5, + .controller_data = &spi_wm8731_chip_info, + .mode = SPI_MODE_0, + }, +#endif }; /* SPI controller data */ |