Blackfin arch: Dont use cs_change_per_word, since the AD7877 driver doesnt require it anymore; fix bus numbers, fix typos
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
This commit is contained in:
parent
f02bcec598
commit
c7d4896621
|
@ -451,7 +451,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) \
|
#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
|
||||||
&& defined(CONFIG_SND_SOC_WM8731_SPI)
|
&& defined(CONFIG_SND_SOC_WM8731_SPI)
|
||||||
static struct bfin5xx_spi_chip spi_wm8731_chip_info = {
|
static struct bfin5xx_spi_chip spi_wm8731_chip_info = {
|
||||||
.enable_dma = 0,
|
.enable_dma = 0,
|
||||||
|
@ -564,7 +564,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
|
||||||
.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) \
|
#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
|
||||||
&& defined(CONFIG_SND_SOC_WM8731_SPI)
|
&& defined(CONFIG_SND_SOC_WM8731_SPI)
|
||||||
{
|
{
|
||||||
.modalias = "wm8731",
|
.modalias = "wm8731",
|
||||||
|
|
|
@ -503,7 +503,7 @@ 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,
|
||||||
},
|
},
|
||||||
|
|
|
@ -296,7 +296,7 @@ static struct bfin5xx_spi_chip spi_mmc_chip_info = {
|
||||||
|
|
||||||
#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
|
#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
|
||||||
static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
|
static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
|
||||||
.cs_change_per_word = 1,
|
.cs_change_per_word = 0,
|
||||||
.enable_dma = 0,
|
.enable_dma = 0,
|
||||||
.bits_per_word = 16,
|
.bits_per_word = 16,
|
||||||
};
|
};
|
||||||
|
@ -388,7 +388,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
|
||||||
.platform_data = &bfin_ad7877_ts_info,
|
.platform_data = &bfin_ad7877_ts_info,
|
||||||
.irq = IRQ_PF2,
|
.irq = IRQ_PF2,
|
||||||
.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 = 5,
|
.chip_select = 5,
|
||||||
.controller_data = &spi_ad7877_chip_info,
|
.controller_data = &spi_ad7877_chip_info,
|
||||||
},
|
},
|
||||||
|
|
|
@ -503,7 +503,7 @@ 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,
|
||||||
},
|
},
|
||||||
|
|
|
@ -378,7 +378,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
|
||||||
|
|
||||||
#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
|
#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
|
||||||
static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
|
static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
|
||||||
.cs_change_per_word = 1,
|
.cs_change_per_word = 0,
|
||||||
.enable_dma = 0,
|
.enable_dma = 0,
|
||||||
.bits_per_word = 16,
|
.bits_per_word = 16,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue