diff options
| author | Mark Brown <broonie@kernel.org> | 2022-11-25 22:16:05 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-11-25 22:16:05 +0300 |
| commit | 5cd4d3886780bf9a846eada29a2aefe8bfcac027 (patch) | |
| tree | ea5cc9b11657912a1371932ad467a7a622e8010c /drivers/spi/spi-aspeed-smc.c | |
| parent | ef3232e3dbd172fa17190fa8a852a3180a73bbdc (diff) | |
| parent | f0c4d9fc9cc9462659728d168387191387e903cc (diff) | |
| download | linux-5cd4d3886780bf9a846eada29a2aefe8bfcac027.tar.xz | |
Merge tag 'v6.1-rc4' into spi-6.2
Linux 6.1-rc4 which should get my CI working on RPi3s again.
Diffstat (limited to 'drivers/spi/spi-aspeed-smc.c')
| -rw-r--r-- | drivers/spi/spi-aspeed-smc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index 710ff8cf121f..873ff2cf72c9 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -398,7 +398,7 @@ static void aspeed_spi_get_windows(struct aspeed_spi *aspi, windows[cs].cs = cs; windows[cs].size = data->segment_end(aspi, reg_val) - data->segment_start(aspi, reg_val); - windows[cs].offset = cs ? windows[cs - 1].offset + windows[cs - 1].size : 0; + windows[cs].offset = data->segment_start(aspi, reg_val) - aspi->ahb_base_phy; dev_vdbg(aspi->dev, "CE%d offset=0x%.8x size=0x%x\n", cs, windows[cs].offset, windows[cs].size); } |