summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-05-05 12:48:25 +0200
committerMark Brown <broonie@kernel.org>2020-05-05 12:48:25 +0200
commitf13242d2c5f773428da95f9aa1231f3b2cc64ea4 (patch)
treebf1831560fef8ac8a49c90c56921fcbbd411a9e0 /drivers/spi/spi.c
parentspi: atmel: Add missing annotation for atmel_spi_next_xfer_dma_submit() (diff)
parentspi: bcm-qspi: Handle clock probe deferral (diff)
downloadlinux-f13242d2c5f773428da95f9aa1231f3b2cc64ea4.tar.xz
linux-f13242d2c5f773428da95f9aa1231f3b2cc64ea4.zip
Merge branch 'for-5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.8
Diffstat (limited to 'drivers/spi/spi.c')
-rw-r--r--drivers/spi/spi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 5446b07dcd3a..c083ee3995e4 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -2111,6 +2111,7 @@ static int acpi_spi_add_resource(struct acpi_resource *ares, void *data)
}
lookup->max_speed_hz = sb->connection_speed;
+ lookup->bits_per_word = sb->data_bit_length;
if (sb->clock_phase == ACPI_SPI_SECOND_PHASE)
lookup->mode |= SPI_CPHA;