commit 8053dee3c5caf847d7dba4d311acfe7676aecb67 Author: Hector Martin Date: Sat Dec 11 00:19:43 2021 +0900 applespi: Switch to using SPI core CS delay feature Signed-off-by: Hector Martin diff --git a/drivers/input/keyboard/applespi.c b/drivers/input/keyboard/applespi.c index ce79be5346ed..a0242596cf69 100644 --- a/drivers/input/keyboard/applespi.c +++ b/drivers/input/keyboard/applespi.c @@ -409,7 +409,6 @@ struct applespi_data { #endif struct spi_transfer rw_t; - struct spi_transfer dl_t; struct spi_transfer rd_t; struct spi_message rd_m; @@ -568,29 +567,21 @@ static void applespi_setup_read_txfrs(struct applespi_data *applespi) { struct spi_message *msg = &applespi->rd_m; struct spi_transfer *rw_t = &applespi->rw_t; - struct spi_transfer *dl_t = &applespi->dl_t; struct spi_transfer *rd_t = &applespi->rd_t; memset(rw_t, 0, sizeof(*rw_t)); - memset(dl_t, 0, sizeof(*dl_t)); memset(rd_t, 0, sizeof(*rd_t)); rw_t->delay.value = SPI_RW_CHG_DELAY_US; rw_t->delay.unit = SPI_DELAY_UNIT_USECS; rw_t->cs_change = 1; - dl_t->delay.value = applespi->spi_settings.spi_cs_delay; - dl_t->delay.unit = SPI_DELAY_UNIT_USECS; - rd_t->rx_buf = applespi->rx_buffer; rd_t->len = APPLESPI_PACKET_SIZE; - rd_t->delay.value = SPI_END_CS_DELAY_US; - rd_t->delay.unit = SPI_DELAY_UNIT_USECS; spi_message_init(msg); // if(applespi->of_mode) // spi_message_add_tail(rw_t, msg); - spi_message_add_tail(dl_t, msg); spi_message_add_tail(rd_t, msg); } @@ -598,12 +589,10 @@ static void applespi_setup_write_txfrs(struct applespi_data *applespi) { struct spi_message *msg = &applespi->wr_m; struct spi_transfer *wt_t = &applespi->ww_t; - struct spi_transfer *dl_t = &applespi->wd_t; struct spi_transfer *wr_t = &applespi->wr_t; struct spi_transfer *st_t = &applespi->st_t; memset(wt_t, 0, sizeof(*wt_t)); - memset(dl_t, 0, sizeof(*dl_t)); memset(wr_t, 0, sizeof(*wr_t)); memset(st_t, 0, sizeof(*st_t)); @@ -617,9 +606,6 @@ static void applespi_setup_write_txfrs(struct applespi_data *applespi) wt_t->delay.unit = SPI_DELAY_UNIT_USECS; wt_t->cs_change = 1; - dl_t->delay.value = applespi->spi_settings.spi_cs_delay; - dl_t->delay.unit = SPI_DELAY_UNIT_USECS; - wr_t->tx_buf = applespi->tx_buffer; wr_t->len = APPLESPI_PACKET_SIZE; wr_t->delay.value = SPI_RW_CHG_DELAY_US; @@ -627,12 +613,9 @@ static void applespi_setup_write_txfrs(struct applespi_data *applespi) st_t->rx_buf = applespi->tx_status; st_t->len = APPLESPI_STATUS_SIZE; - st_t->delay.value = SPI_END_CS_DELAY_US; - st_t->delay.unit = SPI_DELAY_UNIT_USECS; spi_message_init(msg); // spi_message_add_tail(wt_t, msg); - spi_message_add_tail(dl_t, msg); spi_message_add_tail(wr_t, msg); spi_message_add_tail(st_t, msg); } @@ -698,6 +681,11 @@ static int applespi_get_spi_settings(struct applespi_data *applespi) #endif } + applespi->spi->cs_setup.unit = SPI_DELAY_UNIT_USECS; + applespi->spi->cs_setup.value = settings->spi_cs_delay; + applespi->spi->cs_hold.unit = SPI_DELAY_UNIT_USECS; + applespi->spi->cs_hold.value = SPI_END_CS_DELAY_US; + dev_dbg(&applespi->spi->dev, "SPI settings: spi_cs_delay=%llu reset_a2r_usec=%llu reset_rec_usec=%llu\n", settings->spi_cs_delay, settings->reset_a2r_usec,