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>
This commit is contained in:
parent
5d448dd507
commit
0954f70ab1
|
@ -451,6 +451,13 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
|
||||||
};
|
};
|
||||||
#endif
|
#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 = {
|
static struct spi_board_info bfin_spi_board_info[] __initdata = {
|
||||||
#if defined(CONFIG_MTD_M25P80) \
|
#if defined(CONFIG_MTD_M25P80) \
|
||||||
|| defined(CONFIG_MTD_M25P80_MODULE)
|
|| 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,
|
.platform_data = &bfin_ad7877_ts_info,
|
||||||
.irq = IRQ_PF6,
|
.irq = IRQ_PF6,
|
||||||
.max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
|
.max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
|
||||||
.bus_num = 1,
|
.bus_num = 0,
|
||||||
.chip_select = 1,
|
.chip_select = 1,
|
||||||
.controller_data = &spi_ad7877_chip_info,
|
.controller_data = &spi_ad7877_chip_info,
|
||||||
},
|
},
|
||||||
#endif
|
#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 */
|
/* SPI controller data */
|
||||||
|
|
Loading…
Reference in New Issue