| Message ID | 1357235668-9450-16-git-send-email-robherring2@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thursday 03 January 2013, Rob Herring wrote: > From: Rob Herring <rob.herring@calxeda.com> > > Remove tick.h on s5p64x0 and s5pv210 as they are unused. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > Cc: Ben Dooks <ben-linux@fluff.org> > Cc: Kukjin Kim <kgene.kim@samsung.com> > Cc: linux-samsung-soc@vger.kernel.org > --- > arch/arm/mach-s5pv210/include/mach/tick.h | 26 -------------------------- > arch/arm/plat-samsung/s5p-irq-eint.c | 1 + > 2 files changed, 1 insertion(+), 26 deletions(-) > delete mode 100644 arch/arm/mach-s5pv210/include/mach/tick.h The second half of the patch does not relate to the description, and the first half looks correct but out of place here. Did you accidentally fold another patch into the one you wanted, or am I just misreading the intention of the patch? Arnd
On 01/03/2013 03:51 PM, Arnd Bergmann wrote: > On Thursday 03 January 2013, Rob Herring wrote: >> From: Rob Herring <rob.herring@calxeda.com> >> >> Remove tick.h on s5p64x0 and s5pv210 as they are unused. >> >> Signed-off-by: Rob Herring <rob.herring@calxeda.com> >> Cc: Ben Dooks <ben-linux@fluff.org> >> Cc: Kukjin Kim <kgene.kim@samsung.com> >> Cc: linux-samsung-soc@vger.kernel.org >> --- >> arch/arm/mach-s5pv210/include/mach/tick.h | 26 -------------------------- >> arch/arm/plat-samsung/s5p-irq-eint.c | 1 + >> 2 files changed, 1 insertion(+), 26 deletions(-) >> delete mode 100644 arch/arm/mach-s5pv210/include/mach/tick.h > > The second half of the patch does not relate to the description, > and the first half looks correct but out of place here. The first half is relevant in that it eliminates an occurrence of VIC defines, but could be applied separately. I'm not sure what happened with mach-s5p64x0/include/mach/tick.h as that should be removed too. The second half should be in patch 19. Rob > Did you accidentally fold another patch into the one you wanted, > or am I just misreading the intention of the patch? > > Arnd >
On Thursday 03 January 2013, Rob Herring wrote: > The first half is relevant in that it eliminates an occurrence of VIC > defines, but could be applied separately. I'm not sure what happened > with mach-s5p64x0/include/mach/tick.h as that should be removed too. Ok, I see. Arnd
diff --git a/arch/arm/mach-s5pv210/include/mach/tick.h b/arch/arm/mach-s5pv210/include/mach/tick.h deleted file mode 100644 index 7993b36..0000000 --- a/arch/arm/mach-s5pv210/include/mach/tick.h +++ /dev/null @@ -1,26 +0,0 @@ -/* linux/arch/arm/mach-s5pv210/include/mach/tick.h - * - * Copyright (c) 2009 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * Based on arch/arm/mach-s3c6400/include/mach/tick.h - * - * S5PV210 - Timer tick support definitions - * - * 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__ - -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 */ diff --git a/arch/arm/plat-samsung/s5p-irq-eint.c b/arch/arm/plat-samsung/s5p-irq-eint.c index 33bd3f3..974bf98 100644 --- a/arch/arm/plat-samsung/s5p-irq-eint.c +++ b/arch/arm/plat-samsung/s5p-irq-eint.c @@ -15,6 +15,7 @@ #include <linux/io.h> #include <linux/device.h> #include <linux/gpio.h> +#include <linux/irqchip/arm-vic.h> #include <asm/hardware/vic.h>