diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-28 12:02:44 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-28 12:02:44 -0700 |
| commit | 4fac6f0e654aeb8ffc9f06285933c7268747bc0d (patch) | |
| tree | 9533c5cacf05f41ffea4f5acd691953817268eed /arch | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| parent | 97916777d6904e24b86eac77da58ef7cb09d539d (diff) | |
Merge branch 'samsung/pinctrl-exynos' into late/dt
* samsung/pinctrl-exynos:
ARM: EXYNOS: skip wakeup interrupt registration for exynos5250 if pinctrl is enabled
gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250
pinctrl: exynos: add exynos5250 SoC specific data
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index d63d399c7ba..bdd957978d9 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) static const struct of_device_id exynos_pinctrl_ids[] = { { .compatible = "samsung,exynos4210-pinctrl", }, { .compatible = "samsung,exynos4x12-pinctrl", }, + { .compatible = "samsung,exynos5250-pinctrl", }, }; struct device_node *pctrl_np, *wkup_np; const char *wkup_compat = "samsung,exynos4210-wakeup-eint"; |