diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-23 02:06:14 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-23 02:06:14 +0400 |
| commit | 9b20d1c9022493b194a88acac0289ff09fedaf92 (patch) | |
| tree | 9574964fc867bf8af55844c61e133bddbc8afa81 /arch | |
| parent | 4721f3cec17717679397cc57b25fb8c62375cffe (diff) | |
| parent | 70bacadbd07248576290de40cc217c06f0f2d3c3 (diff) | |
| download | linux-9b20d1c9022493b194a88acac0289ff09fedaf92.tar.xz | |
Merge tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
From Kukjin Kim:
Samsung updates for v3.14
- Skip eint_init() for pinctrl-exynos because of re-executing
- Use CPU_V6K for S3C64XX(ARM1176JZF-s) instead of CPU_V6
* tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Select CPU_V6K instead of CPU_V6
ARM: SAMSUNG: if detected device tree skip irq init for S5P
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/s5p-irq-eint.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e351f1c8a6a9..5f7f8d59124a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -749,7 +749,7 @@ config ARCH_S3C64XX select CLKDEV_LOOKUP select CLKSRC_SAMSUNG_PWM select COMMON_CLK - select CPU_V6 + select CPU_V6K select GENERIC_CLOCKEVENTS select GPIO_SAMSUNG select HAVE_S3C2410_I2C if I2C diff --git a/arch/arm/plat-samsung/s5p-irq-eint.c b/arch/arm/plat-samsung/s5p-irq-eint.c index faa651602780..ebee4dc11a94 100644 --- a/arch/arm/plat-samsung/s5p-irq-eint.c +++ b/arch/arm/plat-samsung/s5p-irq-eint.c @@ -16,6 +16,7 @@ #include <linux/device.h> #include <linux/gpio.h> #include <linux/irqchip/arm-vic.h> +#include <linux/of.h> #include <plat/regs-irqtype.h> @@ -202,6 +203,9 @@ static int __init s5p_init_irq_eint(void) { int irq; + if (of_have_populated_dt()) + return -ENODEV; + for (irq = IRQ_EINT(0); irq <= IRQ_EINT(15); irq++) irq_set_chip(irq, &s5p_irq_vic_eint); |