[PATCH 3/3] spi: sprd: fill offset only to RD_CMD register for reading from slave device

From: Chunyan Zhang
Date: Tue Aug 24 2021 - 03:02:36 EST


From: Chunyan Zhang <chunyan.zhang@xxxxxxxxxx>

RD_CMD can accept slave address offset only, higher bits are reserved.
Writing the whole slave address including slave base seems unnecessary.

Signed-off-by: Chunyan Zhang <chunyan.zhang@xxxxxxxxxx>
---
drivers/spi/spi-sprd-adi.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c
index 06af519c0b21..07f11b17bf20 100644
--- a/drivers/spi/spi-sprd-adi.c
+++ b/drivers/spi/spi-sprd-adi.c
@@ -159,7 +159,7 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg, u32 *read_val)
{
int read_timeout = ADI_READ_TIMEOUT;
unsigned long flags;
- u32 val, rd_addr, paddr;
+ u32 val, rd_addr;
int ret = 0;

if (sadi->hwlock) {
@@ -177,11 +177,10 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg, u32 *read_val)
goto out;

/*
- * Set the physical register address need to read into RD_CMD register,
+ * Set the slave address offset need to read into RD_CMD register,
* then ADI controller will start to transfer automatically.
*/
- paddr = sadi->slave_pbase + reg;
- writel_relaxed(paddr, sadi->base + REG_ADI_RD_CMD);
+ writel_relaxed(reg, sadi->base + REG_ADI_RD_CMD);

/*
* Wait read operation complete, the BIT_RD_CMD_BUSY will be set
@@ -211,9 +210,9 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg, u32 *read_val)
*/
rd_addr = (val & RD_ADDR_MASK) >> RD_ADDR_SHIFT;

- if (rd_addr != (paddr & REG_ADDR_LOW_MASK)) {
+ if (rd_addr != (reg & REG_ADDR_LOW_MASK)) {
dev_err(sadi->dev, "read error, reg addr = 0x%x, val = 0x%x\n",
- paddr, val);
+ reg, val);
ret = -EIO;
goto out;
}
--
2.25.1