diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 16:38:43 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 16:38:43 +0900 |
| commit | be6bb8cc8d2bd033a1f89983f2f13bdb3548a08f (patch) | |
| tree | 2b7f76cc2154e5589a605f97a663c8afe4f6016f /arch/arm/mach-s5p64x0/irq-eint.c | |
| parent | d03c35939d2a447093e60133156217d6512aa9e3 (diff) | |
| parent | b02b5da4d15d7f7a250888d003121e1b5b69d00b (diff) | |
Merge branch 'next/topic-cpuid-rev' into next/topic-add-exynos4212
Diffstat (limited to 'arch/arm/mach-s5p64x0/irq-eint.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/irq-eint.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/irq-eint.c b/arch/arm/mach-s5p64x0/irq-eint.c index fe7380f5c3c..494e1a8f6f6 100644 --- a/arch/arm/mach-s5p64x0/irq-eint.c +++ b/arch/arm/mach-s5p64x0/irq-eint.c @@ -17,6 +17,7 @@ #include <linux/irq.h> #include <linux/io.h> +#include <plat/cpu.h> #include <plat/regs-irqtype.h> #include <plat/gpio-cfg.h> @@ -67,7 +68,7 @@ static int s5p64x0_irq_eint_set_type(struct irq_data *data, unsigned int type) __raw_writel(ctrl, S5P64X0_EINT0CON0); /* Configure the GPIO pin for 6450 or 6440 based on CPU ID */ - if (0x50000 == (__raw_readl(S5P64X0_SYS_ID) & 0xFF000)) + if (soc_is_s5p6450()) s3c_gpio_cfgpin(S5P6450_GPN(offs), S3C_GPIO_SFN(2)); else s3c_gpio_cfgpin(S5P6440_GPN(offs), S3C_GPIO_SFN(2)); |