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

Commit b94db2ac authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-fixes-for-v3.9' of... 

Merge tag 'samsung-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

From Kukjin Kim <kgene.kim@samsung.com>:

samsung fixes can support s3c24xx for v3.9

* tag 'samsung-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
  ARM: S3C24XX: Correct NR_IRQS definition for s3c2440

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0a01216c 646dd2f0

arch/arm/mach-s3c24xx/include/mach/irqs.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -188,10 +188,8 @@ 




#if defined(CONFIG_CPU_S3C2416)

#if defined(CONFIG_CPU_S3C2416)

#define NR_IRQS (IRQ_S3C2416_I2S1 + 1)

#define NR_IRQS (IRQ_S3C2416_I2S1 + 1)

#elif defined(CONFIG_CPU_S3C2443)

#define NR_IRQS (IRQ_S3C2443_AC97+1)

#else

#else

#define NR_IRQS (IRQ_S3C2440_AC97+1)

#define NR_IRQS (IRQ_S3C2443_AC97 + 1)

#endif

#endif





/* compatibility define. */

/* compatibility define. */

arch/arm/mach-s3c24xx/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -500,7 +500,7 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np, 
		base = (void *)0xfd000000;

		base = (void *)0xfd000000;





		intc->reg_mask = base + 0xa4;

		intc->reg_mask = base + 0xa4;

		intc->reg_pending = base + 0x08;

		intc->reg_pending = base + 0xa8;

		irq_num = 20;

		irq_num = 20;

		irq_start = S3C2410_IRQ(32);

		irq_start = S3C2410_IRQ(32);

		irq_offset = 4;

		irq_offset = 4;