From 4b687170846639eb8d79866e1c09462278c9784a Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Fri, 14 Feb 2014 07:14:56 +0900 Subject: ARM: SAMSUNG: remove obsolete tick.h Commit 48cf83dc(ARM: samsung: remove unused tick.h) removed some occurences of tick.h. tick.h itself and s3c24xx_ostimer_pending was only used by the old timer driver and is not used anymore. Therefore remove the last 3 occurences. Signed-off-by: Heiko Stuebner Reviewed-by: Tomasz Figa Signed-off-by: Kukjin Kim --- arch/arm/mach-s5pc100/include/mach/tick.h | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 arch/arm/mach-s5pc100/include/mach/tick.h (limited to 'arch/arm/mach-s5pc100/include') diff --git a/arch/arm/mach-s5pc100/include/mach/tick.h b/arch/arm/mach-s5pc100/include/mach/tick.h deleted file mode 100644 index 0af8e41230ed..000000000000 --- a/arch/arm/mach-s5pc100/include/mach/tick.h +++ /dev/null @@ -1,31 +0,0 @@ -/* linux/arch/arm/mach-s5pc100/include/mach/tick.h - * - * Copyright 2009 Samsung Electronics Co. - * Byungho Min - * - * S3C64XX - Timer tick support definitions - * - * Based on mach-s3c6400/include/mach/tick.h - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_TICK_H -#define __ASM_ARCH_TICK_H __FILE__ - -#include - -/* note, the timer interrutps turn up in 2 places, the vic and then - * the timer block. We take the VIC as the base at the moment. - */ -static inline u32 s3c24xx_ostimer_pending(void) -{ - u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS); - return pend & (1 << (IRQ_TIMER4_VIC - S5P_IRQ_VIC0(0))); -} - -#define TICK_MAX (0xffffffff) - -#endif /* __ASM_ARCH_TICK_H */ -- cgit v1.2.1 From 334a1c70bb03d7077849e88d8571a32d1d36194d Mon Sep 17 00:00:00 2001 From: Tushar Behera Date: Fri, 14 Feb 2014 10:32:45 +0900 Subject: ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file regs-serial.h only includes linux/serial_s3c.h. Include this header directly to remove unnecessary platform dependency. Signed-off-by: Tushar Behera [broonie@linaro.org: Acked for S3C64XX related changes] Acked-by: Mark Brown Signed-off-by: Kukjin Kim --- arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-s5pc100/include') diff --git a/arch/arm/mach-s5pc100/include/mach/debug-macro.S b/arch/arm/mach-s5pc100/include/mach/debug-macro.S index 66cb7f16bf2a..22c23859e45e 100644 --- a/arch/arm/mach-s5pc100/include/mach/debug-macro.S +++ b/arch/arm/mach-s5pc100/include/mach/debug-macro.S @@ -13,8 +13,8 @@ /* pull in the relevant register and map files. */ +#include #include -#include /* note, for the boot process to work we have to keep the UART * virtual address aligned to an 1MiB boundary for the L1 -- cgit v1.2.1