Hello,
On Tuesday, January 12, 2010 6:21 AM Ben Dooks wrote:
> Move to using the standard VIC/Timer IRQ handling code added previously\
> to avoid duplicating code.
>
> Signed-off-by: Ben Dooks <ben-li...@fluff.org>
> ---
> arch/arm/mach-s5pc100/include/mach/tick.h | 2 +-
> arch/arm/plat-s5pc1xx/Kconfig | 2 +
> arch/arm/plat-s5pc1xx/include/plat/irqs.h | 19 ++++--
> arch/arm/plat-s5pc1xx/irq.c | 88 ++--------------------------
> 4 files changed, 23 insertions(+), 88 deletions(-)
>
> diff --git a/arch/arm/mach-s5pc100/include/mach/tick.h
> b/arch/arm/mach-s5pc100/include/mach/tick.h
> index d3de0f3..f338c9e 100644
> --- a/arch/arm/mach-s5pc100/include/mach/tick.h
> +++ b/arch/arm/mach-s5pc100/include/mach/tick.h
> @@ -21,7 +21,7 @@
> static inline u32 s3c24xx_ostimer_pending(void)
> {
> u32 pend = __raw_readl(S3C_VA_VIC0 + VIC_RAW_STATUS);
> - return pend & 1 << (IRQ_TIMER4 - S5PC1XX_IRQ_VIC0(0));
> + return pend & 1 << (IRQ_TIMER4_VIC - S5PC1XX_IRQ_VIC0(0));
> }
>
> #define TICK_MAX (0xffffffff)
> diff --git a/arch/arm/plat-s5pc1xx/Kconfig b/arch/arm/plat-s5pc1xx/Kconfig
> index 5d97b1c..6438bcd 100644
> --- a/arch/arm/plat-s5pc1xx/Kconfig
> +++ b/arch/arm/plat-s5pc1xx/Kconfig
> @@ -12,11 +12,13 @@ config PLAT_S5PC1XX
> select NO_IOPORT
> select ARCH_REQUIRE_GPIOLIB
> select SAMSUNG_CLKSRC
> + select SAMSUNG_IRQ_VIC_TIMER
> select S3C_GPIO_TRACK
> select S3C_GPIO_PULL_UPDOWN
> select S3C_GPIO_CFG_S3C24XX
> select S3C_GPIO_CFG_S3C64XX
> select S5P_GPIO_CFG_S5PC1XX
> + select SAMSUNG_IRQ_VIC_TIMER
> help
> Base platform code for any Samsung S5PC1XX device
Double entry (probably a consequence of automatic merge or so).
> ...
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
