From bffd649d4377a855dff1cb8877385a5657520251 Mon Sep 17 00:00:00 2001 From: Mateusz Krawczuk Date: Mon, 7 Oct 2013 23:24:22 +0900 Subject: ARM: SAMSUNG: if detected device tree skip irq init for S5P It prevents from executing things already handled by pinctrl-exynos driver, when device tree is available. Signed-off-by: Mateusz Krawczuk Signed-off-by: Kyungmin Park Acked-by: Tomasz Figa Signed-off-by: Kukjin Kim --- arch/arm/plat-samsung/s5p-irq-eint.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm') 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 #include #include +#include #include @@ -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); -- cgit v1.2.3 From 70bacadbd07248576290de40cc217c06f0f2d3c3 Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Mon, 21 Oct 2013 06:56:51 +0900 Subject: ARM: S3C64XX: Select CPU_V6K instead of CPU_V6 All S3C64XX SoCs come with ARM1176JZF-s core, which fully supports ARMv6K extensions. This patch lets the kernel use them on S3C6410 by adding selection of CPU_V6K to ARCH_S3C64XX. To use V6K extensions, these symbols must not be selected at the same time, so this patch keeps only CPU_V6K selected for S3C64XX. Signed-off-by: Tomasz Figa Signed-off-by: Kukjin Kim --- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c1f1a7eee953..3d8f0b30135c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -727,7 +727,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 -- cgit v1.2.3