Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'spi-fix-v6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A few standard fixes here, plus one more interesting one from Hans
which addresses an issue where a move in when we requested GPIOs on
ACPI systems caused us to stop doing pinmuxing and leave things
floating that we'd really rather not have floating"
* tag 'spi-fix-v6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: Add TODO comment about ACPI GPIO setup
spi: xilinx: increase number of retries before declaring stall
spi: imx: keep dma request disabled before dma transfer setup
spi: Try to get ACPI GPIO IRQ earlier
+24
-5
+11
-4
drivers/spi/spi-imx.c
+11
-4
drivers/spi/spi-imx.c
···
519
519
{
520
520
u32 reg;
521
521
522
-
reg = readl(spi_imx->base + MX51_ECSPI_CTRL);
523
-
reg |= MX51_ECSPI_CTRL_XCH;
524
-
writel(reg, spi_imx->base + MX51_ECSPI_CTRL);
522
+
if (spi_imx->usedma) {
523
+
reg = readl(spi_imx->base + MX51_ECSPI_DMA);
524
+
reg |= MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN;
525
+
writel(reg, spi_imx->base + MX51_ECSPI_DMA);
526
+
} else {
527
+
reg = readl(spi_imx->base + MX51_ECSPI_CTRL);
528
+
reg |= MX51_ECSPI_CTRL_XCH;
529
+
writel(reg, spi_imx->base + MX51_ECSPI_CTRL);
530
+
}
525
531
}
526
532
527
533
static void mx51_ecspi_disable(struct spi_imx_data *spi_imx)
···
765
759
writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) |
766
760
MX51_ECSPI_DMA_TX_WML(tx_wml) |
767
761
MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) |
768
-
MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN |
769
762
MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA);
770
763
}
771
764
···
1524
1519
dmaengine_submit(desc_tx);
1525
1520
reinit_completion(&spi_imx->dma_tx_completion);
1526
1521
dma_async_issue_pending(controller->dma_tx);
1522
+
1523
+
spi_imx->devtype_data->trigger(spi_imx);
1527
1524
1528
1525
transfer_timeout = spi_imx_calculate_timeout(spi_imx, transfer->len);
1529
1526
+1
-1
drivers/spi/spi-xilinx.c
+1
-1
drivers/spi/spi-xilinx.c
+12
drivers/spi/spi.c
+12
drivers/spi/spi.c
···
2851
2851
acpi_set_modalias(adev, acpi_device_hid(adev), spi->modalias,
2852
2852
sizeof(spi->modalias));
2853
2853
2854
+
/*
2855
+
* This gets re-tried in spi_probe() for -EPROBE_DEFER handling in case
2856
+
* the GPIO controller does not have a driver yet. This needs to be done
2857
+
* here too, because this call sets the GPIO direction and/or bias.
2858
+
* Setting these needs to be done even if there is no driver, in which
2859
+
* case spi_probe() will never get called.
2860
+
* TODO: ideally the setup of the GPIO should be handled in a generic
2861
+
* manner in the ACPI/gpiolib core code.
2862
+
*/
2863
+
if (spi->irq < 0)
2864
+
spi->irq = acpi_dev_gpio_irq_get(adev, 0);
2865
+
2854
2866
acpi_device_set_enumerated(adev);
2855
2867
2856
2868
adev->power.flags.ignore_parent = true;