Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47101ec7 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S5PC1XX: Move to using standard timer IRQ handling code 



Move to using the standard VIC/Timer IRQ handling code added previously
to avoid duplicating code.

Thanks to Marek Szyprowski for pointing out dual Kconfig change.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 35accd2f

arch/arm/mach-s5pc100/include/mach/tick.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
static inline u32 s3c24xx_ostimer_pending(void)

static inline u32 s3c24xx_ostimer_pending(void)

{

{

	u32 pend = __raw_readl(S3C_VA_VIC0 + VIC_RAW_STATUS);

	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)

#define TICK_MAX	(0xffffffff)

arch/arm/plat-s5pc1xx/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ config PLAT_S5PC1XX 
	select NO_IOPORT

	select NO_IOPORT

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select SAMSUNG_CLKSRC

	select SAMSUNG_CLKSRC

	select SAMSUNG_IRQ_VIC_TIMER

	select S3C_GPIO_TRACK

	select S3C_GPIO_TRACK

	select S3C_GPIO_PULL_UPDOWN

	select S3C_GPIO_PULL_UPDOWN

	select S3C_GPIO_CFG_S3C24XX

	select S3C_GPIO_CFG_S3C24XX

arch/arm/plat-s5pc1xx/include/plat/irqs.h

+13 −6
Original line number Original line Diff line number Diff line
@@ -88,11 +88,11 @@ 
#define IRQ_MDMA		S5PC1XX_IRQ_VIC0(18)

#define IRQ_MDMA		S5PC1XX_IRQ_VIC0(18)

#define IRQ_PDMA0		S5PC1XX_IRQ_VIC0(19)

#define IRQ_PDMA0		S5PC1XX_IRQ_VIC0(19)

#define IRQ_PDMA1		S5PC1XX_IRQ_VIC0(20)

#define IRQ_PDMA1		S5PC1XX_IRQ_VIC0(20)

#define IRQ_TIMER0		S5PC1XX_IRQ_VIC0(21)

#define IRQ_TIMER0_VIC		S5PC1XX_IRQ_VIC0(21)

#define IRQ_TIMER1		S5PC1XX_IRQ_VIC0(22)

#define IRQ_TIMER1_VIC		S5PC1XX_IRQ_VIC0(22)

#define IRQ_TIMER2		S5PC1XX_IRQ_VIC0(23)

#define IRQ_TIMER2_VIC		S5PC1XX_IRQ_VIC0(23)

#define IRQ_TIMER3		S5PC1XX_IRQ_VIC0(24)

#define IRQ_TIMER3_VIC		S5PC1XX_IRQ_VIC0(24)

#define IRQ_TIMER4		S5PC1XX_IRQ_VIC0(25)

#define IRQ_TIMER4_VIC		S5PC1XX_IRQ_VIC0(25)

#define IRQ_SYSTIMER		S5PC1XX_IRQ_VIC0(26)

#define IRQ_SYSTIMER		S5PC1XX_IRQ_VIC0(26)

#define IRQ_WDT			S5PC1XX_IRQ_VIC0(27)

#define IRQ_WDT			S5PC1XX_IRQ_VIC0(27)

#define IRQ_RTC_ALARM		S5PC1XX_IRQ_VIC0(28)

#define IRQ_RTC_ALARM		S5PC1XX_IRQ_VIC0(28)
@@ -171,8 +171,15 @@ 
#define IRQ_SDMIRQ		S5PC1XX_IRQ_VIC2(30)

#define IRQ_SDMIRQ		S5PC1XX_IRQ_VIC2(30)

#define IRQ_SDMFIQ		S5PC1XX_IRQ_VIC2(31)

#define IRQ_SDMFIQ		S5PC1XX_IRQ_VIC2(31)





#define IRQ_TIMER(x)		(IRQ_SDMFIQ + 1 + (x))

#define IRQ_TIMER0		IRQ_TIMER(0)

#define IRQ_TIMER1		IRQ_TIMER(1)

#define IRQ_TIMER2		IRQ_TIMER(2)

#define IRQ_TIMER3		IRQ_TIMER(3)

#define IRQ_TIMER4		IRQ_TIMER(4)



/* External interrupt */

/* External interrupt */

#define S3C_IRQ_EINT_BASE	(IRQ_SDMFIQ + 1)

#define S3C_IRQ_EINT_BASE	(IRQ_SDMFIQ + 6)





#define S3C_EINT(x)		(S3C_IRQ_EINT_BASE + (x - 16))

#define S3C_EINT(x)		(S3C_IRQ_EINT_BASE + (x - 16))

#define IRQ_EINT(x)		(x < 16 ? IRQ_EINT0 + x : S3C_EINT(x))

#define IRQ_EINT(x)		(x < 16 ? IRQ_EINT0 + x : S3C_EINT(x))

arch/arm/plat-s5pc1xx/irq.c

+7 −81
Original line number Original line Diff line number Diff line
@@ -20,77 +20,9 @@ 
#include <asm/hardware/vic.h>

#include <asm/hardware/vic.h>





#include <mach/map.h>

#include <mach/map.h>

#include <plat/regs-timer.h>

#include <plat/irq-vic-timer.h>

#include <plat/cpu.h>

#include <plat/cpu.h>





/* Timer interrupt handling */



static void s3c_irq_demux_timer(unsigned int base_irq, unsigned int sub_irq)

{

	generic_handle_irq(sub_irq);

}



static void s3c_irq_demux_timer0(unsigned int irq, struct irq_desc *desc)

{

	s3c_irq_demux_timer(irq, IRQ_TIMER0);

}



static void s3c_irq_demux_timer1(unsigned int irq, struct irq_desc *desc)

{

	s3c_irq_demux_timer(irq, IRQ_TIMER1);

}



static void s3c_irq_demux_timer2(unsigned int irq, struct irq_desc *desc)

{

	s3c_irq_demux_timer(irq, IRQ_TIMER2);

}



static void s3c_irq_demux_timer3(unsigned int irq, struct irq_desc *desc)

{

	s3c_irq_demux_timer(irq, IRQ_TIMER3);

}



static void s3c_irq_demux_timer4(unsigned int irq, struct irq_desc *desc)

{

	s3c_irq_demux_timer(irq, IRQ_TIMER4);

}



/* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */



static void s3c_irq_timer_mask(unsigned int irq)

{

	u32 reg = __raw_readl(S3C64XX_TINT_CSTAT);



	reg &= 0x1f;  /* mask out pending interrupts */

	reg &= ~(1 << (irq - IRQ_TIMER0));

	__raw_writel(reg, S3C64XX_TINT_CSTAT);

}



static void s3c_irq_timer_unmask(unsigned int irq)

{

	u32 reg = __raw_readl(S3C64XX_TINT_CSTAT);



	reg &= 0x1f;  /* mask out pending interrupts */

	reg |= 1 << (irq - IRQ_TIMER0);

	__raw_writel(reg, S3C64XX_TINT_CSTAT);

}



static void s3c_irq_timer_ack(unsigned int irq)

{

	u32 reg = __raw_readl(S3C64XX_TINT_CSTAT);



	reg &= 0x1f;  /* mask out pending interrupts */

	reg |= (1 << 5) << (irq - IRQ_TIMER0);

	__raw_writel(reg, S3C64XX_TINT_CSTAT);

}



static struct irq_chip s3c_irq_timer = {

	.name		= "s3c-timer",

	.mask		= s3c_irq_timer_mask,

	.unmask		= s3c_irq_timer_unmask,

	.ack		= s3c_irq_timer_ack,

};



struct uart_irq {

struct uart_irq {

	void __iomem	*regs;

	void __iomem	*regs;

	unsigned int	 base_irq;

	unsigned int	 base_irq;
@@ -229,7 +161,7 @@ static void __init s5pc1xx_uart_irq(struct uart_irq *uirq) 
void __init s5pc1xx_init_irq(u32 *vic_valid, int num)

void __init s5pc1xx_init_irq(u32 *vic_valid, int num)

{

{

	int i;

	int i;

	int uart, irq;

	int uart;





	printk(KERN_DEBUG "%s: initialising interrupts\n", __func__);

	printk(KERN_DEBUG "%s: initialising interrupts\n", __func__);
@@ -240,17 +172,11 @@ void __init s5pc1xx_init_irq(u32 *vic_valid, int num) 




	/* add the timer sub-irqs */

	/* add the timer sub-irqs */





	set_irq_chained_handler(IRQ_TIMER0, s3c_irq_demux_timer0);

	s3c_init_vic_timer_irq(IRQ_TIMER0_VIC, IRQ_TIMER0);

	set_irq_chained_handler(IRQ_TIMER1, s3c_irq_demux_timer1);

	s3c_init_vic_timer_irq(IRQ_TIMER1_VIC, IRQ_TIMER1);

	set_irq_chained_handler(IRQ_TIMER2, s3c_irq_demux_timer2);

	s3c_init_vic_timer_irq(IRQ_TIMER2_VIC, IRQ_TIMER2);

	set_irq_chained_handler(IRQ_TIMER3, s3c_irq_demux_timer3);

	s3c_init_vic_timer_irq(IRQ_TIMER3_VIC, IRQ_TIMER3);

	set_irq_chained_handler(IRQ_TIMER4, s3c_irq_demux_timer4);

	s3c_init_vic_timer_irq(IRQ_TIMER4_VIC, IRQ_TIMER4);



	for (irq = IRQ_TIMER0; irq <= IRQ_TIMER4; irq++) {

		set_irq_chip(irq, &s3c_irq_timer);

		set_irq_handler(irq, handle_level_irq);

		set_irq_flags(irq, IRQF_VALID);

	}





	for (uart = 0; uart < ARRAY_SIZE(uart_irqs); uart++)

	for (uart = 0; uart < ARRAY_SIZE(uart_irqs); uart++)

		s5pc1xx_uart_irq(&uart_irqs[uart]);

		s5pc1xx_uart_irq(&uart_irqs[uart]);