diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-23 23:33:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-23 23:33:41 +0100 |
| commit | 0b201982fe1735dd41b35bc0a18d57a382b7da59 (patch) | |
| tree | 4208700b345863bbfdea87f64c37efb7d8a7b46f /drivers/spi | |
| parent | a90a987ebe008c941338285764e5afc0d663f54d (diff) | |
| parent | 6eaae198076080886b9e7d57f4ae06fa782f90ef (diff) | |
| download | lwn-0b201982fe1735dd41b35bc0a18d57a382b7da59.tar.gz lwn-0b201982fe1735dd41b35bc0a18d57a382b7da59.zip | |
spi: Merge up fixes from mainline
There's several things here that will really help my CI.
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-bcm63xx.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 9aecb77c3d89..07b5b71b2352 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -126,7 +126,7 @@ enum bcm63xx_regs_spi { SPI_MSG_DATA_SIZE, }; -#define BCM63XX_SPI_MAX_PREPEND 15 +#define BCM63XX_SPI_MAX_PREPEND 7 #define BCM63XX_SPI_MAX_CS 8 #define BCM63XX_SPI_BUS_NUM 0 diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 889e48423c97..a1b68fdc205d 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -683,6 +683,8 @@ static int s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) if ((sdd->cur_mode & SPI_LOOP) && sdd->port_conf->has_loopback) val |= S3C64XX_SPI_MODE_SELF_LOOPBACK; + else + val &= ~S3C64XX_SPI_MODE_SELF_LOOPBACK; writel(val, regs + S3C64XX_SPI_MODE_CFG); |