3c1f6e358d
Patches are generated using the "format-patch" command from the following location: *https://www.codeaurora.org/cgit/quic/kernel/galak-msm/log/?h=apq_ipq_base *rev=0771849495b4128cac2faf7d49c85c729fc48b20 Patches numbered 76/77/102/103 have already been integrated in 3.14.12, so they're not in this list. All these patches are either integrated are pending integration into kernel.org, therefore these patches should go away once the kernel gets upgraded to 3.16. Support is currently limited to AP148 board but can be extended to other platforms in the future. These changes do not cover ethernet connectivity. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 42334
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
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(-)
|
|
|
|
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
|
|
index dc128ac..a404298 100644
|
|
--- a/drivers/spi/spi-qup.c
|
|
+++ b/drivers/spi/spi-qup.c
|
|
@@ -619,16 +619,19 @@ static int spi_qup_probe(struct platform_device *pdev)
|
|
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);
|
|
--
|
|
1.7.10.4
|
|
|