Skip to content

L
linux
Commit 57436c2d authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Kukjin Kim
Browse files
Options

ARM: S3C24XX: irq_data conversion 

Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
[kgene.kim@samsung.com: coding-style fixes]
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent d930596a
Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 243 deletions
arch/arm/mach-s3c2410/bast-irq.c
View file @ 57436c2d
...@@ -75,38 +75,38 @@ static unsigned char bast_pc104_irqmasks[] = { ...@@ -75,38 +75,38 @@ static unsigned char bast_pc104_irqmasks[] = {
static unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 }; static unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };
static void static void
bast_pc104_mask(unsigned int irqno) bast_pc104_mask(struct irq_data *data)
{ {
unsigned long temp; unsigned long temp;
temp = __raw_readb(BAST_VA_PC104_IRQMASK); temp = __raw_readb(BAST_VA_PC104_IRQMASK);
temp &= ~bast_pc104_irqmasks[irqno]; temp &= ~bast_pc104_irqmasks[data->irq];
__raw_writeb(temp, BAST_VA_PC104_IRQMASK); __raw_writeb(temp, BAST_VA_PC104_IRQMASK);
} }
static void static void
bast_pc104_maskack(unsigned int irqno) bast_pc104_maskack(struct irq_data *data)
{ {
struct irq_desc *desc = irq_desc + IRQ_ISA; struct irq_desc *desc = irq_desc + IRQ_ISA;
bast_pc104_mask(irqno); bast_pc104_mask(data);
desc->chip->ack(IRQ_ISA); desc->irq_data.chip->irq_ack(&desc->irq_data);
} }
static void static void
bast_pc104_unmask(unsigned int irqno) bast_pc104_unmask(struct irq_data *data)
{ {
unsigned long temp; unsigned long temp;
temp = __raw_readb(BAST_VA_PC104_IRQMASK); temp = __raw_readb(BAST_VA_PC104_IRQMASK);
temp |= bast_pc104_irqmasks[irqno]; temp |= bast_pc104_irqmasks[data->irq];
__raw_writeb(temp, BAST_VA_PC104_IRQMASK); __raw_writeb(temp, BAST_VA_PC104_IRQMASK);
} }
static struct irq_chip bast_pc104_chip = { static struct irq_chip bast_pc104_chip = {
.mask = bast_pc104_mask, .irq_mask = bast_pc104_mask,
.unmask = bast_pc104_unmask, .irq_unmask = bast_pc104_unmask,
.ack = bast_pc104_maskack .irq_ack = bast_pc104_maskack
}; };
static void static void
...@@ -123,7 +123,7 @@ bast_irq_pc104_demux(unsigned int irq, ...@@ -123,7 +123,7 @@ bast_irq_pc104_demux(unsigned int irq,
/* ack if we get an irq with nothing (ie, startup) */ /* ack if we get an irq with nothing (ie, startup) */
desc = irq_desc + IRQ_ISA; desc = irq_desc + IRQ_ISA;
desc->chip->ack(IRQ_ISA); desc->irq_data.chip->irq_ack(&desc->irq_data);
} else { } else {
/* handle the IRQ */ /* handle the IRQ */
......
arch/arm/mach-s3c2412/irq.c
View file @ 57436c2d
...@@ -49,9 +49,9 @@ ...@@ -49,9 +49,9 @@
*/ */
static void static void
s3c2412_irq_mask(unsigned int irqno) s3c2412_irq_mask(struct irq_data *data)
{ {
unsigned long bitval = 1UL << (irqno - IRQ_EINT0); unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
unsigned long mask; unsigned long mask;
mask = __raw_readl(S3C2410_INTMSK); mask = __raw_readl(S3C2410_INTMSK);
...@@ -62,9 +62,9 @@ s3c2412_irq_mask(unsigned int irqno) ...@@ -62,9 +62,9 @@ s3c2412_irq_mask(unsigned int irqno)
} }
static inline void static inline void
s3c2412_irq_ack(unsigned int irqno) s3c2412_irq_ack(struct irq_data *data)
{ {
unsigned long bitval = 1UL << (irqno - IRQ_EINT0); unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
__raw_writel(bitval, S3C2412_EINTPEND); __raw_writel(bitval, S3C2412_EINTPEND);
__raw_writel(bitval, S3C2410_SRCPND); __raw_writel(bitval, S3C2410_SRCPND);
...@@ -72,9 +72,9 @@ s3c2412_irq_ack(unsigned int irqno) ...@@ -72,9 +72,9 @@ s3c2412_irq_ack(unsigned int irqno)
} }
static inline void static inline void
s3c2412_irq_maskack(unsigned int irqno) s3c2412_irq_maskack(struct irq_data *data)
{ {
unsigned long bitval = 1UL << (irqno - IRQ_EINT0); unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
unsigned long mask; unsigned long mask;
mask = __raw_readl(S3C2410_INTMSK); mask = __raw_readl(S3C2410_INTMSK);
...@@ -89,9 +89,9 @@ s3c2412_irq_maskack(unsigned int irqno) ...@@ -89,9 +89,9 @@ s3c2412_irq_maskack(unsigned int irqno)
} }
static void static void
s3c2412_irq_unmask(unsigned int irqno) s3c2412_irq_unmask(struct irq_data *data)
{ {
unsigned long bitval = 1UL << (irqno - IRQ_EINT0); unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
unsigned long mask; unsigned long mask;
mask = __raw_readl(S3C2412_EINTMASK); mask = __raw_readl(S3C2412_EINTMASK);
...@@ -102,11 +102,11 @@ s3c2412_irq_unmask(unsigned int irqno) ...@@ -102,11 +102,11 @@ s3c2412_irq_unmask(unsigned int irqno)
} }
static struct irq_chip s3c2412_irq_eint0t4 = { static struct irq_chip s3c2412_irq_eint0t4 = {
.ack = s3c2412_irq_ack, .irq_ack = s3c2412_irq_ack,
.mask = s3c2412_irq_mask, .irq_mask = s3c2412_irq_mask,
.unmask = s3c2412_irq_unmask, .irq_unmask = s3c2412_irq_unmask,
.set_wake = s3c_irq_wake, .irq_set_wake = s3c_irq_wake,
.set_type = s3c_irqext_type, .irq_set_type = s3c_irqext_type,
}; };
#define INTBIT(x) (1 << ((x) - S3C2410_IRQSUB(0))) #define INTBIT(x) (1 << ((x) - S3C2410_IRQSUB(0)))
...@@ -132,29 +132,29 @@ static void s3c2412_irq_demux_cfsdi(unsigned int irq, struct irq_desc *desc) ...@@ -132,29 +132,29 @@ static void s3c2412_irq_demux_cfsdi(unsigned int irq, struct irq_desc *desc)
#define INTMSK_CFSDI (1UL << (IRQ_S3C2412_CFSDI - IRQ_EINT0)) #define INTMSK_CFSDI (1UL << (IRQ_S3C2412_CFSDI - IRQ_EINT0))
#define SUBMSK_CFSDI INTMSK_SUB(IRQ_S3C2412_SDI, IRQ_S3C2412_CF) #define SUBMSK_CFSDI INTMSK_SUB(IRQ_S3C2412_SDI, IRQ_S3C2412_CF)
static void s3c2412_irq_cfsdi_mask(unsigned int irqno) static void s3c2412_irq_cfsdi_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_CFSDI, SUBMSK_CFSDI); s3c_irqsub_mask(data->irq, INTMSK_CFSDI, SUBMSK_CFSDI);
} }
static void s3c2412_irq_cfsdi_unmask(unsigned int irqno) static void s3c2412_irq_cfsdi_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_CFSDI); s3c_irqsub_unmask(data->irq, INTMSK_CFSDI);
} }
static void s3c2412_irq_cfsdi_ack(unsigned int irqno) static void s3c2412_irq_cfsdi_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_CFSDI, SUBMSK_CFSDI); s3c_irqsub_maskack(data->irq, INTMSK_CFSDI, SUBMSK_CFSDI);
} }
static struct irq_chip s3c2412_irq_cfsdi = { static struct irq_chip s3c2412_irq_cfsdi = {
.name = "s3c2412-cfsdi", .name = "s3c2412-cfsdi",
.ack = s3c2412_irq_cfsdi_ack, .irq_ack = s3c2412_irq_cfsdi_ack,
.mask = s3c2412_irq_cfsdi_mask, .irq_mask = s3c2412_irq_cfsdi_mask,
.unmask = s3c2412_irq_cfsdi_unmask, .irq_unmask = s3c2412_irq_cfsdi_unmask,
}; };
static int s3c2412_irq_rtc_wake(unsigned int irqno, unsigned int state) static int s3c2412_irq_rtc_wake(struct irq_data *data, unsigned int state)
{ {
unsigned long pwrcfg; unsigned long pwrcfg;
...@@ -165,7 +165,7 @@ static int s3c2412_irq_rtc_wake(unsigned int irqno, unsigned int state) ...@@ -165,7 +165,7 @@ static int s3c2412_irq_rtc_wake(unsigned int irqno, unsigned int state)
pwrcfg |= S3C2412_PWRCFG_RTC_MASKIRQ; pwrcfg |= S3C2412_PWRCFG_RTC_MASKIRQ;
__raw_writel(pwrcfg, S3C2412_PWRCFG); __raw_writel(pwrcfg, S3C2412_PWRCFG);
return s3c_irq_chip.set_wake(irqno, state); return s3c_irq_chip.irq_set_wake(data, state);
} }
static struct irq_chip s3c2412_irq_rtc_chip; static struct irq_chip s3c2412_irq_rtc_chip;
...@@ -193,7 +193,7 @@ static int s3c2412_irq_add(struct sys_device *sysdev) ...@@ -193,7 +193,7 @@ static int s3c2412_irq_add(struct sys_device *sysdev)
/* change RTC IRQ's set wake method */ /* change RTC IRQ's set wake method */
s3c2412_irq_rtc_chip = s3c_irq_chip; s3c2412_irq_rtc_chip = s3c_irq_chip;
s3c2412_irq_rtc_chip.set_wake = s3c2412_irq_rtc_wake; s3c2412_irq_rtc_chip.irq_set_wake = s3c2412_irq_rtc_wake;
set_irq_chip(IRQ_RTC, &s3c2412_irq_rtc_chip); set_irq_chip(IRQ_RTC, &s3c2412_irq_rtc_chip);
......
arch/arm/mach-s3c2416/irq.c
View file @ 57436c2d
...@@ -77,28 +77,27 @@ static void s3c2416_irq_demux_wdtac97(unsigned int irq, struct irq_desc *desc) ...@@ -77,28 +77,27 @@ static void s3c2416_irq_demux_wdtac97(unsigned int irq, struct irq_desc *desc)
#define INTMSK_WDTAC97 (1UL << (IRQ_WDT - IRQ_EINT0)) #define INTMSK_WDTAC97 (1UL << (IRQ_WDT - IRQ_EINT0))
#define SUBMSK_WDTAC97 INTMSK(IRQ_S3C2443_WDT, IRQ_S3C2443_AC97) #define SUBMSK_WDTAC97 INTMSK(IRQ_S3C2443_WDT, IRQ_S3C2443_AC97)
static void s3c2416_irq_wdtac97_mask(unsigned int irqno) static void s3c2416_irq_wdtac97_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_WDTAC97, SUBMSK_WDTAC97); s3c_irqsub_mask(data->irq, INTMSK_WDTAC97, SUBMSK_WDTAC97);
} }
static void s3c2416_irq_wdtac97_unmask(unsigned int irqno) static void s3c2416_irq_wdtac97_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_WDTAC97); s3c_irqsub_unmask(data->irq, INTMSK_WDTAC97);
} }
static void s3c2416_irq_wdtac97_ack(unsigned int irqno) static void s3c2416_irq_wdtac97_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_WDTAC97, SUBMSK_WDTAC97); s3c_irqsub_maskack(data->irq, INTMSK_WDTAC97, SUBMSK_WDTAC97);
} }
static struct irq_chip s3c2416_irq_wdtac97 = { static struct irq_chip s3c2416_irq_wdtac97 = {
.mask = s3c2416_irq_wdtac97_mask, .irq_mask = s3c2416_irq_wdtac97_mask,
.unmask = s3c2416_irq_wdtac97_unmask, .irq_unmask = s3c2416_irq_wdtac97_unmask,
.ack = s3c2416_irq_wdtac97_ack, .irq_ack = s3c2416_irq_wdtac97_ack,
}; };
/* LCD sub interrupts */ /* LCD sub interrupts */
static void s3c2416_irq_demux_lcd(unsigned int irq, struct irq_desc *desc) static void s3c2416_irq_demux_lcd(unsigned int irq, struct irq_desc *desc)
...@@ -109,28 +108,27 @@ static void s3c2416_irq_demux_lcd(unsigned int irq, struct irq_desc *desc) ...@@ -109,28 +108,27 @@ static void s3c2416_irq_demux_lcd(unsigned int irq, struct irq_desc *desc)
#define INTMSK_LCD (1UL << (IRQ_LCD - IRQ_EINT0)) #define INTMSK_LCD (1UL << (IRQ_LCD - IRQ_EINT0))
#define SUBMSK_LCD INTMSK(IRQ_S3C2443_LCD1, IRQ_S3C2443_LCD4) #define SUBMSK_LCD INTMSK(IRQ_S3C2443_LCD1, IRQ_S3C2443_LCD4)
static void s3c2416_irq_lcd_mask(unsigned int irqno) static void s3c2416_irq_lcd_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_LCD, SUBMSK_LCD); s3c_irqsub_mask(data->irq, INTMSK_LCD, SUBMSK_LCD);
} }
static void s3c2416_irq_lcd_unmask(unsigned int irqno) static void s3c2416_irq_lcd_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_LCD); s3c_irqsub_unmask(data->irq, INTMSK_LCD);
} }
static void s3c2416_irq_lcd_ack(unsigned int irqno) static void s3c2416_irq_lcd_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_LCD, SUBMSK_LCD); s3c_irqsub_maskack(data->irq, INTMSK_LCD, SUBMSK_LCD);
} }
static struct irq_chip s3c2416_irq_lcd = { static struct irq_chip s3c2416_irq_lcd = {
.mask = s3c2416_irq_lcd_mask, .irq_mask = s3c2416_irq_lcd_mask,
.unmask = s3c2416_irq_lcd_unmask, .irq_unmask = s3c2416_irq_lcd_unmask,
.ack = s3c2416_irq_lcd_ack, .irq_ack = s3c2416_irq_lcd_ack,
}; };
/* DMA sub interrupts */ /* DMA sub interrupts */
static void s3c2416_irq_demux_dma(unsigned int irq, struct irq_desc *desc) static void s3c2416_irq_demux_dma(unsigned int irq, struct irq_desc *desc)
...@@ -142,28 +140,27 @@ static void s3c2416_irq_demux_dma(unsigned int irq, struct irq_desc *desc) ...@@ -142,28 +140,27 @@ static void s3c2416_irq_demux_dma(unsigned int irq, struct irq_desc *desc)
#define SUBMSK_DMA INTMSK(IRQ_S3C2443_DMA0, IRQ_S3C2443_DMA5) #define SUBMSK_DMA INTMSK(IRQ_S3C2443_DMA0, IRQ_S3C2443_DMA5)
static void s3c2416_irq_dma_mask(unsigned int irqno) static void s3c2416_irq_dma_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_DMA, SUBMSK_DMA); s3c_irqsub_mask(data->irq, INTMSK_DMA, SUBMSK_DMA);
} }
static void s3c2416_irq_dma_unmask(unsigned int irqno) static void s3c2416_irq_dma_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_DMA); s3c_irqsub_unmask(data->irq, INTMSK_DMA);
} }
static void s3c2416_irq_dma_ack(unsigned int irqno) static void s3c2416_irq_dma_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_DMA, SUBMSK_DMA); s3c_irqsub_maskack(data->irq, INTMSK_DMA, SUBMSK_DMA);
} }
static struct irq_chip s3c2416_irq_dma = { static struct irq_chip s3c2416_irq_dma = {
.mask = s3c2416_irq_dma_mask, .irq_mask = s3c2416_irq_dma_mask,
.unmask = s3c2416_irq_dma_unmask, .irq_unmask = s3c2416_irq_dma_unmask,
.ack = s3c2416_irq_dma_ack, .irq_ack = s3c2416_irq_dma_ack,
}; };
/* UART3 sub interrupts */ /* UART3 sub interrupts */
static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc) static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc)
...@@ -174,28 +171,27 @@ static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc) ...@@ -174,28 +171,27 @@ static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc)
#define INTMSK_UART3 (1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0)) #define INTMSK_UART3 (1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0))
#define SUBMSK_UART3 (0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0))) #define SUBMSK_UART3 (0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0)))
static void s3c2416_irq_uart3_mask(unsigned int irqno) static void s3c2416_irq_uart3_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_UART3, SUBMSK_UART3); s3c_irqsub_mask(data->irq, INTMSK_UART3, SUBMSK_UART3);
} }
static void s3c2416_irq_uart3_unmask(unsigned int irqno) static void s3c2416_irq_uart3_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_UART3); s3c_irqsub_unmask(data->irq, INTMSK_UART3);
} }
static void s3c2416_irq_uart3_ack(unsigned int irqno) static void s3c2416_irq_uart3_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_UART3, SUBMSK_UART3); s3c_irqsub_maskack(data->irq, INTMSK_UART3, SUBMSK_UART3);
} }
static struct irq_chip s3c2416_irq_uart3 = { static struct irq_chip s3c2416_irq_uart3 = {
.mask = s3c2416_irq_uart3_mask, .irq_mask = s3c2416_irq_uart3_mask,
.unmask = s3c2416_irq_uart3_unmask, .irq_unmask = s3c2416_irq_uart3_unmask,
.ack = s3c2416_irq_uart3_ack, .irq_ack = s3c2416_irq_uart3_ack,
}; };
/* IRQ initialisation code */ /* IRQ initialisation code */
static int __init s3c2416_add_sub(unsigned int base, static int __init s3c2416_add_sub(unsigned int base,
......
arch/arm/mach-s3c2440/irq.c
View file @ 57436c2d
...@@ -69,27 +69,27 @@ static void s3c_irq_demux_wdtac97(unsigned int irq, ...@@ -69,27 +69,27 @@ static void s3c_irq_demux_wdtac97(unsigned int irq,
#define INTMSK_WDT (1UL << (IRQ_WDT - IRQ_EINT0)) #define INTMSK_WDT (1UL << (IRQ_WDT - IRQ_EINT0))
static void static void
s3c_irq_wdtac97_mask(unsigned int irqno) s3c_irq_wdtac97_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_WDT, 3<<13); s3c_irqsub_mask(data->irq, INTMSK_WDT, 3 << 13);
} }
static void static void
s3c_irq_wdtac97_unmask(unsigned int irqno) s3c_irq_wdtac97_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_WDT); s3c_irqsub_unmask(data->irq, INTMSK_WDT);
} }
static void static void
s3c_irq_wdtac97_ack(unsigned int irqno) s3c_irq_wdtac97_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_WDT, 3<<13); s3c_irqsub_maskack(data->irq, INTMSK_WDT, 3 << 13);
} }
static struct irq_chip s3c_irq_wdtac97 = { static struct irq_chip s3c_irq_wdtac97 = {
.mask = s3c_irq_wdtac97_mask, .irq_mask = s3c_irq_wdtac97_mask,
.unmask = s3c_irq_wdtac97_unmask, .irq_unmask = s3c_irq_wdtac97_unmask,
.ack = s3c_irq_wdtac97_ack, .irq_ack = s3c_irq_wdtac97_ack,
}; };
static int s3c2440_irq_add(struct sys_device *sysdev) static int s3c2440_irq_add(struct sys_device *sysdev)
......
arch/arm/mach-s3c2440/s3c244x-irq.c
View file @ 57436c2d
...@@ -68,27 +68,27 @@ static void s3c_irq_demux_cam(unsigned int irq, ...@@ -68,27 +68,27 @@ static void s3c_irq_demux_cam(unsigned int irq,
#define INTMSK_CAM (1UL << (IRQ_CAM - IRQ_EINT0)) #define INTMSK_CAM (1UL << (IRQ_CAM - IRQ_EINT0))
static void static void
s3c_irq_cam_mask(unsigned int irqno) s3c_irq_cam_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_CAM, 3<<11); s3c_irqsub_mask(data->irq, INTMSK_CAM, 3 << 11);
} }
static void static void
s3c_irq_cam_unmask(unsigned int irqno) s3c_irq_cam_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_CAM); s3c_irqsub_unmask(data->irq, INTMSK_CAM);
} }
static void static void
s3c_irq_cam_ack(unsigned int irqno) s3c_irq_cam_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_CAM, 3<<11); s3c_irqsub_maskack(data->irq, INTMSK_CAM, 3 << 11);
} }
static struct irq_chip s3c_irq_cam = { static struct irq_chip s3c_irq_cam = {
.mask = s3c_irq_cam_mask, .irq_mask = s3c_irq_cam_mask,
.unmask = s3c_irq_cam_unmask, .irq_unmask = s3c_irq_cam_unmask,
.ack = s3c_irq_cam_ack, .irq_ack = s3c_irq_cam_ack,
}; };
static int s3c244x_irq_add(struct sys_device *sysdev) static int s3c244x_irq_add(struct sys_device *sysdev)
......
arch/arm/mach-s3c2443/irq.c
View file @ 57436c2d
...@@ -75,28 +75,27 @@ static void s3c2443_irq_demux_wdtac97(unsigned int irq, struct irq_desc *desc) ...@@ -75,28 +75,27 @@ static void s3c2443_irq_demux_wdtac97(unsigned int irq, struct irq_desc *desc)
#define INTMSK_WDTAC97 (1UL << (IRQ_WDT - IRQ_EINT0)) #define INTMSK_WDTAC97 (1UL << (IRQ_WDT - IRQ_EINT0))
#define SUBMSK_WDTAC97 INTMSK(IRQ_S3C2443_WDT, IRQ_S3C2443_AC97) #define SUBMSK_WDTAC97 INTMSK(IRQ_S3C2443_WDT, IRQ_S3C2443_AC97)
static void s3c2443_irq_wdtac97_mask(unsigned int irqno) static void s3c2443_irq_wdtac97_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_WDTAC97, SUBMSK_WDTAC97); s3c_irqsub_mask(data->irq, INTMSK_WDTAC97, SUBMSK_WDTAC97);
} }
static void s3c2443_irq_wdtac97_unmask(unsigned int irqno) static void s3c2443_irq_wdtac97_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_WDTAC97); s3c_irqsub_unmask(data->irq, INTMSK_WDTAC97);
} }
static void s3c2443_irq_wdtac97_ack(unsigned int irqno) static void s3c2443_irq_wdtac97_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_WDTAC97, SUBMSK_WDTAC97); s3c_irqsub_maskack(data->irq, INTMSK_WDTAC97, SUBMSK_WDTAC97);
} }
static struct irq_chip s3c2443_irq_wdtac97 = { static struct irq_chip s3c2443_irq_wdtac97 = {
.mask = s3c2443_irq_wdtac97_mask, .irq_mask = s3c2443_irq_wdtac97_mask,
.unmask = s3c2443_irq_wdtac97_unmask, .irq_unmask = s3c2443_irq_wdtac97_unmask,
.ack = s3c2443_irq_wdtac97_ack, .irq_ack = s3c2443_irq_wdtac97_ack,
}; };
/* LCD sub interrupts */ /* LCD sub interrupts */
static void s3c2443_irq_demux_lcd(unsigned int irq, struct irq_desc *desc) static void s3c2443_irq_demux_lcd(unsigned int irq, struct irq_desc *desc)
...@@ -107,28 +106,27 @@ static void s3c2443_irq_demux_lcd(unsigned int irq, struct irq_desc *desc) ...@@ -107,28 +106,27 @@ static void s3c2443_irq_demux_lcd(unsigned int irq, struct irq_desc *desc)
#define INTMSK_LCD (1UL << (IRQ_LCD - IRQ_EINT0)) #define INTMSK_LCD (1UL << (IRQ_LCD - IRQ_EINT0))
#define SUBMSK_LCD INTMSK(IRQ_S3C2443_LCD1, IRQ_S3C2443_LCD4) #define SUBMSK_LCD INTMSK(IRQ_S3C2443_LCD1, IRQ_S3C2443_LCD4)
static void s3c2443_irq_lcd_mask(unsigned int irqno) static void s3c2443_irq_lcd_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_LCD, SUBMSK_LCD); s3c_irqsub_mask(data->irq, INTMSK_LCD, SUBMSK_LCD);
} }
static void s3c2443_irq_lcd_unmask(unsigned int irqno) static void s3c2443_irq_lcd_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_LCD); s3c_irqsub_unmask(data->irq, INTMSK_LCD);
} }
static void s3c2443_irq_lcd_ack(unsigned int irqno) static void s3c2443_irq_lcd_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_LCD, SUBMSK_LCD); s3c_irqsub_maskack(data->irq, INTMSK_LCD, SUBMSK_LCD);
} }
static struct irq_chip s3c2443_irq_lcd = { static struct irq_chip s3c2443_irq_lcd = {
.mask = s3c2443_irq_lcd_mask, .irq_mask = s3c2443_irq_lcd_mask,
.unmask = s3c2443_irq_lcd_unmask, .irq_unmask = s3c2443_irq_lcd_unmask,
.ack = s3c2443_irq_lcd_ack, .irq_ack = s3c2443_irq_lcd_ack,
}; };
/* DMA sub interrupts */ /* DMA sub interrupts */
static void s3c2443_irq_demux_dma(unsigned int irq, struct irq_desc *desc) static void s3c2443_irq_demux_dma(unsigned int irq, struct irq_desc *desc)
...@@ -139,29 +137,27 @@ static void s3c2443_irq_demux_dma(unsigned int irq, struct irq_desc *desc) ...@@ -139,29 +137,27 @@ static void s3c2443_irq_demux_dma(unsigned int irq, struct irq_desc *desc)
#define INTMSK_DMA (1UL << (IRQ_S3C2443_DMA - IRQ_EINT0)) #define INTMSK_DMA (1UL << (IRQ_S3C2443_DMA - IRQ_EINT0))
#define SUBMSK_DMA INTMSK(IRQ_S3C2443_DMA0, IRQ_S3C2443_DMA5) #define SUBMSK_DMA INTMSK(IRQ_S3C2443_DMA0, IRQ_S3C2443_DMA5)
static void s3c2443_irq_dma_mask(struct irq_data *data)
static void s3c2443_irq_dma_mask(unsigned int irqno)
{ {
s3c_irqsub_mask(irqno, INTMSK_DMA, SUBMSK_DMA); s3c_irqsub_mask(data->irq, INTMSK_DMA, SUBMSK_DMA);
} }
static void s3c2443_irq_dma_unmask(unsigned int irqno) static void s3c2443_irq_dma_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_DMA); s3c_irqsub_unmask(data->irq, INTMSK_DMA);
} }
static void s3c2443_irq_dma_ack(unsigned int irqno) static void s3c2443_irq_dma_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_DMA, SUBMSK_DMA); s3c_irqsub_maskack(data->irq, INTMSK_DMA, SUBMSK_DMA);
} }
static struct irq_chip s3c2443_irq_dma = { static struct irq_chip s3c2443_irq_dma = {
.mask = s3c2443_irq_dma_mask, .irq_mask = s3c2443_irq_dma_mask,
.unmask = s3c2443_irq_dma_unmask, .irq_unmask = s3c2443_irq_dma_unmask,
.ack = s3c2443_irq_dma_ack, .irq_ack = s3c2443_irq_dma_ack,
}; };
/* UART3 sub interrupts */ /* UART3 sub interrupts */
static void s3c2443_irq_demux_uart3(unsigned int irq, struct irq_desc *desc) static void s3c2443_irq_demux_uart3(unsigned int irq, struct irq_desc *desc)
...@@ -172,28 +168,27 @@ static void s3c2443_irq_demux_uart3(unsigned int irq, struct irq_desc *desc) ...@@ -172,28 +168,27 @@ static void s3c2443_irq_demux_uart3(unsigned int irq, struct irq_desc *desc)
#define INTMSK_UART3 (1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0)) #define INTMSK_UART3 (1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0))
#define SUBMSK_UART3 (0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0))) #define SUBMSK_UART3 (0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0)))
static void s3c2443_irq_uart3_mask(unsigned int irqno) static void s3c2443_irq_uart3_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_UART3, SUBMSK_UART3); s3c_irqsub_mask(data->irq, INTMSK_UART3, SUBMSK_UART3);
} }
static void s3c2443_irq_uart3_unmask(unsigned int irqno) static void s3c2443_irq_uart3_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_UART3); s3c_irqsub_unmask(data->irq, INTMSK_UART3);
} }
static void s3c2443_irq_uart3_ack(unsigned int irqno) static void s3c2443_irq_uart3_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_UART3, SUBMSK_UART3); s3c_irqsub_maskack(data->irq, INTMSK_UART3, SUBMSK_UART3);
} }
static struct irq_chip s3c2443_irq_uart3 = { static struct irq_chip s3c2443_irq_uart3 = {
.mask = s3c2443_irq_uart3_mask, .irq_mask = s3c2443_irq_uart3_mask,
.unmask = s3c2443_irq_uart3_unmask, .irq_unmask = s3c2443_irq_uart3_unmask,
.ack = s3c2443_irq_uart3_ack, .irq_ack = s3c2443_irq_uart3_ack,
}; };
/* CAM sub interrupts */ /* CAM sub interrupts */
static void s3c2443_irq_demux_cam(unsigned int irq, struct irq_desc *desc) static void s3c2443_irq_demux_cam(unsigned int irq, struct irq_desc *desc)
...@@ -204,25 +199,25 @@ static void s3c2443_irq_demux_cam(unsigned int irq, struct irq_desc *desc) ...@@ -204,25 +199,25 @@ static void s3c2443_irq_demux_cam(unsigned int irq, struct irq_desc *desc)
#define INTMSK_CAM (1UL << (IRQ_CAM - IRQ_EINT0)) #define INTMSK_CAM (1UL << (IRQ_CAM - IRQ_EINT0))
#define SUBMSK_CAM INTMSK(IRQ_S3C2440_CAM_C, IRQ_S3C2440_CAM_P) #define SUBMSK_CAM INTMSK(IRQ_S3C2440_CAM_C, IRQ_S3C2440_CAM_P)
static void s3c2443_irq_cam_mask(unsigned int irqno) static void s3c2443_irq_cam_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_CAM, SUBMSK_CAM); s3c_irqsub_mask(data->irq, INTMSK_CAM, SUBMSK_CAM);
} }
static void s3c2443_irq_cam_unmask(unsigned int irqno) static void s3c2443_irq_cam_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_CAM); s3c_irqsub_unmask(data->irq, INTMSK_CAM);
} }
static void s3c2443_irq_cam_ack(unsigned int irqno) static void s3c2443_irq_cam_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_CAM, SUBMSK_CAM); s3c_irqsub_maskack(data->irq, INTMSK_CAM, SUBMSK_CAM);
} }
static struct irq_chip s3c2443_irq_cam = { static struct irq_chip s3c2443_irq_cam = {
.mask = s3c2443_irq_cam_mask, .irq_mask = s3c2443_irq_cam_mask,
.unmask = s3c2443_irq_cam_unmask, .irq_unmask = s3c2443_irq_cam_unmask,
.ack = s3c2443_irq_cam_ack, .irq_ack = s3c2443_irq_cam_ack,
}; };
/* IRQ initialisation code */ /* IRQ initialisation code */
......
arch/arm/plat-s3c24xx/include/plat/irq.h
View file @ 57436c2d
...@@ -107,9 +107,9 @@ s3c_irqsub_ack(unsigned int irqno, unsigned int parentmask, unsigned int group) ...@@ -107,9 +107,9 @@ s3c_irqsub_ack(unsigned int irqno, unsigned int parentmask, unsigned int group)
/* exported for use in arch/arm/mach-s3c2410 */ /* exported for use in arch/arm/mach-s3c2410 */
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern int s3c_irq_wake(unsigned int irqno, unsigned int state); extern int s3c_irq_wake(struct irq_data *data, unsigned int state);
#else #else
#define s3c_irq_wake NULL #define s3c_irq_wake NULL
#endif #endif
extern int s3c_irqext_type(unsigned int irq, unsigned int type); extern int s3c_irqext_type(struct irq_data *d, unsigned int type);
arch/arm/plat-s3c24xx/irq-pm.c
View file @ 57436c2d
...@@ -15,11 +15,14 @@ ...@@ -15,11 +15,14 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/irq.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/pm.h> #include <plat/pm.h>
#include <plat/irq.h> #include <plat/irq.h>
#include <asm/irq.h>
/* state for IRQs over sleep */ /* state for IRQs over sleep */
/* default is to allow for EINT0..EINT15, and IRQ_RTC as wakeup sources /* default is to allow for EINT0..EINT15, and IRQ_RTC as wakeup sources
...@@ -30,15 +33,15 @@ ...@@ -30,15 +33,15 @@
unsigned long s3c_irqwake_intallow = 1L << (IRQ_RTC - IRQ_EINT0) | 0xfL; unsigned long s3c_irqwake_intallow = 1L << (IRQ_RTC - IRQ_EINT0) | 0xfL;
unsigned long s3c_irqwake_eintallow = 0x0000fff0L; unsigned long s3c_irqwake_eintallow = 0x0000fff0L;
int s3c_irq_wake(unsigned int irqno, unsigned int state) int s3c_irq_wake(struct irq_data *data, unsigned int state)
{ {
unsigned long irqbit = 1 << (irqno - IRQ_EINT0); unsigned long irqbit = 1 << (data->irq - IRQ_EINT0);
if (!(s3c_irqwake_intallow & irqbit)) if (!(s3c_irqwake_intallow & irqbit))
return -ENOENT; return -ENOENT;
printk(KERN_INFO "wake %s for irq %d\n", printk(KERN_INFO "wake %s for irq %d\n",
state ? "enabled" : "disabled", irqno); state ? "enabled" : "disabled", data->irq);
if (!state) if (!state)
s3c_irqwake_intmask |= irqbit; s3c_irqwake_intmask |= irqbit;
......
arch/arm/plat-s3c24xx/irq.c
View file @ 57436c2d
...@@ -34,30 +34,29 @@ ...@@ -34,30 +34,29 @@
#include <plat/irq.h> #include <plat/irq.h>
static void static void
s3c_irq_mask(unsigned int irqno) s3c_irq_mask(struct irq_data *data)
{ {
unsigned int irqno = data->irq - IRQ_EINT0;
unsigned long mask; unsigned long mask;
irqno -= IRQ_EINT0;
mask = __raw_readl(S3C2410_INTMSK); mask = __raw_readl(S3C2410_INTMSK);
mask |= 1UL << irqno; mask |= 1UL << irqno;
__raw_writel(mask, S3C2410_INTMSK); __raw_writel(mask, S3C2410_INTMSK);
} }
static inline void static inline void
s3c_irq_ack(unsigned int irqno) s3c_irq_ack(struct irq_data *data)
{ {
unsigned long bitval = 1UL << (irqno - IRQ_EINT0); unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
__raw_writel(bitval, S3C2410_SRCPND); __raw_writel(bitval, S3C2410_SRCPND);
__raw_writel(bitval, S3C2410_INTPND); __raw_writel(bitval, S3C2410_INTPND);
} }
static inline void static inline void
s3c_irq_maskack(unsigned int irqno) s3c_irq_maskack(struct irq_data *data)
{ {
unsigned long bitval = 1UL << (irqno - IRQ_EINT0); unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
unsigned long mask; unsigned long mask;
mask = __raw_readl(S3C2410_INTMSK); mask = __raw_readl(S3C2410_INTMSK);
...@@ -69,8 +68,9 @@ s3c_irq_maskack(unsigned int irqno) ...@@ -69,8 +68,9 @@ s3c_irq_maskack(unsigned int irqno)
static void static void
s3c_irq_unmask(unsigned int irqno) s3c_irq_unmask(struct irq_data *data)
{ {
unsigned int irqno = data->irq;
unsigned long mask; unsigned long mask;
if (irqno != IRQ_TIMER4 && irqno != IRQ_EINT8t23) if (irqno != IRQ_TIMER4 && irqno != IRQ_EINT8t23)
...@@ -85,40 +85,39 @@ s3c_irq_unmask(unsigned int irqno) ...@@ -85,40 +85,39 @@ s3c_irq_unmask(unsigned int irqno)
struct irq_chip s3c_irq_level_chip = { struct irq_chip s3c_irq_level_chip = {
.name = "s3c-level", .name = "s3c-level",
.ack = s3c_irq_maskack, .irq_ack = s3c_irq_maskack,
.mask = s3c_irq_mask, .irq_mask = s3c_irq_mask,
.unmask = s3c_irq_unmask, .irq_unmask = s3c_irq_unmask,
.set_wake = s3c_irq_wake .irq_set_wake = s3c_irq_wake
}; };
struct irq_chip s3c_irq_chip = { struct irq_chip s3c_irq_chip = {
.name = "s3c", .name = "s3c",
.ack = s3c_irq_ack, .irq_ack = s3c_irq_ack,
.mask = s3c_irq_mask, .irq_mask = s3c_irq_mask,
.unmask = s3c_irq_unmask, .irq_unmask = s3c_irq_unmask,
.set_wake = s3c_irq_wake .irq_set_wake = s3c_irq_wake
}; };
static void static void
s3c_irqext_mask(unsigned int irqno) s3c_irqext_mask(struct irq_data *data)
{ {
unsigned int irqno = data->irq - EXTINT_OFF;
unsigned long mask; unsigned long mask;
irqno -= EXTINT_OFF;
mask = __raw_readl(S3C24XX_EINTMASK); mask = __raw_readl(S3C24XX_EINTMASK);
mask |= ( 1UL << irqno); mask |= ( 1UL << irqno);
__raw_writel(mask, S3C24XX_EINTMASK); __raw_writel(mask, S3C24XX_EINTMASK);
} }
static void static void
s3c_irqext_ack(unsigned int irqno) s3c_irqext_ack(struct irq_data *data)
{ {
unsigned long req; unsigned long req;
unsigned long bit; unsigned long bit;
unsigned long mask; unsigned long mask;
bit = 1UL << (irqno - EXTINT_OFF); bit = 1UL << (data->irq - EXTINT_OFF);
mask = __raw_readl(S3C24XX_EINTMASK); mask = __raw_readl(S3C24XX_EINTMASK);
...@@ -129,64 +128,57 @@ s3c_irqext_ack(unsigned int irqno) ...@@ -129,64 +128,57 @@ s3c_irqext_ack(unsigned int irqno)
/* not sure if we should be acking the parent irq... */ /* not sure if we should be acking the parent irq... */
if (irqno <= IRQ_EINT7 ) { if (data->irq <= IRQ_EINT7) {
if ((req & 0xf0) == 0) if ((req & 0xf0) == 0)
s3c_irq_ack(IRQ_EINT4t7); s3c_irq_ack(irq_get_irq_data(IRQ_EINT4t7));
} else { } else {
if ((req >> 8) == 0) if ((req >> 8) == 0)
s3c_irq_ack(IRQ_EINT8t23); s3c_irq_ack(irq_get_irq_data(IRQ_EINT8t23));
} }
} }
static void static void
s3c_irqext_unmask(unsigned int irqno) s3c_irqext_unmask(struct irq_data *data)
{ {
unsigned int irqno = data->irq - EXTINT_OFF;
unsigned long mask; unsigned long mask;
irqno -= EXTINT_OFF;
mask = __raw_readl(S3C24XX_EINTMASK); mask = __raw_readl(S3C24XX_EINTMASK);
mask &= ~( 1UL << irqno); mask &= ~(1UL << irqno);
__raw_writel(mask, S3C24XX_EINTMASK); __raw_writel(mask, S3C24XX_EINTMASK);
} }
int int
s3c_irqext_type(unsigned int irq, unsigned int type) s3c_irqext_type(struct irq_data *data, unsigned int type)
{ {
void __iomem *extint_reg; void __iomem *extint_reg;
void __iomem *gpcon_reg; void __iomem *gpcon_reg;
unsigned long gpcon_offset, extint_offset; unsigned long gpcon_offset, extint_offset;
unsigned long newvalue = 0, value; unsigned long newvalue = 0, value;
if ((irq >= IRQ_EINT0) && (irq <= IRQ_EINT3)) if ((data->irq >= IRQ_EINT0) && (data->irq <= IRQ_EINT3)) {
{
gpcon_reg = S3C2410_GPFCON; gpcon_reg = S3C2410_GPFCON;
extint_reg = S3C24XX_EXTINT0; extint_reg = S3C24XX_EXTINT0;
gpcon_offset = (irq - IRQ_EINT0) * 2; gpcon_offset = (data->irq - IRQ_EINT0) * 2;
extint_offset = (irq - IRQ_EINT0) * 4; extint_offset = (data->irq - IRQ_EINT0) * 4;
} } else if ((data->irq >= IRQ_EINT4) && (data->irq <= IRQ_EINT7)) {
else if ((irq >= IRQ_EINT4) && (irq <= IRQ_EINT7))
{
gpcon_reg = S3C2410_GPFCON; gpcon_reg = S3C2410_GPFCON;
extint_reg = S3C24XX_EXTINT0; extint_reg = S3C24XX_EXTINT0;
gpcon_offset = (irq - (EXTINT_OFF)) * 2; gpcon_offset = (data->irq - (EXTINT_OFF)) * 2;
extint_offset = (irq - (EXTINT_OFF)) * 4; extint_offset = (data->irq - (EXTINT_OFF)) * 4;
} } else if ((data->irq >= IRQ_EINT8) && (data->irq <= IRQ_EINT15)) {
else if ((irq >= IRQ_EINT8) && (irq <= IRQ_EINT15))
{
gpcon_reg = S3C2410_GPGCON; gpcon_reg = S3C2410_GPGCON;
extint_reg = S3C24XX_EXTINT1; extint_reg = S3C24XX_EXTINT1;
gpcon_offset = (irq - IRQ_EINT8) * 2; gpcon_offset = (data->irq - IRQ_EINT8) * 2;
extint_offset = (irq - IRQ_EINT8) * 4; extint_offset = (data->irq - IRQ_EINT8) * 4;
} } else if ((data->irq >= IRQ_EINT16) && (data->irq <= IRQ_EINT23)) {
else if ((irq >= IRQ_EINT16) && (irq <= IRQ_EINT23))
{
gpcon_reg = S3C2410_GPGCON; gpcon_reg = S3C2410_GPGCON;
extint_reg = S3C24XX_EXTINT2; extint_reg = S3C24XX_EXTINT2;
gpcon_offset = (irq - IRQ_EINT8) * 2; gpcon_offset = (data->irq - IRQ_EINT8) * 2;
extint_offset = (irq - IRQ_EINT16) * 4; extint_offset = (data->irq - IRQ_EINT16) * 4;
} else } else {
return -1; return -1;
}
/* Set the GPIO to external interrupt mode */ /* Set the GPIO to external interrupt mode */
value = __raw_readl(gpcon_reg); value = __raw_readl(gpcon_reg);
...@@ -234,20 +226,20 @@ s3c_irqext_type(unsigned int irq, unsigned int type) ...@@ -234,20 +226,20 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
static struct irq_chip s3c_irqext_chip = { static struct irq_chip s3c_irqext_chip = {
.name = "s3c-ext", .name = "s3c-ext",
.mask = s3c_irqext_mask, .irq_mask = s3c_irqext_mask,
.unmask = s3c_irqext_unmask, .irq_unmask = s3c_irqext_unmask,
.ack = s3c_irqext_ack, .irq_ack = s3c_irqext_ack,
.set_type = s3c_irqext_type, .irq_set_type = s3c_irqext_type,
.irq_set_wake = s3c_irqext_wake .irq_set_wake = s3c_irqext_wake
}; };
static struct irq_chip s3c_irq_eint0t4 = { static struct irq_chip s3c_irq_eint0t4 = {
.name = "s3c-ext0", .name = "s3c-ext0",
.ack = s3c_irq_ack, .irq_ack = s3c_irq_ack,
.mask = s3c_irq_mask, .irq_mask = s3c_irq_mask,
.unmask = s3c_irq_unmask, .irq_unmask = s3c_irq_unmask,
.set_wake = s3c_irq_wake, .irq_set_wake = s3c_irq_wake,
.set_type = s3c_irqext_type, .irq_set_type = s3c_irqext_type,
}; };
/* mask values for the parent registers for each of the interrupt types */ /* mask values for the parent registers for each of the interrupt types */
...@@ -261,109 +253,109 @@ static struct irq_chip s3c_irq_eint0t4 = { ...@@ -261,109 +253,109 @@ static struct irq_chip s3c_irq_eint0t4 = {
/* UART0 */ /* UART0 */
static void static void
s3c_irq_uart0_mask(unsigned int irqno) s3c_irq_uart0_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_UART0, 7); s3c_irqsub_mask(data->irq, INTMSK_UART0, 7);
} }
static void static void
s3c_irq_uart0_unmask(unsigned int irqno) s3c_irq_uart0_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_UART0); s3c_irqsub_unmask(data->irq, INTMSK_UART0);
} }
static void static void
s3c_irq_uart0_ack(unsigned int irqno) s3c_irq_uart0_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_UART0, 7); s3c_irqsub_maskack(data->irq, INTMSK_UART0, 7);
} }
static struct irq_chip s3c_irq_uart0 = { static struct irq_chip s3c_irq_uart0 = {
.name = "s3c-uart0", .name = "s3c-uart0",
.mask = s3c_irq_uart0_mask, .irq_mask = s3c_irq_uart0_mask,
.unmask = s3c_irq_uart0_unmask, .irq_unmask = s3c_irq_uart0_unmask,
.ack = s3c_irq_uart0_ack, .irq_ack = s3c_irq_uart0_ack,
}; };
/* UART1 */ /* UART1 */
static void static void
s3c_irq_uart1_mask(unsigned int irqno) s3c_irq_uart1_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_UART1, 7 << 3); s3c_irqsub_mask(data->irq, INTMSK_UART1, 7 << 3);
} }
static void static void
s3c_irq_uart1_unmask(unsigned int irqno) s3c_irq_uart1_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_UART1); s3c_irqsub_unmask(data->irq, INTMSK_UART1);
} }
static void static void
s3c_irq_uart1_ack(unsigned int irqno) s3c_irq_uart1_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_UART1, 7 << 3); s3c_irqsub_maskack(data->irq, INTMSK_UART1, 7 << 3);
} }
static struct irq_chip s3c_irq_uart1 = { static struct irq_chip s3c_irq_uart1 = {
.name = "s3c-uart1", .name = "s3c-uart1",
.mask = s3c_irq_uart1_mask, .irq_mask = s3c_irq_uart1_mask,
.unmask = s3c_irq_uart1_unmask, .irq_unmask = s3c_irq_uart1_unmask,
.ack = s3c_irq_uart1_ack, .irq_ack = s3c_irq_uart1_ack,
}; };
/* UART2 */ /* UART2 */
static void static void
s3c_irq_uart2_mask(unsigned int irqno) s3c_irq_uart2_mask(struct irq_data *data)
{ {
s3c_irqsub_mask(irqno, INTMSK_UART2, 7 << 6); s3c_irqsub_mask(data->irq, INTMSK_UART2, 7 << 6);
} }
static void static void
s3c_irq_uart2_unmask(unsigned int irqno) s3c_irq_uart2_unmask(struct irq_data *data)
{ {
s3c_irqsub_unmask(irqno, INTMSK_UART2); s3c_irqsub_unmask(data->irq, INTMSK_UART2);
} }
static void static void
s3c_irq_uart2_ack(unsigned int irqno) s3c_irq_uart2_ack(struct irq_data *data)
{ {
s3c_irqsub_maskack(irqno, INTMSK_UART2, 7 << 6); s3c_irqsub_maskack(data->irq, INTMSK_UART2, 7 << 6);
} }
static struct irq_chip s3c_irq_uart2 = { static struct irq_chip s3c_irq_uart2 = {
.name = "s3c-uart2", .name = "s3c-uart2",
.mask = s3c_irq_uart2_mask, .irq_mask = s3c_irq_uart2_mask,
.unmask = s3c_irq_uart2_unmask, .irq_unmask = s3c_irq_uart2_unmask,
.ack = s3c_irq_uart2_ack, .irq_ack = s3c_irq_uart2_ack,
}; };
/* ADC and Touchscreen */ /* ADC and Touchscreen */
static void static void
s3c_irq_adc_mask(unsigned int irqno) s3c_irq_adc_mask(struct irq_data *d)
{ {
s3c_irqsub_mask(irqno, INTMSK_ADCPARENT, 3 << 9); s3c_irqsub_mask(d->irq, INTMSK_ADCPARENT, 3 << 9);
} }
static void static void
s3c_irq_adc_unmask(unsigned int irqno) s3c_irq_adc_unmask(struct irq_data *d)
{ {
s3c_irqsub_unmask(irqno, INTMSK_ADCPARENT); s3c_irqsub_unmask(d->irq, INTMSK_ADCPARENT);
} }
static void static void
s3c_irq_adc_ack(unsigned int irqno) s3c_irq_adc_ack(struct irq_data *d)
{ {
s3c_irqsub_ack(irqno, INTMSK_ADCPARENT, 3 << 9); s3c_irqsub_ack(d->irq, INTMSK_ADCPARENT, 3 << 9);
} }
static struct irq_chip s3c_irq_adc = { static struct irq_chip s3c_irq_adc = {
.name = "s3c-adc", .name = "s3c-adc",
.mask = s3c_irq_adc_mask, .irq_mask = s3c_irq_adc_mask,
.unmask = s3c_irq_adc_unmask, .irq_unmask = s3c_irq_adc_unmask,
.ack = s3c_irq_adc_ack, .irq_ack = s3c_irq_adc_ack,
}; };
/* irq demux for adc */ /* irq demux for adc */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7