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
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From df7444fdd808111f7df507b00d357b44d3259376 Mon Sep 17 00:00:00 2001
|
|
From: Axel Lin <axel.lin@ingics.com>
|
|
Date: Sun, 23 Feb 2014 13:27:16 +0800
|
|
Subject: [PATCH 069/182] spi: qup: Fix build error due to a typo
|
|
|
|
Fix below build error when CONFIG_PM_RUNTIME=y:
|
|
|
|
C [M] drivers/spi/spi-qup.o
|
|
drivers/spi/spi-qup.c: In function 'spi_qup_pm_suspend_runtime':
|
|
drivers/spi/spi-qup.c:712:12: error: 'QUP_CLOCK_AUTO_GATE' undeclared (first use in this function)
|
|
drivers/spi/spi-qup.c:712:12: note: each undeclared identifier is reported only once for each function it appears in
|
|
drivers/spi/spi-qup.c: In function 'spi_qup_pm_resume_runtime':
|
|
drivers/spi/spi-qup.c:725:13: error: 'QUP_CLOCK_AUTO_GATE' undeclared (first use in this function)
|
|
make[2]: *** [drivers/spi/spi-qup.o] Error 1
|
|
make[1]: *** [drivers/spi] Error 2
|
|
make: *** [drivers] Error 2
|
|
|
|
Signed-off-by: Axel Lin <axel.lin@ingics.com>
|
|
Signed-off-by: Mark Brown <broonie@linaro.org>
|
|
---
|
|
drivers/spi/spi-qup.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
|
|
index dec339d..886edb4 100644
|
|
--- a/drivers/spi/spi-qup.c
|
|
+++ b/drivers/spi/spi-qup.c
|
|
@@ -709,7 +709,7 @@ static int spi_qup_pm_suspend_runtime(struct device *device)
|
|
|
|
/* Enable clocks auto gaiting */
|
|
config = readl(controller->base + QUP_CONFIG);
|
|
- config |= QUP_CLOCK_AUTO_GATE;
|
|
+ config |= QUP_CONFIG_CLOCK_AUTO_GATE;
|
|
writel_relaxed(config, controller->base + QUP_CONFIG);
|
|
return 0;
|
|
}
|
|
@@ -722,7 +722,7 @@ static int spi_qup_pm_resume_runtime(struct device *device)
|
|
|
|
/* Disable clocks auto gaiting */
|
|
config = readl_relaxed(controller->base + QUP_CONFIG);
|
|
- config &= ~QUP_CLOCK_AUTO_GATE;
|
|
+ config &= ~QUP_CONFIG_CLOCK_AUTO_GATE;
|
|
writel_relaxed(config, controller->base + QUP_CONFIG);
|
|
return 0;
|
|
}
|
|
--
|
|
1.7.10.4
|
|
|