summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/include/mach
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-02-27 05:50:23 +0900
committerKukjin Kim <kgene@kernel.org>2015-02-27 05:50:23 +0900
commit1fe054e71a895c682f1cd36071ff3fd0c7bc9cff (patch)
tree13716a35f470eb23ea340e6dd9ae135b2c20f0d0 /arch/arm/mach-s3c24xx/include/mach
parent4f506daf0e6c094d2f28253d4044e9adc9461142 (diff)
downloadblackbird-op-linux-1fe054e71a895c682f1cd36071ff3fd0c7bc9cff.tar.gz
blackbird-op-linux-1fe054e71a895c682f1cd36071ff3fd0c7bc9cff.zip
ARM: S3C24XX: fix header file inclusions
The pm-core.h file does not include all the necessary headers, and has a static declaration for a function that is not defined in the same file, causing SAMSUNG_PM_DEBUG to break on s3c24xx: arch/arm/mach-s3c24xx/include/mach/pm-core.h:50:91: warning: 's3c_pm_show_resume_irqs' used but never defined arch/arm/mach-s3c24xx/include/mach/pm-core.h: In function 's3c_pm_debug_init_uart': arch/arm/mach-s3c24xx/include/mach/pm-core.h:16:34: error: 'S3C2410_CLKCON' undeclared (first use in this function) unsigned long tmp = __raw_readl(S3C2410_CLKCON); ^ This moves the code around slightly to avoid the errors. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene@kernel.org>
Diffstat (limited to 'arch/arm/mach-s3c24xx/include/mach')
-rw-r--r--arch/arm/mach-s3c24xx/include/mach/pm-core.h24
1 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/pm-core.h b/arch/arm/mach-s3c24xx/include/mach/pm-core.h
index 2eef7e6f7675..69459dbbdcad 100644
--- a/arch/arm/mach-s3c24xx/include/mach/pm-core.h
+++ b/arch/arm/mach-s3c24xx/include/mach/pm-core.h
@@ -10,6 +10,11 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <linux/delay.h>
+#include <linux/io.h>
+
+#include "regs-clock.h"
+#include "regs-irq.h"
static inline void s3c_pm_debug_init_uart(void)
{
@@ -42,8 +47,23 @@ static inline void s3c_pm_arch_stop_clocks(void)
__raw_writel(0x00, S3C2410_CLKCON); /* turn off clocks over sleep */
}
-static void s3c_pm_show_resume_irqs(int start, unsigned long which,
- unsigned long mask);
+/* s3c2410_pm_show_resume_irqs
+ *
+ * print any IRQs asserted at resume time (ie, we woke from)
+*/
+static inline void s3c_pm_show_resume_irqs(int start, unsigned long which,
+ unsigned long mask)
+{
+ int i;
+
+ which &= ~mask;
+
+ for (i = 0; i <= 31; i++) {
+ if (which & (1L<<i)) {
+ S3C_PMDBG("IRQ %d asserted at resume\n", start+i);
+ }
+ }
+}
static inline void s3c_pm_arch_show_resume_irqs(void)
{
OpenPOWER on IntegriCloud