A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 04:12:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "spi: spi-msm-geni: Propagate change form 4.14 to 5.4"

Browse source
This commit is contained in:
qctecmdr 2020-08-12 08:32:00 -07:00 • committed by Gerrit - the friendly Code Review server
commit b490abfe54
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/spi/spi-msm-geni.c
View file

@ -1069,11 +1069,17 @@ static int spi_geni_mas_setup(struct spi_master *spi)
/* Transmit an entire FIFO worth of data per IRQ */
mas->tx_wm = 1;
mas->tx = dma_request_slave_channel(mas->dev, "tx");
if (IS_ERR_OR_NULL(mas->tx)) {
dev_info(mas->dev, "Failed to get tx DMA ch %ld\n",
mas->gsi_mode =
(geni_read_reg(mas->base, GENI_IF_FIFO_DISABLE_RO) &
FIFO_IF_DISABLE);
if (mas->gsi_mode) {
mas->tx = dma_request_slave_channel(mas->dev, "tx");
if (IS_ERR_OR_NULL(mas->tx)) {
dev_info(mas->dev, "Failed to get tx DMA ch %ld\n",
PTR_ERR(mas->tx));
} else {
goto setup_ipc;
}
mas->rx = dma_request_slave_channel(mas->dev, "rx");
if (IS_ERR_OR_NULL(mas->rx)) {
dev_info(mas->dev, "Failed to get rx DMA ch %ld\n",
@ -1152,9 +1158,6 @@ setup_ipc:
if (mas->set_miso_sampling)
spi_geni_set_sampling_rate(mas, major, minor);
mas->gsi_mode =
(geni_read_reg(mas->base, GENI_IF_FIFO_DISABLE_RO) &
FIFO_IF_DISABLE);
if (mas->dis_autosuspend)
GENI_SE_DBG(mas->ipc, false, mas->dev,
"Auto Suspend is disabled\n");