diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-11-27 16:18:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-27 16:18:32 +0000 |
| commit | db4a831997047809229152261a462c17cb857c84 (patch) | |
| tree | 526f910ce982f78d44305081545a66d8f5de5887 /drivers/spi/spi-dw-core.c | |
| parent | spi: dw: fixed missing resource_size (diff) | |
| parent | spi: dw-bt1: Fix undefined devm_mux_control_get symbol (diff) | |
| download | linux-dev-db4a831997047809229152261a462c17cb857c84.tar.xz linux-dev-db4a831997047809229152261a462c17cb857c84.zip | |
Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.11
Diffstat (limited to 'drivers/spi/spi-dw-core.c')
| -rw-r--r-- | drivers/spi/spi-dw-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c index 2e50cc0a9291..c33866f747db 100644 --- a/drivers/spi/spi-dw-core.c +++ b/drivers/spi/spi-dw-core.c @@ -357,11 +357,11 @@ static void dw_spi_irq_setup(struct dw_spi *dws) dw_writel(dws, DW_SPI_TXFTLR, level); dw_writel(dws, DW_SPI_RXFTLR, level - 1); + dws->transfer_handler = dw_spi_transfer_handler; + imask = SPI_INT_TXEI | SPI_INT_TXOI | SPI_INT_RXUI | SPI_INT_RXOI | SPI_INT_RXFI; spi_umask_intr(dws, imask); - - dws->transfer_handler = dw_spi_transfer_handler; } /* @@ -875,7 +875,8 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) master->set_cs = dw_spi_set_cs; master->transfer_one = dw_spi_transfer_one; master->handle_err = dw_spi_handle_err; - master->mem_ops = &dws->mem_ops; + if (dws->mem_ops.exec_op) + master->mem_ops = &dws->mem_ops; master->max_speed_hz = dws->max_freq; master->dev.of_node = dev->of_node; master->dev.fwnode = dev->fwnode; |