mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-18 05:15:28 +08:00
12d0742fd5
* kernel: bump 5.4 to 5.4.60
Deleted upstream patches:
generic:
041-genirq-affinity-Make-affinity-setting-if-activated-o.patch
ipq806x:
093-5-v5.8-ipq806x-PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-SoC.patch
093-6-v5.8-ipq806x-PCI-qcom-Add-support-for-tx-term-offset-for-rev-2_1_0.patch
Merged manually:
ipq806x:
093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch
layerscape:
804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
Build-tested: ath79/generic, ipq806x, layerscape/armv7, layerscape/armv8_64b
Run-tested: ipq806x (R7800)
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* kernel: Update kernel 4.14 to version 4.14.195
Compile and runtime tested on lantiq/xrx200 and x86/64.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Co-authored-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de>
21 lines
668 B
Diff
21 lines
668 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: spi: use gpio_set_value_cansleep for setting chipselect GPIO
|
|
|
|
Sleeping is safe inside spi_transfer_one_message, and some GPIO chips
|
|
need to sleep for setting values
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/spi/spi.c
|
|
+++ b/drivers/spi/spi.c
|
|
@@ -741,7 +741,7 @@ static void spi_set_cs(struct spi_device
|
|
enable = !enable;
|
|
|
|
if (gpio_is_valid(spi->cs_gpio)) {
|
|
- gpio_set_value(spi->cs_gpio, !enable);
|
|
+ gpio_set_value_cansleep(spi->cs_gpio, !enable);
|
|
/* Some SPI masters need both GPIO CS & slave_select */
|
|
if ((spi->controller->flags & SPI_MASTER_GPIO_SS) &&
|
|
spi->controller->set_cs)
|