Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: rockchip: Modify the slave tx finish judgement

Browse Source 
The SR register of the old version IP SPI slave tx transmission
process will remain in a busy state, so it needs to be processed
by determining the tx empty status bits filed.

Change-Id: If71ed842e2b7aed3cfe22d7bc401ea2d0bb1409b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
This commit is contained in:
Jon Lin
2023-06-06 21:54:53 +08:00
parent 87e11c5b09
commit 737491a80c
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/spi/spi-rockchip.c
View File

@ -14,6 +14,7 @@
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h>
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@ -244,14 +245,27 @@ static inline void spi_enable_chip(struct rockchip_spi *rs, bool enable)
static inline void wait_for_tx_idle(struct rockchip_spi *rs, bool slave_mode) static inline void wait_for_tx_idle(struct rockchip_spi *rs, bool slave_mode)
{ {
unsigned long timeout = jiffies + msecs_to_jiffies(5); unsigned long timeout = jiffies + msecs_to_jiffies(5);
u32 busy = SR_BUSY; u32 bit_filed = SR_BUSY;
u32 idle_val = 0;
uint32_t speed, us;
if (slave_mode && rs->version == ROCKCHIP_SPI_VER2_TYPE2) if (slave_mode && rs->version == ROCKCHIP_SPI_VER2_TYPE2) {
busy = SR_SLAVE_TX_BUSY; bit_filed = SR_SLAVE_TX_BUSY;
idle_val = 0;
} else if (slave_mode) {
bit_filed = SR_TF_EMPTY;
idle_val = 1;
}
do { do {
if (!(readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & busy)) if ((readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & bit_filed) == idle_val) {
if (bit_filed == SR_TF_EMPTY) {
speed = rs->speed_hz;
us = (8 * 1000000 / speed) * 2;
udelay(us);
}
return; return;
}
} while (!time_after(jiffies, timeout)); } while (!time_after(jiffies, timeout));
dev_warn(rs->dev, "spi controller is in busy state!\n"); dev_warn(rs->dev, "spi controller is in busy state!\n");
@ -1148,6 +1162,11 @@ static int rockchip_spi_probe(struct platform_device *pdev)
rs->poll = device_property_read_bool(&pdev->dev, "rockchip,poll-only"); rs->poll = device_property_read_bool(&pdev->dev, "rockchip,poll-only");
init_completion(&rs->xfer_done); init_completion(&rs->xfer_done);
if (rs->poll && slave_mode) {
dev_err(rs->dev, "only support rockchip,poll-only property in master mode\n");
ret = -EINVAL;
goto err_free_dma_rx;
}
switch (rs->version) { switch (rs->version) {
case ROCKCHIP_SPI_VER2_TYPE1: case ROCKCHIP_SPI_VER2_TYPE1: