Commit 2cdd7008 authored by Scott Jiang's avatar Scott Jiang Committed by Bob Liu

bf609: change ad7877 cs and irq pin

Extend chip select number supported by spi master as well
because we can accept SPISEL1-SPISEL7 and all GPIO.
Signed-off-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
parent 28a33cbc
...@@ -981,10 +981,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -981,10 +981,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
{ {
.modalias = "ad7877", .modalias = "ad7877",
.platform_data = &bfin_ad7877_ts_info, .platform_data = &bfin_ad7877_ts_info,
.irq = IRQ_PB4, /* old boards (<=Rev 1.3) use IRQ_PJ11 */ .irq = IRQ_PD9,
.max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = 2, .chip_select = 4,
}, },
#endif #endif
#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
...@@ -1050,7 +1050,7 @@ static struct resource bfin_spi1_resource[] = { ...@@ -1050,7 +1050,7 @@ static struct resource bfin_spi1_resource[] = {
/* SPI controller data */ /* SPI controller data */
static struct bfin6xx_spi_master bf60x_spi_master_info0 = { static struct bfin6xx_spi_master bf60x_spi_master_info0 = {
.num_chipselect = 4, .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
...@@ -1065,7 +1065,7 @@ static struct platform_device bf60x_spi_master0 = { ...@@ -1065,7 +1065,7 @@ static struct platform_device bf60x_spi_master0 = {
}; };
static struct bfin6xx_spi_master bf60x_spi_master_info1 = { static struct bfin6xx_spi_master bf60x_spi_master_info1 = {
.num_chipselect = 4, .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
.pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0}, .pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment