mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

spi: sprd: fill offset only to RD_CMD register for reading from slave device

Browse source 
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@unisoc.com>
Link: https://lore.kernel.org/r/20210824070212.2089255-3-zhang.lyra@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Chunyan Zhang 2021-08-24 15:02:12 +08:00 committed by Mark Brown
parent 2b961c51f4
commit f674aacd50
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/spi/spi-sprd-adi.c
View file

@ -159,7 +159,7 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg, u32 *read_val)
{ {
int read_timeout = ADI_READ_TIMEOUT; int read_timeout = ADI_READ_TIMEOUT;
unsigned long flags; unsigned long flags;
u32 val, rd_addr, paddr; u32 val, rd_addr;
int ret = 0; int ret = 0;
if (sadi->hwlock) { if (sadi->hwlock) {
@ -177,11 +177,10 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg, u32 *read_val)
goto out; 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. * then ADI controller will start to transfer automatically.
*/ */
paddr = sadi->slave_pbase + reg; writel_relaxed(reg, sadi->base + REG_ADI_RD_CMD);
writel_relaxed(paddr, sadi->base + REG_ADI_RD_CMD);
/* /*
* Wait read operation complete, the BIT_RD_CMD_BUSY will be set * 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; 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", dev_err(sadi->dev, "read error, reg addr = 0x%x, val = 0x%x\n",
paddr, val); reg, val);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }