aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@linaro.org>2012-12-28 13:37:27 -0500
committerKukjin Kim <kgene.kim@samsung.com>2013-03-05 06:59:12 -0500
commit97916777d6904e24b86eac77da58ef7cb09d539d (patch)
tree7d52dba615f639f1efe4c31e85e4dfee7dabea21
parent70850ad85370b2100ffe0e6a892c1d60569b476a (diff)
ARM: EXYNOS: skip wakeup interrupt registration for exynos5250 if pinctrl is enabled
Skip the wakeup interrupt registration for Exynos5250 if pinctrl support is enabled for Exynos5250. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-exynos/common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index d63d399c7bae..bdd957978d9b 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -822,6 +822,7 @@ static int __init exynos_init_irq_eint(void)
822 static const struct of_device_id exynos_pinctrl_ids[] = { 822 static const struct of_device_id exynos_pinctrl_ids[] = {
823 { .compatible = "samsung,exynos4210-pinctrl", }, 823 { .compatible = "samsung,exynos4210-pinctrl", },
824 { .compatible = "samsung,exynos4x12-pinctrl", }, 824 { .compatible = "samsung,exynos4x12-pinctrl", },
825 { .compatible = "samsung,exynos5250-pinctrl", },
825 }; 826 };
826 struct device_node *pctrl_np, *wkup_np; 827 struct device_node *pctrl_np, *wkup_np;
827 const char *wkup_compat = "samsung,exynos4210-wakeup-eint"; 828 const char *wkup_compat = "samsung,exynos4210-wakeup-eint";