aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-02-11 10:09:23 +0000
committerJohn Crispin <blogic@openwrt.org>2015-02-11 10:09:23 +0000
commit74dc0649ff0097f75faa26f4b85e61e334b458a4 (patch)
tree7816568a18d29fffe8df1bf103d8c47aa2e225a0 /target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch
parent32c88d568cd4e7fc2ec035dff1ae51d3740cabf7 (diff)
downloadupstream-74dc0649ff0097f75faa26f4b85e61e334b458a4.tar.gz
upstream-74dc0649ff0097f75faa26f4b85e61e334b458a4.tar.bz2
upstream-74dc0649ff0097f75faa26f4b85e61e334b458a4.zip
ipq806x: update target to v3.18
Patches in the ipq806x/patches folder were out of tree in v3.14. The newest patch at the time was from June, so we can safely assume that either the patches have been merged, or they have been rejected for a good reason. If patches are seen missing, we'll cherry-pick them on a per-needed basis. This new kernel have been tested on AP148, which seems to works fine. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44386 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch')
-rw-r--r--target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch b/target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch
deleted file mode 100644
index 93afe28f15..0000000000
--- a/target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a7357be131e30fd1fb987b2cb343bc81db487f96 Mon Sep 17 00:00:00 2001
-From: Andy Gross <agross@codeaurora.org>
-Date: Thu, 12 Jun 2014 14:34:11 -0500
-Subject: [PATCH 134/182] spi: qup: Fix order of spi_register_master
-
-This patch moves the devm_spi_register_master below the initialization of the
-runtime_pm. If done in the wrong order, the spi_register_master fails if any
-probed slave devices issue SPI transactions.
-
-Signed-off-by: Andy Gross <agross@codeaurora.org>
-Acked-by: Ivan T. Ivanov <iivanov@mm-sol.com>
----
- drivers/spi/spi-qup.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/drivers/spi/spi-qup.c
-+++ b/drivers/spi/spi-qup.c
-@@ -619,16 +619,19 @@ static int spi_qup_probe(struct platform
- if (ret)
- goto error;
-
-- ret = devm_spi_register_master(dev, master);
-- if (ret)
-- goto error;
--
- pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC);
- pm_runtime_use_autosuspend(dev);
- pm_runtime_set_active(dev);
- pm_runtime_enable(dev);
-+
-+ ret = devm_spi_register_master(dev, master);
-+ if (ret)
-+ goto disable_pm;
-+
- return 0;
-
-+disable_pm:
-+ pm_runtime_disable(&pdev->dev);
- error:
- clk_disable_unprepare(cclk);
- clk_disable_unprepare(iclk);