summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2013-04-04 07:53:41 +0200
committerKukjin Kim <kgene.kim@samsung.com>2013-04-04 07:56:02 +0200
commit1ebc7e83b1cc58edae3f371ac9cf1614e0d3b345 (patch)
tree19083ba4896b7ad2eb53c4a9cdc1b5005d30c391 /drivers/irqchip
parentirqchip: s3c24xx: fix comments on some camera interrupts (diff)
downloadlinux-1ebc7e83b1cc58edae3f371ac9cf1614e0d3b345.tar.xz
linux-1ebc7e83b1cc58edae3f371ac9cf1614e0d3b345.zip
irqchip: s3c24xx: fix irqlist of second s3c2416 controller
The list in used was from the s3c2450, a close cousin of the s3c2416. As it's not possible to distinguish between the s3c2416 and s3c2450 the additional interrupts of the s3c2450 will only be available thru devicetree later. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-s3c24xx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-s3c24xx.c b/drivers/irqchip/irq-s3c24xx.c
index 84afbc16fcc3..a565eb8def30 100644
--- a/drivers/irqchip/irq-s3c24xx.c
+++ b/drivers/irqchip/irq-s3c24xx.c
@@ -835,13 +835,12 @@ static struct s3c_irq_data init_s3c2416subint[32] = {
static struct s3c_irq_data init_s3c2416_second[32] = {
{ .type = S3C_IRQTYPE_EDGE }, /* 2D */
- { .type = S3C_IRQTYPE_EDGE }, /* IIC1 */
+ { .type = S3C_IRQTYPE_NONE }, /* reserved */
{ .type = S3C_IRQTYPE_NONE }, /* reserved */
{ .type = S3C_IRQTYPE_NONE }, /* reserved */
{ .type = S3C_IRQTYPE_EDGE }, /* PCM0 */
- { .type = S3C_IRQTYPE_EDGE }, /* PCM1 */
+ { .type = S3C_IRQTYPE_NONE }, /* reserved */
{ .type = S3C_IRQTYPE_EDGE }, /* I2S0 */
- { .type = S3C_IRQTYPE_EDGE }, /* I2S1 */
};
void __init s3c2416_init_irq(void)