mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
85cef1cf22
Manually rebased
bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
Replaced with patch from Raspberry Pi kernel 5.10 patches
mvebu/patches-5.4/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch
Applied upstream
All others updated automatically.
Compile-tested on: ath79/generic, lantiq/xrx200, brcm27xx
Runtime-tested on: ath79/generic, lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From ac94635b678715af00a685ada0a1b60dfb54c771 Mon Sep 17 00:00:00 2001
|
|
From: Martin Sperl <kernel@martin.sperl.org>
|
|
Date: Mon, 13 May 2019 11:05:27 +0000
|
|
Subject: [PATCH] spi: bcm2835: enable shared interrupt support
|
|
|
|
Add shared interrupt support for this driver.
|
|
|
|
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
|
---
|
|
drivers/spi/spi-bcm2835.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/spi/spi-bcm2835.c
|
|
+++ b/drivers/spi/spi-bcm2835.c
|
|
@@ -379,6 +379,10 @@ static irqreturn_t bcm2835_spi_interrupt
|
|
if (bs->tx_len && cs & BCM2835_SPI_CS_DONE)
|
|
bcm2835_wr_fifo_blind(bs, BCM2835_SPI_FIFO_SIZE);
|
|
|
|
+ /* check if we got interrupt enabled */
|
|
+ if (!(bcm2835_rd(bs, BCM2835_SPI_CS) & BCM2835_SPI_CS_INTR))
|
|
+ return IRQ_NONE;
|
|
+
|
|
/* Read as many bytes as possible from FIFO */
|
|
bcm2835_rd_fifo(bs);
|
|
/* Write as many bytes as possible to FIFO */
|
|
@@ -1287,7 +1291,8 @@ static int bcm2835_spi_probe(struct plat
|
|
bcm2835_wr(bs, BCM2835_SPI_CS,
|
|
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
|
|
|
|
- err = devm_request_irq(&pdev->dev, bs->irq, bcm2835_spi_interrupt, 0,
|
|
+ err = devm_request_irq(&pdev->dev, bs->irq, bcm2835_spi_interrupt,
|
|
+ IRQF_SHARED,
|
|
dev_name(&pdev->dev), ctlr);
|
|
if (err) {
|
|
dev_err(&pdev->dev, "could not request IRQ: %d\n", err);
|