kernel: update 3.14 to 3.14.18
[openwrt.git] / target / linux / ipq806x / patches / 0069-spi-qup-Fix-build-error-due-to-a-typo.patch
1 From df7444fdd808111f7df507b00d357b44d3259376 Mon Sep 17 00:00:00 2001
2 From: Axel Lin <axel.lin@ingics.com>
3 Date: Sun, 23 Feb 2014 13:27:16 +0800
4 Subject: [PATCH 069/182] spi: qup: Fix build error due to a typo
5
6 Fix below build error when CONFIG_PM_RUNTIME=y:
7
8 C [M]  drivers/spi/spi-qup.o
9 drivers/spi/spi-qup.c: In function 'spi_qup_pm_suspend_runtime':
10 drivers/spi/spi-qup.c:712:12: error: 'QUP_CLOCK_AUTO_GATE' undeclared (first use in this function)
11 drivers/spi/spi-qup.c:712:12: note: each undeclared identifier is reported only once for each function it appears in
12 drivers/spi/spi-qup.c: In function 'spi_qup_pm_resume_runtime':
13 drivers/spi/spi-qup.c:725:13: error: 'QUP_CLOCK_AUTO_GATE' undeclared (first use in this function)
14 make[2]: *** [drivers/spi/spi-qup.o] Error 1
15 make[1]: *** [drivers/spi] Error 2
16 make: *** [drivers] Error 2
17
18 Signed-off-by: Axel Lin <axel.lin@ingics.com>
19 Signed-off-by: Mark Brown <broonie@linaro.org>
20 ---
21  drivers/spi/spi-qup.c |    4 ++--
22  1 file changed, 2 insertions(+), 2 deletions(-)
23
24 --- a/drivers/spi/spi-qup.c
25 +++ b/drivers/spi/spi-qup.c
26 @@ -709,7 +709,7 @@ static int spi_qup_pm_suspend_runtime(st
27  
28         /* Enable clocks auto gaiting */
29         config = readl(controller->base + QUP_CONFIG);
30 -       config |= QUP_CLOCK_AUTO_GATE;
31 +       config |= QUP_CONFIG_CLOCK_AUTO_GATE;
32         writel_relaxed(config, controller->base + QUP_CONFIG);
33         return 0;
34  }
35 @@ -722,7 +722,7 @@ static int spi_qup_pm_resume_runtime(str
36  
37         /* Disable clocks auto gaiting */
38         config = readl_relaxed(controller->base + QUP_CONFIG);
39 -       config &= ~QUP_CLOCK_AUTO_GATE;
40 +       config &= ~QUP_CONFIG_CLOCK_AUTO_GATE;
41         writel_relaxed(config, controller->base + QUP_CONFIG);
42         return 0;
43  }