diff options
author | Tomasz Figa <t.figa@samsung.com> | 2013-04-23 17:46:31 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-28 12:17:08 -0700 |
commit | 278c800ec4bfcf26b76077e96f155c5b956bd1ad (patch) | |
tree | f1a987e0d46a8b501998a3add5f10c70f223aaaf /arch/arm/mach-exynos | |
parent | 81d4f7bfdc9417e7d8fc1133c762daa4458eec5e (diff) | |
download | linux-3.10-278c800ec4bfcf26b76077e96f155c5b956bd1ad.tar.gz linux-3.10-278c800ec4bfcf26b76077e96f155c5b956bd1ad.tar.bz2 linux-3.10-278c800ec4bfcf26b76077e96f155c5b956bd1ad.zip |
ARM: SAMSUNG: Do not register legacy timer interrupts on Exynos
This patch removes legacy PWM timer interrupt initialization from
exynos{4,5}_init_irq() functions, since it conflicts with internal
interrupt handling of the new PWM clocksource driver.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r-- | arch/arm/mach-exynos/common.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index d63d399c7ba..8abf2b6b98c 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -456,13 +456,6 @@ void __init exynos4_init_irq(void) if (!of_have_populated_dt()) combiner_init(S5P_VA_COMBINER_BASE, NULL); - - /* - * The parameters of s5p_init_irq() are for VIC init. - * Theses parameters should be NULL and 0 because EXYNOS4 - * uses GIC instead of VIC. - */ - s5p_init_irq(NULL, 0); } void __init exynos5_init_irq(void) @@ -470,14 +463,6 @@ void __init exynos5_init_irq(void) #ifdef CONFIG_OF irqchip_init(); #endif - /* - * The parameters of s5p_init_irq() are for VIC init. - * Theses parameters should be NULL and 0 because EXYNOS4 - * uses GIC instead of VIC. - */ - if (!of_machine_is_compatible("samsung,exynos5440")) - s5p_init_irq(NULL, 0); - gic_arch_extn.irq_set_wake = s3c_irq_wake; } |