aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-04-14 19:52:36 +0200
committerFelix Fietkau <nbd@nbd.name>2018-04-14 20:12:32 +0200
commit31a6ee021948a88b9b1e484b412be21f7169184e (patch)
tree85c46acd2d8f8eff459f304832bb70f956955f76
parentceff5d8c82df077cd01b5aaf2db45f7b9f9c918d (diff)
downloadupstream-31a6ee021948a88b9b1e484b412be21f7169184e.tar.gz
upstream-31a6ee021948a88b9b1e484b412be21f7169184e.tar.bz2
upstream-31a6ee021948a88b9b1e484b412be21f7169184e.zip
ramips: remove broken and bogus spinlock in the SPI driver
Based on patch by Neil Brown Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch5
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch b/target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch
index 5f939e3e40..c615601e55 100644
--- a/target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch
+++ b/target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch
@@ -38,7 +38,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
obj-$(CONFIG_SPI_OC_TINY) += spi-oc-tiny.o
--- /dev/null
+++ b/drivers/spi/spi-mt7621.c
-@@ -0,0 +1,491 @@
+@@ -0,0 +1,488 @@
+/*
+ * spi-mt7621.c -- MediaTek MT7621 SPI controller driver
+ *
@@ -106,7 +106,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ unsigned int sys_freq;
+ unsigned int speed;
+ struct clk *clk;
-+ spinlock_t lock;
+
+ struct mt7621_spi_ops *ops;
+};
@@ -438,7 +437,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ const struct of_device_id *match;
+ struct spi_master *master;
+ struct mt7621_spi *rs;
-+ unsigned long flags;
+ void __iomem *base;
+ struct resource *r;
+ int status = 0;
@@ -490,7 +488,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ rs->sys_freq = clk_get_rate(rs->clk);
+ rs->ops = ops;
+ dev_info(&pdev->dev, "sys_freq: %u\n", rs->sys_freq);
-+ spin_lock_irqsave(&rs->lock, flags);
+
+ device_reset(&pdev->dev);
+